Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / browser_unittest.cc

diff --git a/src/chrome/browser/ui/browser_unittest.cc b/src/chrome/browser/ui/browser_unittest.cc
index d3c0b47..6054666 100644 (file)
--- a/src/chrome/browser/ui/browser_unittest.cc
+++ b/src/chrome/browser/ui/browser_unittest.cc
@@ -22,7 +22,7 @@ using content::WebContentsTester;
 class BrowserUnitTest : public BrowserWithTestWindowTest {
  public:
   BrowserUnitTest() {}
-  virtual ~BrowserUnitTest() {}
+  ~BrowserUnitTest() override {}
 
   // Caller owns the memory.
   WebContents* CreateTestWebContents() {
@@ -69,7 +69,7 @@ TEST_F(BrowserUnitTest, ReloadCrashedTab) {
 class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
  public:
   BrowserBookmarkBarTest() {}
-  virtual ~BrowserBookmarkBarTest() {}
+  ~BrowserBookmarkBarTest() override {}
 
  protected:
   BookmarkBar::State window_bookmark_bar_state() const {
@@ -78,13 +78,13 @@ class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
   }
 
   // BrowserWithTestWindowTest:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     static_cast<BookmarkBarStateTestBrowserWindow*>(
         browser()->window())->set_browser(browser());
   }
 
-  virtual BrowserWindow* CreateBrowserWindow() OVERRIDE {
+  BrowserWindow* CreateBrowserWindow() override {
     return new BookmarkBarStateTestBrowserWindow();
   }
 
@@ -94,7 +94,7 @@ class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
     BookmarkBarStateTestBrowserWindow()
         : browser_(NULL),
           bookmark_bar_state_(BookmarkBar::HIDDEN) {}
-    virtual ~BookmarkBarStateTestBrowserWindow() {}
+    ~BookmarkBarStateTestBrowserWindow() override {}
 
     void set_browser(Browser* browser) { browser_ = browser; }
 
@@ -104,16 +104,16 @@ class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
 
    private:
     // TestBrowserWindow:
-    virtual void BookmarkBarStateChanged(
-        BookmarkBar::AnimateChangeType change_type) OVERRIDE {
+    void BookmarkBarStateChanged(
+        BookmarkBar::AnimateChangeType change_type) override {
       bookmark_bar_state_ = browser_->bookmark_bar_state();
       TestBrowserWindow::BookmarkBarStateChanged(change_type);
     }
 
-    virtual void OnActiveTabChanged(content::WebContents* old_contents,
-                                    content::WebContents* new_contents,
-                                    int index,
-                                    int reason) OVERRIDE {
+    void OnActiveTabChanged(content::WebContents* old_contents,
+                            content::WebContents* new_contents,
+                            int index,
+                            int reason) override {
       bookmark_bar_state_ = browser_->bookmark_bar_state();
       TestBrowserWindow::OnActiveTabChanged(old_contents, new_contents, index,
                                             reason);