Remove notifications from TestNavigationObserver and clean it and its uses up.

BUG=170921
TEST=this is infrastructure for tests; they should all keep passing

Review URL: https://codereview.chromium.org/25937002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227455 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 380ba1ce..26308a6a 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -699,10 +699,7 @@
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   // Wait for app tab to be created and loaded.
-  test_navigation_observer.WaitForObservation(
-      base::Bind(&content::RunMessageLoop),
-      base::Bind(&base::MessageLoop::Quit,
-                 base::Unretained(base::MessageLoopForUI::current())));
+  test_navigation_observer.Wait();
 
   // App has loaded, and chrome.app.isInstalled should be true.
   bool is_installed = false;
@@ -741,10 +738,7 @@
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   // Wait for app tab to be created and loaded.
-  test_navigation_observer.WaitForObservation(
-      base::Bind(&content::RunMessageLoop),
-      base::Bind(&base::MessageLoop::Quit,
-                 base::Unretained(base::MessageLoopForUI::current())));
+  test_navigation_observer.Wait();
 
   // App has loaded, and chrome.app.isInstalled should be true.
   bool is_installed = false;