Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / importer / profile_writer_unittest.cc

diff --git a/src/chrome/browser/importer/profile_writer_unittest.cc b/src/chrome/browser/importer/profile_writer_unittest.cc
index 743d1a7..5dc372c 100644 (file)
--- a/src/chrome/browser/importer/profile_writer_unittest.cc
+++ b/src/chrome/browser/importer/profile_writer_unittest.cc
@@ -29,7 +29,7 @@ class TestProfileWriter : public ProfileWriter {
  public:
   explicit TestProfileWriter(Profile* profile) : ProfileWriter(profile) {}
  protected:
-  virtual ~TestProfileWriter() {}
+  ~TestProfileWriter() override {}
 };
 
 class ProfileWriterTest : public testing::Test {
@@ -38,7 +38,7 @@ class ProfileWriterTest : public testing::Test {
       : ui_thread_(BrowserThread::UI, &loop_),
         file_thread_(BrowserThread::FILE, &loop_) {
   }
-  virtual ~ProfileWriterTest() {}
+  ~ProfileWriterTest() override {}
 
   // Create test bookmark entries to be added to ProfileWriter to
   // simulate bookmark importing.
@@ -141,7 +141,7 @@ TEST_F(ProfileWriterTest, CheckBookmarksWithMultiProfile) {
 
   BookmarkModel* bookmark_model2 =
       BookmarkModelFactory::GetForProfile(&profile2);
-  test::WaitForBookmarkModelToLoad(bookmark_model2);
+  bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model2);
   bookmarks::AddIfNotBookmarked(
       bookmark_model2, GURL("http://www.bing.com"), base::ASCIIToUTF16("Bing"));
   TestingProfile profile1;
@@ -150,7 +150,7 @@ TEST_F(ProfileWriterTest, CheckBookmarksWithMultiProfile) {
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model1 =
       BookmarkModelFactory::GetForProfile(&profile1);
-  test::WaitForBookmarkModelToLoad(bookmark_model1);
+  bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model1);
 
   scoped_refptr<TestProfileWriter> profile_writer(
       new TestProfileWriter(&profile1));
@@ -174,7 +174,7 @@ TEST_F(ProfileWriterTest, CheckBookmarksAfterWritingDataTwice) {
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForProfile(&profile);
-  test::WaitForBookmarkModelToLoad(bookmark_model);
+  bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
 
   scoped_refptr<TestProfileWriter> profile_writer(
       new TestProfileWriter(&profile));