Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by c…

chrome/browser/history/android/android_provider_backend_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 474 matching lines @@
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row1.url(), delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             delegate_.modified_details()->changed_urls[0].last_visit());
   EXPECT_EQ(row1.visit_count(),
             delegate_.modified_details()->changed_urls[0].visit_count());
   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);
   EXPECT_EQ(row1.title(), child->GetTitle());
   EXPECT_EQ(row1.url(), child->url());
 
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
@@ skipping 80 matching lines @@
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
                                              &history_db_));
 
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   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);
   EXPECT_EQ(row1.title(), child->GetTitle());
   EXPECT_EQ(row1.url(), child->url());
 
   // Delete the row1.
   std::vector<string16> args;
   int deleted_count = 0;
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->DeleteHistoryAndBookmarks("Favicon IS NULL", args,
                                                  &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
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   EXPECT_EQ(1u, delegate_.deleted_details()->rows.size());
   EXPECT_EQ(row1.url(), delegate_.deleted_details()->rows[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             delegate_.deleted_details()->rows[0].last_visit());
   EXPECT_EQ(row1.title(),
@@ skipping 155 matching lines @@
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   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);
   EXPECT_EQ(row1.title(), child->GetTitle());
   EXPECT_EQ(row1.url(), child->url());
 
   // Make sure the url has correctly insertted.
   URLID url_id1 = history_db_.GetRowForURL(row1.url(), NULL);
   ASSERT_TRUE(url_id1);
   URLID url_id2 = history_db_.GetRowForURL(row2.url(), NULL);
@@ skipping 56 matching lines @@
             ToDatabaseTime(new_row.last_visit()));
   visits.clear();
   EXPECT_TRUE(history_db_.GetVisitsForURL(new_row.id(), &visits));
   EXPECT_EQ(10u, visits.size());
   AndroidURLRow android_url_row1;
   ASSERT_TRUE(history_db_.GetAndroidURLRow(new_row.id(), &android_url_row1));
   // Android URL ID shouldn't change.
   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);
   EXPECT_EQ(row1.title(), child1->GetTitle());
   EXPECT_EQ(update_row1.url(), child1->url());
 
   // Update the URL with visit count, created time, and last visit time.
   HistoryAndBookmarkRow update_row2;
   update_row2.set_raw_url("somethingelse.com");
   update_row2.set_url(GURL("http://somethingelse.com"));
@@ skipping 668 matching lines @@
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   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);
   EXPECT_EQ(row1.title(), child->GetTitle());
   EXPECT_EQ(row1.url(), child->url());
 
   // Delete history
   int deleted_count = 0;
   ASSERT_TRUE(backend->DeleteHistory(std::string(), std::vector<string16>(),
                                      &deleted_count));
   EXPECT_EQ(2, deleted_count);
   // The row2 was deleted.
   EXPECT_FALSE(history_db_.GetRowForURL(row2.url(), NULL));
   // Still find the row1.
   URLRow url_row;
   ASSERT_TRUE(history_db_.GetRowForURL(row1.url(), &url_row));
   // The visit_count was reset.
   EXPECT_EQ(0, url_row.visit_count());
   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);
   EXPECT_EQ(row1.title(), child1->GetTitle());
   EXPECT_EQ(row1.url(), child1->url());
 
   // Verify notification
   ASSERT_TRUE(delegate_.deleted_details());
   ASSERT_EQ(2u, delegate_.deleted_details()->rows.size());
   EXPECT_EQ(row1.url(),
@@ skipping 115 matching lines @@
   row2.set_is_bookmark(false);
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
   row2.set_favicon(data);
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   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;
 
   projections.push_back(HistoryAndBookmarkRow::URL);
 
   scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks(
       projections, std::string("folder=0"), std::vector<string16>(),
       std::string("url ASC")));
   ASSERT_TRUE(statement->statement()->Step());
   EXPECT_EQ(row1.raw_url(), statement->statement()->ColumnString(0));
   EXPECT_FALSE(statement->statement()->Step());
 
   // Query by folder=1, the row2 should returned.
   statement.reset(backend->QueryHistoryAndBookmarks(
       projections, std::string("folder=1"), std::vector<string16>(),
       std::string("url ASC")));
   ASSERT_TRUE(statement->statement()->Step());
   EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0)));
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 }  // namespace history