Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / bookmarks / chrome_bookmark_client_unittest.cc

diff --git a/src/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc b/src/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
index 0a72635..93d1ffb 100644 (file)
--- a/src/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
+++ b/src/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
@@ -30,9 +30,9 @@ using testing::_;
 class ChromeBookmarkClientTest : public testing::Test {
  public:
   ChromeBookmarkClientTest() : client_(NULL), model_(NULL) {}
-  virtual ~ChromeBookmarkClientTest() {}
+  ~ChromeBookmarkClientTest() override {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     prefs_ = profile_.GetTestingPrefService();
     ASSERT_FALSE(prefs_->HasPrefPath(bookmarks::prefs::kManagedBookmarks));
 
@@ -46,14 +46,12 @@ class ChromeBookmarkClientTest : public testing::Test {
     EXPECT_NE(-1, model_->root_node()->GetIndexOf(client_->managed_node()));
   }
 
-  virtual void TearDown() OVERRIDE {
-    model_->RemoveObserver(&observer_);
-  }
+  void TearDown() override { model_->RemoveObserver(&observer_); }
 
   void ResetModel() {
     profile_.CreateBookmarkModel(false);
     model_ = BookmarkModelFactory::GetForProfile(&profile_);
-    test::WaitForBookmarkModelToLoad(model_);
+    bookmarks::test::WaitForBookmarkModelToLoad(model_);
     model_->AddObserver(&observer_);
     client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
     DCHECK(client_);