Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / history / android / android_history_provider_service_unittest.cc

diff --git a/src/chrome/browser/history/android/android_history_provider_service_unittest.cc b/src/chrome/browser/history/android/android_history_provider_service_unittest.cc
index bf2202c..e2f7ccc 100644 (file)
--- a/src/chrome/browser/history/android/android_history_provider_service_unittest.cc
+++ b/src/chrome/browser/history/android/android_history_provider_service_unittest.cc
@@ -44,7 +44,7 @@ class AndroidHistoryProviderServiceTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Setup the testing profile, so the bookmark_model_sql_handler could
     // get the bookmark model from it.
     ASSERT_TRUE(profile_manager_.SetUp());
@@ -54,13 +54,13 @@ class AndroidHistoryProviderServiceTest : public testing::Test {
         chrome::kInitialProfile);
 
     testing_profile_->CreateBookmarkModel(true);
-    test::WaitForBookmarkModelToLoad(
+    bookmarks::test::WaitForBookmarkModelToLoad(
         BookmarkModelFactory::GetForProfile(testing_profile_));
     ASSERT_TRUE(testing_profile_->CreateHistoryService(true, false));
     service_.reset(new AndroidHistoryProviderService(testing_profile_));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     testing_profile_->DestroyHistoryService();
     profile_manager_.DeleteTestingProfile(chrome::kInitialProfile);
     testing_profile_=NULL;