Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(927)

Unified Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 10822030: Move ui_test_utils::RunMessageLoop to test_utils so that it can be reused by content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
===================================================================
--- chrome/browser/captive_portal/captive_portal_browsertest.cc (revision 148497)
+++ chrome/browser/captive_portal/captive_portal_browsertest.cc (working copy)
@@ -199,7 +199,7 @@
content::BrowserThread::IO, FROM_HERE,
base::Bind(&URLRequestTimeoutOnDemandJob::WaitForJobsOnIOThread,
num_jobs));
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
}
// static
@@ -519,7 +519,7 @@
if (num_navigations_ < num_navigations_to_wait_for) {
num_navigations_to_wait_for_ = num_navigations_to_wait_for;
waiting_for_navigation_ = true;
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
EXPECT_FALSE(waiting_for_navigation_);
}
EXPECT_EQ(num_navigations_, num_navigations_to_wait_for);
@@ -610,7 +610,7 @@
if (tabs_needing_navigation_.size() !=
tabs_navigated_to_final_destination_.size()) {
waiting_for_navigation_ = true;
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
EXPECT_FALSE(waiting_for_navigation_);
}
EXPECT_EQ(tabs_needing_navigation_.size(),
@@ -705,7 +705,7 @@
if (num_results_received_ < num_results_to_wait_for) {
num_results_to_wait_for_ = num_results_to_wait_for;
waiting_for_result_ = true;
- ui_test_utils::RunMessageLoop();
+ content::RunMessageLoop();
EXPECT_FALSE(waiting_for_result_);
}
EXPECT_EQ(num_results_received_, num_results_to_wait_for);

Powered by Google App Engine
This is Rietveld 408576698