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/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 3839ca8..31d8abe 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -1293,10 +1293,7 @@
"window.domAutomationController.send(startDownload());",
&download_assempted));
ASSERT_TRUE(download_assempted);
- observer.WaitForObservation(
- base::Bind(&content::RunMessageLoop),
- base::Bind(&base::MessageLoop::Quit,
- base::Unretained(base::MessageLoopForUI::current())));
+ observer.Wait();
// Check that we did not download the file.
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc
index 6030047..020a0f1 100644
--- a/chrome/browser/errorpage_browsertest.cc
+++ b/chrome/browser/errorpage_browsertest.cc
@@ -113,10 +113,7 @@
} else {
FAIL();
}
- test_navigation_observer.WaitForObservation(
- base::Bind(&content::RunMessageLoop),
- base::Bind(&base::MessageLoop::Quit,
- base::Unretained(base::MessageLoopForUI::current())));
+ test_navigation_observer.Wait();
EXPECT_EQ(title_watcher.WaitAndGetTitle(), ASCIIToUTF16(expected_title));
}
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;
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 94b03bf..b2ea23ff 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1274,11 +1274,7 @@
content::TestNavigationObserver observer(
current_browser()->tab_strip_model()->GetActiveWebContents());
observer.StartWatchingNewWebContents();
- base::RunLoop run_loop;
- observer.WaitForObservation(
- base::Bind(&content::RunThisRunLoop,
- base::Unretained(&run_loop)),
- content::GetQuitTaskForRunLoop(&run_loop));
+ observer.Wait();
}
}
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 295dd03..c4f0a0e 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -2231,10 +2231,7 @@
browser->tab_strip_model()->GetActiveWebContents();
content::TestNavigationObserver same_tab_observer(web_contents);
SimulateMouseClick(web_contents, modifiers, button);
- base::RunLoop run_loop;
- same_tab_observer.WaitForObservation(
- base::Bind(&content::RunThisRunLoop, base::Unretained(&run_loop)),
- content::GetQuitTaskForRunLoop(&run_loop));
+ same_tab_observer.Wait();
EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile(),
browser->host_desktop_type()));
EXPECT_EQ(1, browser->tab_strip_model()->count());
