Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by content_browsertests. I put it in test_utils.h instead of browser_test_utils.h because this is also used by unit tests.

BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10825085

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149026 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index f11d8df..29f5678 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -492,7 +492,7 @@ TEST_F(AndroidProviderBackendTest, InsertHistoryAndBookmark) {
   EXPECT_EQ(row1.title(),
             delegate_.modified_details()->changed_urls[0].title());
   EXPECT_FALSE(delegate_.favicon_details());
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -593,7 +593,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) {
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
   // Verify the row1 has been added in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -608,7 +608,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) {
                                                  &deleted_count));
   EXPECT_EQ(1, deleted_count);
   // Verify the row1 was removed from bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(0, bookmark_model_->mobile_node()->child_count());
 
   // Verify notifications
@@ -784,7 +784,7 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) {
   ASSERT_TRUE(id2);
 
   // Verify the row1 has been added in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -861,7 +861,7 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) {
   EXPECT_EQ(id1, android_url_row1.id);
 
   // Verify the bookmark model was updated.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child1 = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child1);
@@ -1550,7 +1550,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistory) {
   ASSERT_TRUE(id2);
 
   // Verify the row1 has been added in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
@@ -1572,7 +1572,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistory) {
   EXPECT_EQ(Time::UnixEpoch(), url_row.last_visit());
 
   // Verify the row1 is still in bookmark model.
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child1 = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child1);
@@ -1708,7 +1708,7 @@ TEST_F(AndroidProviderBackendTest, AndroidCTSComplianceFolderColumnExists) {
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   ASSERT_TRUE(id2);
-  ui_test_utils::RunAllPendingInMessageLoop();
+  content::RunAllPendingInMessageLoop();
 
   // Query by folder=0, the row1 should returned.
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
diff --git a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
index e2f1682..89d4cb2 100644
--- a/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
+++ b/chrome/browser/history/android/bookmark_model_sql_handler_unittest.cc
@@ -63,7 +63,7 @@ class BookmarkModelSQLHandlerTest : public testing::Test {
   // Runs the MessageLoopForUI, and return till all pending messages were
   // processed.
   void RunMessageLoopForUI() {
-    ui_test_utils::RunAllPendingInMessageLoop();
+    content::RunAllPendingInMessageLoop();
   }
 
   TestingProfileManager profile_manager_;