Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / bookmarks / bookmark_context_menu_unittest.cc

diff --git a/src/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/src/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
index 6c01c08..1178598 100644 (file)
--- a/src/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
+++ b/src/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
@@ -45,7 +45,7 @@ namespace {
 // PageNavigator implementation that records the URL.
 class TestingPageNavigator : public PageNavigator {
  public:
-  virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE {
+  WebContents* OpenURL(const OpenURLParams& params) override {
     urls_.push_back(params.url);
     return NULL;
   }
@@ -63,18 +63,18 @@ class BookmarkContextMenuTest : public testing::Test {
         model_(NULL) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     event_source_ = ui::PlatformEventSource::CreateDefault();
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
 
     model_ = BookmarkModelFactory::GetForProfile(profile_.get());
-    test::WaitForBookmarkModelToLoad(model_);
+    bookmarks::test::WaitForBookmarkModelToLoad(model_);
 
     AddTestData();
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
 
     BrowserThread::GetBlockingPool()->FlushForTesting();