Standardize usage of virtual/override/final in chrome/browser/ui/

chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 14 matching lines @@
 // Error class has a menu item.
 class MenuError : public GlobalError {
  public:
   explicit MenuError(int command_id)
       : command_id_(command_id),
         execute_count_(0) {
   }
 
   int execute_count() { return execute_count_; }
 
-  virtual bool HasMenuItem() override { return true; }
-  virtual int MenuItemCommandID() override { return command_id_; }
-  virtual base::string16 MenuItemLabel() override { return base::string16(); }
-  virtual void ExecuteMenuItem(Browser* browser) override { execute_count_++; }
+  bool HasMenuItem() override { return true; }
+  int MenuItemCommandID() override { return command_id_; }
+  base::string16 MenuItemLabel() override { return base::string16(); }
+  void ExecuteMenuItem(Browser* browser) override { execute_count_++; }
 
-  virtual bool HasBubbleView() override { return false; }
-  virtual bool HasShownBubbleView() override { return false; }
-  virtual void ShowBubbleView(Browser* browser) override { ADD_FAILURE(); }
-  virtual GlobalErrorBubbleViewBase* GetBubbleView() override { return NULL; }
+  bool HasBubbleView() override { return false; }
+  bool HasShownBubbleView() override { return false; }
+  void ShowBubbleView(Browser* browser) override { ADD_FAILURE(); }
+  GlobalErrorBubbleViewBase* GetBubbleView() override { return NULL; }
 
  private:
   int command_id_;
   int execute_count_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuError);
 };
 
 } // namespace
 
 class WrenchMenuModelTest : public BrowserWithTestWindowTest,
                             public ui::AcceleratorProvider {
  public:
   // Don't handle accelerators.
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      ui::Accelerator* accelerator) override { return false; }
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override {
+    return false;
+  }
 
  protected:
   virtual void SetUp() override {
     prefs_.reset(new TestingPrefServiceSimple());
     chrome::RegisterLocalState(prefs_->registry());
 
     TestingBrowserProcess::GetGlobal()->SetLocalState(prefs_.get());
     testing_io_thread_state_.reset(new chrome::TestingIOThreadState());
     BrowserWithTestWindowTest::SetUp();
   }
@@ skipping 17 matching lines @@
  public:
   TestWrenchMenuModel(ui::AcceleratorProvider* provider,
                       Browser* browser)
       : WrenchMenuModel(provider, browser),
         execute_count_(0),
         checked_count_(0),
         enable_count_(0) {
   }
 
   // Testing overrides to ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const override {
+  bool IsCommandIdChecked(int command_id) const override {
     bool val = WrenchMenuModel::IsCommandIdChecked(command_id);
     if (val)
       checked_count_++;
     return val;
   }
 
-  virtual bool IsCommandIdEnabled(int command_id) const override {
+  bool IsCommandIdEnabled(int command_id) const override {
     ++enable_count_;
     return true;
   }
 
-  virtual void ExecuteCommand(int command_id, int event_flags) override {
+  void ExecuteCommand(int command_id, int event_flags) override {
     ++execute_count_;
   }
 
   int execute_count_;
   mutable int checked_count_;
   mutable int enable_count_;
 };
 
 TEST_F(WrenchMenuModelTest, Basics) {
   TestWrenchMenuModel model(this, browser());
@@ skipping 73 matching lines @@
 
 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
                               public MenuModelTest {
 };
 
 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
   EncodingMenuModel model(browser());
   ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591));
 }