Update {virtual,override} to follow C++11 style in chrome.

The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.

This patch was manually generated using a regex and a text editor.

BUG=417463

Review URL: https://codereview.chromium.org/1100223002

Cr-Commit-Position: refs/heads/master@{#326870}

194 files changed, 1100 insertions, 1166 deletions

diff --git a/chrome/app/chrome_crash_reporter_client.h b/chrome/app/chrome_crash_reporter_client.h
index 667f22e..ebc1dd9 100644
--- a/chrome/app/chrome_crash_reporter_client.h
+++ b/chrome/app/chrome_crash_reporter_client.h
@@ -27,25 +27,24 @@ class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient {
       const std::string& client_guid) override;
 #endif
 #if defined(OS_WIN)
-  virtual bool GetAlternativeCrashDumpLocation(base::FilePath* crash_dir)
-      override;
-  virtual void GetProductNameAndVersion(const base::FilePath& exe_path,
-                                        base::string16* product_name,
-                                        base::string16* version,
-                                        base::string16* special_build,
-                                        base::string16* channel_name) override;
-  virtual bool ShouldShowRestartDialog(base::string16* title,
-                                       base::string16* message,
-                                       bool* is_rtl_locale) override;
-  virtual bool AboutToRestart() override;
-  virtual bool GetDeferredUploadsSupported(bool is_per_user_install) override;
-  virtual bool GetIsPerUserInstall(const base::FilePath& exe_path) override;
-  virtual bool GetShouldDumpLargerDumps(bool is_per_user_install) override;
-  virtual int GetResultCodeRespawnFailed() override;
-  virtual void InitBrowserCrashDumpsRegKey() override;
-  virtual void RecordCrashDumpAttempt(bool is_real_crash) override;
-  virtual void RecordCrashDumpAttemptResult(bool is_real_crash,
-                                            bool succeeded) override;
+  bool GetAlternativeCrashDumpLocation(base::FilePath* crash_dir) override;
+  void GetProductNameAndVersion(const base::FilePath& exe_path,
+                                base::string16* product_name,
+                                base::string16* version,
+                                base::string16* special_build,
+                                base::string16* channel_name) override;
+  bool ShouldShowRestartDialog(base::string16* title,
+                               base::string16* message,
+                               bool* is_rtl_locale) override;
+  bool AboutToRestart() override;
+  bool GetDeferredUploadsSupported(bool is_per_user_install) override;
+  bool GetIsPerUserInstall(const base::FilePath& exe_path) override;
+  bool GetShouldDumpLargerDumps(bool is_per_user_install) override;
+  int GetResultCodeRespawnFailed() override;
+  void InitBrowserCrashDumpsRegKey() override;
+  void RecordCrashDumpAttempt(bool is_real_crash) override;
+  void RecordCrashDumpAttemptResult(bool is_real_crash,
+                                    bool succeeded) override;
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
diff --git a/chrome/app/delay_load_hook_unittest_win.cc b/chrome/app/delay_load_hook_unittest_win.cc
index ed2adf8..8ef56b6 100644
--- a/chrome/app/delay_load_hook_unittest_win.cc
+++ b/chrome/app/delay_load_hook_unittest_win.cc
@@ -18,7 +18,7 @@ class ChromeDelayLoadHookTest : public testing::Test {
   ChromeDelayLoadHookTest() : proc_ptr_(NULL) {
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     SetupInfo("kernel32.dll");
   }
 
diff --git a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc
index 913c9c8..7650042 100644
--- a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc
+++ b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc
@@ -116,16 +116,16 @@ class FakeHost : public apps::AppShimHandler::Host {
 
   MOCK_METHOD1(OnAppLaunchComplete, void(AppShimLaunchResult));
 
-  virtual void OnAppClosed() override {
+  void OnAppClosed() override {
     handler_->OnShimClose(this);
     ++close_count_;
   }
-  virtual void OnAppHide() override {}
-  virtual void OnAppRequestUserAttention(AppShimAttentionType type) override {}
-  virtual base::FilePath GetProfilePath() const override {
+  void OnAppHide() override {}
+  void OnAppRequestUserAttention(AppShimAttentionType type) override {}
+  base::FilePath GetProfilePath() const override {
     return profile_path_;
   }
-  virtual std::string GetAppId() const override { return app_id_; }
+  std::string GetAppId() const override { return app_id_; }
 
   int close_count() { return close_count_; }
 
diff --git a/chrome/browser/autocomplete/autocomplete_controller.h b/chrome/browser/autocomplete/autocomplete_controller.h
index 8096137..6ca35cb 100644
--- a/chrome/browser/autocomplete/autocomplete_controller.h
+++ b/chrome/browser/autocomplete/autocomplete_controller.h
@@ -57,7 +57,7 @@ class AutocompleteController : public AutocompleteProviderListener {
                          TemplateURLService* template_url_service,
                          AutocompleteControllerDelegate* delegate,
                          int provider_types);
-  ~AutocompleteController();
+  ~AutocompleteController() override;
 
   // Starts an autocomplete query, which continues until all providers are
   // done or the query is Stop()ed.  It is safe to Start() a new query without
@@ -96,7 +96,7 @@ class AutocompleteController : public AutocompleteProviderListener {
   void ExpireCopiedEntries();
 
   // AutocompleteProviderListener:
-  virtual void OnProviderUpdate(bool updated_matches) override;
+  void OnProviderUpdate(bool updated_matches) override;
 
   // Called when an omnibox event log entry is generated.
   // Populates provider_info with diagnostic information about the status
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
index 4a43e2d..6a97dff 100644
--- a/chrome/browser/autocomplete/history_url_provider.h
+++ b/chrome/browser/autocomplete/history_url_provider.h
@@ -193,11 +193,10 @@ class HistoryURLProvider : public HistoryProvider {
   HistoryURLProvider(AutocompleteProviderListener* listener, Profile* profile);
 
   // HistoryProvider:
-  virtual void Start(const AutocompleteInput& input,
-                     bool minimal_changes,
-                     bool called_due_to_focus) override;
-  virtual void Stop(bool clear_cached_results,
-                    bool due_to_user_inactivity) override;
+  void Start(const AutocompleteInput& input,
+             bool minimal_changes,
+             bool called_due_to_focus) override;
+  void Stop(bool clear_cached_results, bool due_to_user_inactivity) override;
 
   // Returns a match representing a navigation to |destination_url| given user
   // input of |text|.  |trim_http| controls whether the match's |fill_into_edit|
@@ -229,7 +228,7 @@ class HistoryURLProvider : public HistoryProvider {
   };
   class VisitClassifier;
 
-  ~HistoryURLProvider();
+  ~HistoryURLProvider() override;
 
   // Determines the relevance for a match, given its type.  If |match_type| is
   // NORMAL, |match_number| is a number indicating the relevance of the match
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc
index adc41d3..50f8642 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc
@@ -29,8 +29,8 @@ class TestPersonalDataManager : public PersonalDataManager {
   using PersonalDataManager::SetPrefService;
 
   // Overridden to avoid a trip to the database.
-  virtual void LoadProfiles() override {}
-  virtual void LoadCreditCards() override {}
+  void LoadProfiles() override {}
+  void LoadCreditCards() override {}
 
   MOCK_METHOD1(SaveImportedCreditCard,
                std::string(const CreditCard& imported_credit_card));
diff --git a/chrome/browser/browser_process_platform_part_aurawin.h b/chrome/browser/browser_process_platform_part_aurawin.h
index 9cf6dc4..8063f26 100644
--- a/chrome/browser/browser_process_platform_part_aurawin.h
+++ b/chrome/browser/browser_process_platform_part_aurawin.h
@@ -17,19 +17,19 @@ class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase,
                                    public content::NotificationObserver {
  public:
   BrowserProcessPlatformPart();
-  virtual ~BrowserProcessPlatformPart();
+  ~BrowserProcessPlatformPart() override;
 
   // Invoked when the ASH metro viewer process on Windows 8 exits.
   void OnMetroViewerProcessTerminated();
 
   // Overridden from BrowserProcessPlatformPartBase:
-  virtual void PlatformSpecificCommandLineProcessing(
+  void PlatformSpecificCommandLineProcessing(
       const base::CommandLine& command_line) override;
 
   // content::NotificationObserver method:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
  private:
   // Hosts the channel for the Windows 8 metro viewer process which runs in
diff --git a/chrome/browser/chrome_browser_main_win.h b/chrome/browser/chrome_browser_main_win.h
index e5b0883..2662b7b 100644
--- a/chrome/browser/chrome_browser_main_win.h
+++ b/chrome/browser/chrome_browser_main_win.h
@@ -26,17 +26,17 @@ class ChromeBrowserMainPartsWin : public ChromeBrowserMainParts {
   explicit ChromeBrowserMainPartsWin(
       const content::MainFunctionParams& parameters);
 
-  virtual ~ChromeBrowserMainPartsWin();
+  ~ChromeBrowserMainPartsWin() override;
 
   // BrowserParts overrides.
-  virtual void ToolkitInitialized() override;
-  virtual void PreMainMessageLoopStart() override;
-  virtual int PreCreateThreads() override;
+  void ToolkitInitialized() override;
+  void PreMainMessageLoopStart() override;
+  int PreCreateThreads() override;
 
   // ChromeBrowserMainParts overrides.
-  virtual void ShowMissingLocaleMessageBox() override;
-  virtual void PostProfileInit() override;
-  virtual void PostBrowserStart() override;
+  void ShowMissingLocaleMessageBox() override;
+  void PostProfileInit() override;
+  void PostBrowserStart() override;
 
   // Prepares the localized strings that are going to be displayed to
   // the user if the browser process dies. These strings are stored in the
diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc
index 1bc9e4d..1960aa5 100644
--- a/chrome/browser/chrome_elf_init_unittest_win.cc
+++ b/chrome/browser/chrome_elf_init_unittest_win.cc
@@ -24,9 +24,9 @@ const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";
 class ChromeBlacklistTrialTest : public testing::Test {
  protected:
   ChromeBlacklistTrialTest() {}
-  virtual ~ChromeBlacklistTrialTest() {}
+  ~ChromeBlacklistTrialTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     testing::Test::SetUp();
 
     override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
diff --git a/chrome/browser/chrome_select_file_dialog_factory_win.h b/chrome/browser/chrome_select_file_dialog_factory_win.h
index 1846da8..6dd9fe7 100644
--- a/chrome/browser/chrome_select_file_dialog_factory_win.h
+++ b/chrome/browser/chrome_select_file_dialog_factory_win.h
@@ -23,11 +23,11 @@ class ChromeSelectFileDialogFactory : public ui::SelectFileDialogFactory {
   // Uses |blocking_task_runner| to perform IPC with the utility process.
   explicit ChromeSelectFileDialogFactory(
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
-  virtual ~ChromeSelectFileDialogFactory();
+  ~ChromeSelectFileDialogFactory() override;
 
   // ui::SelectFileDialogFactory implementation
-  virtual ui::SelectFileDialog* Create(ui::SelectFileDialog::Listener* listener,
-                                       ui::SelectFilePolicy* policy) override;
+  ui::SelectFileDialog* Create(ui::SelectFileDialog::Listener* listener,
+                               ui::SelectFilePolicy* policy) override;
 
  private:
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index 882f037..eb803ec 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -1359,13 +1359,13 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) {
 template<GuestMode M>
 class GalleryBrowserTestBase : public FileManagerBrowserTestBase {
  public:
-  virtual GuestMode GetGuestModeParam() const override { return M; }
-  virtual const char* GetTestCaseNameParam() const override {
+  GuestMode GetGuestModeParam() const override { return M; }
+  const char* GetTestCaseNameParam() const override {
     return test_case_name_.c_str();
   }
 
  protected:
-  virtual const char* GetTestManifestName() const override {
+  const char* GetTestManifestName() const override {
     return "gallery_test_manifest.json";
   }
 
@@ -1512,19 +1512,19 @@ IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) {
 template<GuestMode M>
 class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase {
  public:
-  virtual GuestMode GetGuestModeParam() const override { return M; }
-  virtual const char* GetTestCaseNameParam() const override {
+  GuestMode GetGuestModeParam() const override { return M; }
+  const char* GetTestCaseNameParam() const override {
     return test_case_name_.c_str();
   }
 
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(
         chromeos::switches::kEnableVideoPlayerChromecastSupport);
     FileManagerBrowserTestBase::SetUpCommandLine(command_line);
   }
 
-  virtual const char* GetTestManifestName() const override {
+  const char* GetTestManifestName() const override {
     return "video_player_test_manifest.json";
   }
 
diff --git a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h
index cbcada8..b6dd5e1 100644
--- a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h
@@ -22,9 +22,9 @@ class MockAutoEnrollmentCheckScreenActor
     : public AutoEnrollmentCheckScreenActor {
  public:
   MockAutoEnrollmentCheckScreenActor();
-  virtual ~MockAutoEnrollmentCheckScreenActor();
+  ~MockAutoEnrollmentCheckScreenActor() override;
 
-  virtual void SetDelegate(Delegate* screen) override;
+  void SetDelegate(Delegate* screen) override;
 
   MOCK_METHOD1(MockSetDelegate, void(Delegate* screen));
   MOCK_METHOD0(Show, void());
diff --git a/chrome/browser/chromeos/login/resource_loader_browsertest.cc b/chrome/browser/chromeos/login/resource_loader_browsertest.cc
index 3041775..2053e46 100644
--- a/chrome/browser/chromeos/login/resource_loader_browsertest.cc
+++ b/chrome/browser/chromeos/login/resource_loader_browsertest.cc
@@ -33,12 +33,12 @@ class ResourceLoaderBrowserTest : public InProcessBrowserTest {
   ResourceLoaderBrowserTest() {}
 
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     // Needed to load file:// URLs in XHRs.
     command_line->AppendSwitch(switches::kDisableWebSecurity);
   }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     // Create the root page containing resource_loader.js.
     std::string root_page =
         "<html>"
diff --git a/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h b/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h
index 235d2de..85ec708 100644
--- a/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h
@@ -23,15 +23,14 @@ class MockEnableDebuggingScreenActor
     : public EnableDebuggingScreenActor {
  public:
   MockEnableDebuggingScreenActor();
-  virtual ~MockEnableDebuggingScreenActor();
+  ~MockEnableDebuggingScreenActor() override;
 
   MOCK_METHOD0(PrepareToShow, void());
   MOCK_METHOD0(Show, void());
   MOCK_METHOD0(Hide, void());
   MOCK_METHOD1(MockSetDelegate, void(Delegate* delegate));
 
-  virtual void SetDelegate(
-      EnableDebuggingScreenActor::Delegate* delegate) override;
+  void SetDelegate(EnableDebuggingScreenActor::Delegate* delegate) override;
 
  private:
   Delegate* delegate_;
diff --git a/chrome/browser/chromeos/login/screens/mock_eula_screen.h b/chrome/browser/chromeos/login/screens/mock_eula_screen.h
index 36a015d..2186750 100644
--- a/chrome/browser/chromeos/login/screens/mock_eula_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_eula_screen.h
@@ -23,10 +23,10 @@ class MockEulaScreen : public EulaScreen {
 class MockEulaView : public EulaView {
  public:
   MockEulaView();
-  virtual ~MockEulaView();
+  ~MockEulaView() override;
 
-  virtual void Bind(EulaModel& model) override;
-  virtual void Unbind() override;
+  void Bind(EulaModel& model) override;
+  void Unbind() override;
 
   MOCK_METHOD0(PrepareToShow, void());
   MOCK_METHOD0(Show, void());
diff --git a/chrome/browser/chromeos/login/screens/mock_network_screen.h b/chrome/browser/chromeos/login/screens/mock_network_screen.h
index bcb4f90..9ccae6b 100644
--- a/chrome/browser/chromeos/login/screens/mock_network_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_network_screen.h
@@ -17,7 +17,7 @@ class MockNetworkScreen : public NetworkScreen {
   MockNetworkScreen(BaseScreenDelegate* base_screen_delegate,
                     Delegate* delegate,
                     NetworkView* view);
-  virtual ~MockNetworkScreen();
+  ~MockNetworkScreen() override;
 
   MOCK_METHOD0(Show, void());
   MOCK_METHOD0(Hide, void());
@@ -26,10 +26,10 @@ class MockNetworkScreen : public NetworkScreen {
 class MockNetworkView : public NetworkView {
  public:
   MockNetworkView();
-  virtual ~MockNetworkView();
+  ~MockNetworkView() override;
 
-  virtual void Bind(NetworkModel& model) override;
-  virtual void Unbind() override;
+  void Bind(NetworkModel& model) override;
+  void Unbind() override;
 
   MOCK_METHOD1(MockBind, void(NetworkModel& model));
   MOCK_METHOD0(MockUnbind, void());
diff --git a/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h b/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h
index 6a9ba39..067ce4b 100644
--- a/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h
@@ -23,9 +23,9 @@ class MockWrongHWIDScreen : public WrongHWIDScreen {
 class MockWrongHWIDScreenActor : public WrongHWIDScreenActor {
  public:
   MockWrongHWIDScreenActor();
-  virtual ~MockWrongHWIDScreenActor();
+  ~MockWrongHWIDScreenActor() override;
 
-  virtual void SetDelegate(Delegate* delegate) override;
+  void SetDelegate(Delegate* delegate) override;
 
   MOCK_METHOD0(PrepareToShow, void());
   MOCK_METHOD0(Show, void());
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h
index 78a6ef9..c7545bc 100644
--- a/chrome/browser/chromeos/login/users/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h
@@ -98,25 +98,24 @@ class MockUserManager : public ChromeUserManager {
 
   // You can't mock these functions easily because nobody can create
   // User objects but the ChromeUserManager and us.
-  virtual const user_manager::UserList& GetUsers() const override;
-  virtual const user_manager::User* GetLoggedInUser() const override;
-  virtual user_manager::UserList GetUnlockUsers() const override;
-  virtual const std::string& GetOwnerEmail() const override;
-  virtual user_manager::User* GetLoggedInUser() override;
-  virtual const user_manager::User* GetActiveUser() const override;
-  virtual user_manager::User* GetActiveUser() override;
-  virtual const user_manager::User* GetPrimaryUser() const override;
+  const user_manager::UserList& GetUsers() const override;
+  const user_manager::User* GetLoggedInUser() const override;
+  user_manager::UserList GetUnlockUsers() const override;
+  const std::string& GetOwnerEmail() const override;
+  user_manager::User* GetLoggedInUser() override;
+  const user_manager::User* GetActiveUser() const override;
+  user_manager::User* GetActiveUser() override;
+  const user_manager::User* GetPrimaryUser() const override;
 
   // ChromeUserManager overrides:
-  virtual BootstrapManager* GetBootstrapManager() override;
-  virtual MultiProfileUserController* GetMultiProfileUserController() override;
-  virtual UserImageManager* GetUserImageManager(
-      const std::string& user_id) override;
-  virtual SupervisedUserManager* GetSupervisedUserManager() override;
+  BootstrapManager* GetBootstrapManager() override;
+  MultiProfileUserController* GetMultiProfileUserController() override;
+  UserImageManager* GetUserImageManager(const std::string& user_id) override;
+  SupervisedUserManager* GetSupervisedUserManager() override;
   MOCK_METHOD2(SetUserFlow, void(const std::string&, UserFlow*));
   MOCK_METHOD1(ResetUserFlow, void(const std::string&));
-  virtual UserFlow* GetCurrentUserFlow() const override;
-  virtual UserFlow* GetUserFlow(const std::string&) const override;
+  UserFlow* GetCurrentUserFlow() const override;
+  UserFlow* GetUserFlow(const std::string&) const override;
 
   // Sets a new User instance. Users previously created by this MockUserManager
   // become invalid.
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
index 1355846..f9800ab 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
@@ -115,8 +115,8 @@ class DeviceLocalAccountPolicyServiceTest
  protected:
   DeviceLocalAccountPolicyServiceTest();
 
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   void InstallDevicePolicy() override;
 
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
index da4a95c..9b770a0 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
@@ -201,7 +201,7 @@ class NetworkConfigurationUpdaterTest : public testing::Test {
  protected:
   NetworkConfigurationUpdaterTest() : certificate_importer_(NULL) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     EXPECT_CALL(provider_, IsInitializationComplete(_))
         .WillRepeatedly(Return(false));
     provider_.Init();
@@ -231,7 +231,7 @@ class NetworkConfigurationUpdaterTest : public testing::Test {
     certificate_importer_owned_.reset(certificate_importer_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     network_configuration_updater_.reset();
     provider_.Shutdown();
     base::RunLoop().RunUntilIdle();
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
index 5451f0d..56ff9d9 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
@@ -52,7 +52,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase {
       : local_state_(TestingBrowserProcess::GetGlobal()),
         user_data_dir_override_(chrome::DIR_USER_DATA) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     DeviceSettingsTestBase::SetUp();
 
     EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());
@@ -64,9 +64,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase {
     Mock::VerifyAndClearExpectations(this);
   }
 
-  virtual void TearDown() override {
-    DeviceSettingsTestBase::TearDown();
-  }
+  void TearDown() override { DeviceSettingsTestBase::TearDown(); }
 
   // Helper routine to enable/disable all reporting settings in policy.
   void SetReportingSettings(bool enable_reporting, int frequency) {
diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
index 9eda36b..5a63d61 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
@@ -52,7 +52,7 @@ class SessionManagerOperationTest : public testing::Test {
         ->SetOwnerKeyUtilForTesting(owner_key_util_);
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     policy_.payload().mutable_user_whitelist()->add_user_whitelist(
         "fake-whitelist");
     policy_.Build();
diff --git a/chrome/browser/crash_upload_list_win.h b/chrome/browser/crash_upload_list_win.h
index 8e1393a..28e99ca 100644
--- a/chrome/browser/crash_upload_list_win.h
+++ b/chrome/browser/crash_upload_list_win.h
@@ -16,7 +16,7 @@ class CrashUploadListWin : public CrashUploadList {
 
  protected:
   // Loads the list of crashes from the Windows Event Log.
-  virtual void LoadUploadList() override;
+  void LoadUploadList() override;
 
  private:
   // Returns whether the event record is likely a Chrome crash log.
diff --git a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
index 1eab6e8..035c39b 100644
--- a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
@@ -120,11 +120,11 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
         broken_(false) {
   }
 
-  virtual scoped_refptr<UsbDevice> GetDevice() const override {
+  scoped_refptr<UsbDevice> GetDevice() const override {
     return device_;
   }
 
-  virtual void Close() override { device_ = nullptr; }
+  void Close() override { device_ = nullptr; }
 
   void SetConfiguration(int configuration_value,
                         const ResultCallback& callback) override {
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index fdda636..913612e 100644
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -74,22 +74,21 @@ class TestChromeDownloadManagerDelegate : public ChromeDownloadManagerDelegate {
       : ChromeDownloadManagerDelegate(profile) {
   }
 
-  virtual ~TestChromeDownloadManagerDelegate() {}
+  ~TestChromeDownloadManagerDelegate() override {}
 
-  virtual safe_browsing::DownloadProtectionService*
+  safe_browsing::DownloadProtectionService*
       GetDownloadProtectionService() override {
     return NULL;
   }
 
-  virtual void NotifyExtensions(
-      content::DownloadItem* download,
-      const base::FilePath& suggested_virtual_path,
-      const NotifyExtensionsCallback& callback) override {
+  void NotifyExtensions(content::DownloadItem* download,
+                        const base::FilePath& suggested_virtual_path,
+                        const NotifyExtensionsCallback& callback) override {
     callback.Run(base::FilePath(),
                  DownloadPathReservationTracker::UNIQUIFY);
   }
 
-  virtual void ReserveVirtualPath(
+  void ReserveVirtualPath(
       content::DownloadItem* download,
       const base::FilePath& virtual_path,
       bool create_directory,
@@ -102,7 +101,7 @@ class TestChromeDownloadManagerDelegate : public ChromeDownloadManagerDelegate {
         FROM_HERE, base::Bind(callback, virtual_path, true));
   }
 
-  virtual void PromptUserForDownloadPath(
+  void PromptUserForDownloadPath(
       DownloadItem* download,
       const base::FilePath& suggested_path,
       const DownloadTargetDeterminerDelegate::FileSelectedCallback& callback)
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index cc4bb59..39caea3 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -3427,9 +3427,9 @@ class DisableSafeBrowsingOnInProgressDownload
         final_state_seen_(false) {
     Init();
   }
-  virtual ~DisableSafeBrowsingOnInProgressDownload() {}
+  ~DisableSafeBrowsingOnInProgressDownload() override {}
 
-  virtual bool IsDownloadInFinalState(DownloadItem* download) override {
+  bool IsDownloadInFinalState(DownloadItem* download) override {
     if (download->GetState() != DownloadItem::IN_PROGRESS ||
         download->GetTargetFilePath().empty())
       return false;
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc
index 5a0008b..003906d 100644
--- a/chrome/browser/download/download_target_determiner_unittest.cc
+++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -194,8 +194,8 @@ class MockDownloadTargetDeterminerDelegate
 class DownloadTargetDeterminerTest : public ChromeRenderViewHostTestHarness {
  public:
   // ::testing::Test
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   // Creates MockDownloadItem and sets up default expectations.
   content::MockDownloadItem* CreateActiveDownloadItem(
@@ -1952,17 +1952,17 @@ class MockPluginServiceFilter : public content::PluginServiceFilter {
  public:
   MOCK_METHOD1(MockPluginAvailable, bool(const base::FilePath&));
 
-  virtual bool IsPluginAvailable(int render_process_id,
-                                 int render_view_id,
-                                 const void* context,
-                                 const GURL& url,
-                                 const GURL& policy_url,
-                                 content::WebPluginInfo* plugin) override {
+  bool IsPluginAvailable(int render_process_id,
+                         int render_view_id,
+                         const void* context,
+                         const GURL& url,
+                         const GURL& policy_url,
+                         content::WebPluginInfo* plugin) override {
     return MockPluginAvailable(plugin->path);
   }
 
-  virtual bool CanLoadPlugin(int render_process_id,
-                             const base::FilePath& path) override {
+  bool CanLoadPlugin(int render_process_id,
+                     const base::FilePath& path) override {
     return true;
   }
 };
@@ -2014,7 +2014,7 @@ class DownloadTargetDeterminerTestWithPlugin
   DownloadTargetDeterminerTestWithPlugin()
       : old_plugin_service_filter_(NULL) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     content::PluginService* plugin_service =
         content::PluginService::GetInstance();
     plugin_service->Init();
@@ -2024,7 +2024,7 @@ class DownloadTargetDeterminerTestWithPlugin
     DownloadTargetDeterminerTest::SetUp();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     content::PluginService::GetInstance()->SetFilter(
         old_plugin_service_filter_);
     DownloadTargetDeterminerTest::TearDown();
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
index 3a7769c..4310f03 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -64,7 +64,7 @@ class AutomationApiTest : public ExtensionApiTest {
   }
 
  public:
-  virtual void SetUpInProcessBrowserTestFixture() override {
+  void SetUpInProcessBrowserTestFixture() override {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
   }
 };
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
index 3f64a3f..08f01f0 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc
@@ -168,7 +168,7 @@ class EPKPChallengeKeyTestBase : public BrowserWithTestWindowTest {
     settings_helper_.SetBoolean(chromeos::kDeviceAttestationEnabled, true);
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
 
     // Set the user preferences.
diff --git a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
index 91f9b74..e372f00 100644
--- a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
+++ b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
@@ -33,7 +33,7 @@ class MockTCPSocket : public net::TCPClientSocket {
                           const net::CompletionCallback& callback));
   MOCK_METHOD2(SetKeepAlive, bool(bool enable, int delay));
   MOCK_METHOD1(SetNoDelay, bool(bool no_delay));
-  virtual bool IsConnected() const override {
+  bool IsConnected() const override {
     return true;
   }
 
diff --git a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
index a0c9cdee..57cd0ea 100644
--- a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
+++ b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc
@@ -66,7 +66,7 @@ class MockSSLClientSocket : public net::SSLClientSocket {
   MOCK_CONST_METHOD0(GetUnverifiedServerCertificateChain,
                      scoped_refptr<net::X509Certificate>());
   MOCK_CONST_METHOD0(GetChannelIDService, net::ChannelIDService*());
-  virtual bool IsConnected() const override { return true; }
+  bool IsConnected() const override { return true; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket);
@@ -88,7 +88,7 @@ class MockTCPSocket : public net::TCPClientSocket {
   MOCK_METHOD2(SetKeepAlive, bool(bool enable, int delay));
   MOCK_METHOD1(SetNoDelay, bool(bool no_delay));
 
-  virtual bool IsConnected() const override { return true; }
+  bool IsConnected() const override { return true; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockTCPSocket);
diff --git a/chrome/browser/extensions/display_info_provider_win.h b/chrome/browser/extensions/display_info_provider_win.h
index e61b081..9db5fff 100644
--- a/chrome/browser/extensions/display_info_provider_win.h
+++ b/chrome/browser/extensions/display_info_provider_win.h
@@ -12,16 +12,16 @@ namespace extensions {
 class DisplayInfoProviderWin : public DisplayInfoProvider {
  public:
   DisplayInfoProviderWin();
-  virtual ~DisplayInfoProviderWin();
+  ~DisplayInfoProviderWin() override;
 
   // DisplayInfoProvider implementation.
-  virtual bool SetInfo(const std::string& display_id,
-                       const core_api::system_display::DisplayProperties& info,
-                       std::string* error) override;
-  virtual void UpdateDisplayUnitInfoForPlatform(
+  bool SetInfo(const std::string& display_id,
+               const core_api::system_display::DisplayProperties& info,
+               std::string* error) override;
+  void UpdateDisplayUnitInfoForPlatform(
       const gfx::Display& display,
       core_api::system_display::DisplayUnitInfo* unit) override;
-  virtual gfx::Screen* GetActiveScreen() override;
+  gfx::Screen* GetActiveScreen() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderWin);
diff --git a/chrome/browser/extensions/external_registry_loader_win.h b/chrome/browser/extensions/external_registry_loader_win.h
index 27526d8..f621734 100644
--- a/chrome/browser/extensions/external_registry_loader_win.h
+++ b/chrome/browser/extensions/external_registry_loader_win.h
@@ -15,12 +15,12 @@ class ExternalRegistryLoader : public ExternalLoader {
   ExternalRegistryLoader() {}
 
  protected:
-  virtual void StartLoading() override;
+  void StartLoading() override;
 
  private:
   friend class base::RefCountedThreadSafe<ExternalLoader>;
 
-  virtual ~ExternalRegistryLoader() {}
+  ~ExternalRegistryLoader() override {}
 
   void LoadOnFileThread();
 
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.h b/chrome/browser/extensions/global_shortcut_listener_win.h
index a155d8f..9bca78c 100644
--- a/chrome/browser/extensions/global_shortcut_listener_win.h
+++ b/chrome/browser/extensions/global_shortcut_listener_win.h
@@ -19,22 +19,20 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener,
                                   public gfx::SingletonHwnd::Observer {
  public:
   GlobalShortcutListenerWin();
-  virtual ~GlobalShortcutListenerWin();
+  ~GlobalShortcutListenerWin() override;
 
  private:
   // The implementation of our Window Proc, called by SingletonHwnd.
-  virtual void OnWndProc(HWND hwnd,
-                         UINT message,
-                         WPARAM wparam,
-                         LPARAM lparam) override;
+  void OnWndProc(HWND hwnd,
+                 UINT message,
+                 WPARAM wparam,
+                 LPARAM lparam) override;
 
   // GlobalShortcutListener implementation.
-  virtual void StartListening() override;
-  virtual void StopListening() override;
-  virtual bool RegisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) override;
-  virtual void UnregisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) override;
+  void StartListening() override;
+  void StopListening() override;
+  bool RegisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
+  void UnregisterAcceleratorImpl(const ui::Accelerator& accelerator) override;
 
   // Whether this object is listening for global shortcuts.
   bool is_listening_;
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index 0c97f4c..25897c1 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -129,7 +129,7 @@ class FirstRunMasterPrefsBrowserTestT
   FirstRunMasterPrefsBrowserTestT() {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     SetMasterPreferencesForTest(Text);
     FirstRunMasterPrefsBrowserTestBase::SetUp();
   }
diff --git a/chrome/browser/first_run/try_chrome_dialog_view.h b/chrome/browser/first_run/try_chrome_dialog_view.h
index eebe9ce..48ed058 100644
--- a/chrome/browser/first_run/try_chrome_dialog_view.h
+++ b/chrome/browser/first_run/try_chrome_dialog_view.h
@@ -103,13 +103,12 @@ class TryChromeDialogView : public views::ButtonListener,
   // views::ButtonListener:
   // We have two buttons and according to what the user clicked we set |result_|
   // and we should always close and end the modal loop.
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::LinkListener:
   // If the user selects the link we need to fire off the default browser that
   // by some convoluted logic should not be chrome.
-  virtual void LinkClicked(views::Link* source, int event_flags) override;
+  void LinkClicked(views::Link* source, int event_flags) override;
 
   // Controls which flavor of the heading text to use.
   size_t flavor_;
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
index 6f469da1..828f9d1 100644
--- a/chrome/browser/importer/ie_importer_browsertest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -236,10 +236,10 @@ class TestObserver : public ProfileWriter,
   }
 
   // importer::ImporterProgressObserver:
-  virtual void ImportStarted() override {}
-  virtual void ImportItemStarted(importer::ImportItem item) override {}
-  virtual void ImportItemEnded(importer::ImportItem item) override {}
-  virtual void ImportEnded() override {
+  void ImportStarted() override {}
+  void ImportItemStarted(importer::ImportItem item) override {}
+  void ImportItemEnded(importer::ImportItem item) override {}
+  void ImportEnded() override {
     base::MessageLoop::current()->Quit();
     if (importer_items_ & importer::FAVORITES) {
       EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_);
@@ -256,16 +256,17 @@ class TestObserver : public ProfileWriter,
     // EXPECT_EQ(1, password_count_);
   }
 
-  virtual bool BookmarkModelIsLoaded() const {
+  // ProfileWriter:
+  bool BookmarkModelIsLoaded() const override {
     // Profile is ready for writing.
     return true;
   }
 
-  virtual bool TemplateURLServiceIsLoaded() const {
+  bool TemplateURLServiceIsLoaded() const override {
     return true;
   }
 
-  virtual void AddPasswordForm(const autofill::PasswordForm& form) {
+  void AddPasswordForm(const autofill::PasswordForm& form) override {
     // Importer should obtain this password form only.
     EXPECT_EQ(GURL("http://localhost:8080/security/index.htm"), form.origin);
     EXPECT_EQ("http://localhost:8080/", form.signon_realm);
@@ -277,8 +278,8 @@ class TestObserver : public ProfileWriter,
     ++password_count_;
   }
 
-  virtual void AddHistoryPage(const history::URLRows& page,
-                              history::VisitSource visit_source) {
+  void AddHistoryPage(const history::URLRows& page,
+                      history::VisitSource visit_source) override {
     bool cache_item_found = false;
     bool history_item_found = false;
     // Importer should read the specified URL.
@@ -301,9 +302,8 @@ class TestObserver : public ProfileWriter,
     EXPECT_EQ(history::SOURCE_IE_IMPORTED, visit_source);
   }
 
-  virtual void AddBookmarks(
-      const std::vector<ImportedBookmarkEntry>& bookmarks,
-      const base::string16& top_level_folder_name) override {
+  void AddBookmarks(const std::vector<ImportedBookmarkEntry>& bookmarks,
+                    const base::string16& top_level_folder_name) override {
     ASSERT_LE(bookmark_count_ + bookmarks.size(), arraysize(kIEBookmarks));
     // Importer should import the IE Favorites folder the same as the list,
     // in the same order.
@@ -323,8 +323,7 @@ class TestObserver : public ProfileWriter,
     STLDeleteContainerPointers(template_url.begin(), template_url.end());
   }
 
-  virtual void AddFavicons(
-      const favicon_base::FaviconUsageDataList& usage) override {
+  void AddFavicons(const favicon_base::FaviconUsageDataList& usage) override {
     // Importer should group the favicon information for each favicon URL.
     for (size_t i = 0; i < arraysize(kIEFaviconGroup); ++i) {
       GURL favicon_url(kIEFaviconGroup[i].favicon_url);
@@ -385,25 +384,25 @@ class MalformedFavoritesRegistryTestObserver
   }
 
   // importer::ImporterProgressObserver:
-  virtual void ImportStarted() override {}
-  virtual void ImportItemStarted(importer::ImportItem item) override {}
-  virtual void ImportItemEnded(importer::ImportItem item) override {}
-  virtual void ImportEnded() override {
+  void ImportStarted() override {}
+  void ImportItemStarted(importer::ImportItem item) override {}
+  void ImportItemEnded(importer::ImportItem item) override {}
+  void ImportEnded() override {
     base::MessageLoop::current()->Quit();
     EXPECT_EQ(arraysize(kIESortedBookmarks), bookmark_count_);
   }
 
-  virtual bool BookmarkModelIsLoaded() const { return true; }
-  virtual bool TemplateURLServiceIsLoaded() const { return true; }
-
-  virtual void AddPasswordForm(const autofill::PasswordForm& form) {}
-  virtual void AddHistoryPage(const history::URLRows& page,
-                              history::VisitSource visit_source) {}
-  virtual void AddKeyword(std::vector<TemplateURL*> template_url,
-                          int default_keyword_index) {}
-  virtual void AddBookmarks(
-      const std::vector<ImportedBookmarkEntry>& bookmarks,
-      const base::string16& top_level_folder_name) override {
+  // ProfileWriter:
+  bool BookmarkModelIsLoaded() const override { return true; }
+  bool TemplateURLServiceIsLoaded() const override { return true; }
+
+  void AddPasswordForm(const autofill::PasswordForm& form) override {}
+  void AddHistoryPage(const history::URLRows& page,
+                      history::VisitSource visit_source) override {}
+  void AddKeywords(ScopedVector<TemplateURL> template_urls,
+                   bool unique_on_host_and_path) override {}
+  void AddBookmarks(const std::vector<ImportedBookmarkEntry>& bookmarks,
+                    const base::string16& top_level_folder_name) override {
     ASSERT_LE(bookmark_count_ + bookmarks.size(),
               arraysize(kIESortedBookmarks));
     for (size_t i = 0; i < bookmarks.size(); ++i) {
@@ -415,7 +414,7 @@ class MalformedFavoritesRegistryTestObserver
   }
 
  private:
-  ~MalformedFavoritesRegistryTestObserver() {}
+  ~MalformedFavoritesRegistryTestObserver() override {}
 
   size_t bookmark_count_;
 };
@@ -426,7 +425,7 @@ class MalformedFavoritesRegistryTestObserver
 // import (via ExternalProcessImporterHost) which launches a utility process.
 class IEImporterBrowserTest : public InProcessBrowserTest {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // This will launch the browser test and thus needs to happen last.
diff --git a/chrome/browser/importer/in_process_importer_bridge.h b/chrome/browser/importer/in_process_importer_bridge.h
index 7066d56..ce09946 100644
--- a/chrome/browser/importer/in_process_importer_bridge.h
+++ b/chrome/browser/importer/in_process_importer_bridge.h
@@ -40,7 +40,7 @@ class InProcessImporterBridge : public ImporterBridge {
   void AddHomePage(const GURL& home_page) override;
 
 #if defined(OS_WIN)
-  virtual void AddIE7PasswordInfo(
+  void AddIE7PasswordInfo(
       const importer::ImporterIE7PasswordInfo& password_info) override;
 #endif
 
diff --git a/chrome/browser/install_verification/win/module_verification_test.h b/chrome/browser/install_verification/win/module_verification_test.h
index 718212c..517ea36 100644
--- a/chrome/browser/install_verification/win/module_verification_test.h
+++ b/chrome/browser/install_verification/win/module_verification_test.h
@@ -14,7 +14,7 @@ struct ModuleInfo;
 
 class ModuleVerificationTest : public testing::Test {
  public:
-  virtual void SetUp() override;
+  void SetUp() override;
 
  protected:
   bool GetLoadedModuleInfoSet(std::set<ModuleInfo>* loaded_module_info_set);
diff --git a/chrome/browser/local_discovery/privet_device_lister_unittest.cc b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
index 3f7dfa9..a165b71 100644
--- a/chrome/browser/local_discovery/privet_device_lister_unittest.cc
+++ b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
@@ -169,10 +169,10 @@ class PrivetDeviceListerTest : public testing::Test {
   PrivetDeviceListerTest() : mock_client_(&mock_delegate_) {
   }
 
-  virtual ~PrivetDeviceListerTest() {
+  ~PrivetDeviceListerTest() override {
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     example_attrs_.push_back("tXtvers=1");
     example_attrs_.push_back("ty=My Printer");
     example_attrs_.push_back("nOte=This is my Printer");
diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc
index 66bb7f6..c77de5e 100644
--- a/chrome/browser/local_discovery/privet_http_unittest.cc
+++ b/chrome/browser/local_discovery/privet_http_unittest.cc
@@ -379,7 +379,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate {
   ~MockRegisterDelegate() {
   }
 
-  virtual void OnPrivetRegisterClaimToken(
+  void OnPrivetRegisterClaimToken(
       PrivetRegisterOperation* operation,
       const std::string& token,
       const GURL& url) override {
@@ -390,7 +390,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate {
       const std::string& token,
       const GURL& url));
 
-  virtual void OnPrivetRegisterError(
+  void OnPrivetRegisterError(
       PrivetRegisterOperation* operation,
       const std::string& action,
       PrivetRegisterOperation::FailureReason reason,
@@ -405,7 +405,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate {
                     PrivetRegisterOperation::FailureReason reason,
                     int printer_http_code));
 
-  virtual void OnPrivetRegisterDone(
+  void OnPrivetRegisterDone(
       PrivetRegisterOperation* operation,
       const std::string& device_id) override {
     OnPrivetRegisterDoneInternal(device_id);
@@ -439,9 +439,9 @@ class PrivetInfoTest : public PrivetHTTPTest {
  public:
   PrivetInfoTest() {}
 
-  virtual ~PrivetInfoTest() {}
+  ~PrivetInfoTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     info_operation_ = privet_client_->CreateInfoOperation(
         info_callback_.callback());
   }
@@ -485,10 +485,10 @@ class PrivetRegisterTest : public PrivetHTTPTest {
  public:
   PrivetRegisterTest() {
   }
-  virtual ~PrivetRegisterTest() {
+  ~PrivetRegisterTest() override {
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     info_operation_ = privet_client_->CreateInfoOperation(
         info_callback_.callback());
     register_operation_ =
@@ -675,9 +675,9 @@ class PrivetCapabilitiesTest : public PrivetHTTPTest {
  public:
   PrivetCapabilitiesTest() {}
 
-  virtual ~PrivetCapabilitiesTest() {}
+  ~PrivetCapabilitiesTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     capabilities_operation_ = privet_client_->CreateCapabilitiesOperation(
         capabilities_callback_.callback());
   }
@@ -785,9 +785,9 @@ class PrivetLocalPrintTest : public PrivetHTTPTest {
  public:
   PrivetLocalPrintTest() {}
 
-  virtual ~PrivetLocalPrintTest() {}
+  ~PrivetLocalPrintTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     PrivetURLFetcher::ResetTokenMapForTests();
 
     local_print_operation_ = privet_client_->CreateLocalPrintOperation(
diff --git a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc
index 2b1daca..467e1d8 100644
--- a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc
+++ b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc
@@ -28,19 +28,19 @@ class MockPrivetURLFetcherDelegate : public PrivetURLFetcher::Delegate {
   MockPrivetURLFetcherDelegate() : raw_mode_(false) {
   }
 
-  virtual ~MockPrivetURLFetcherDelegate() {
+  ~MockPrivetURLFetcherDelegate() override {
   }
 
-  virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) override {
+  void OnError(PrivetURLFetcher* fetcher,
+               PrivetURLFetcher::ErrorType error) override {
     OnErrorInternal(error);
   }
 
   MOCK_METHOD1(OnErrorInternal, void(PrivetURLFetcher::ErrorType error));
 
-  virtual void OnParsedJson(PrivetURLFetcher* fetcher,
-                            const base::DictionaryValue& value,
-                            bool has_error) override {
+  void OnParsedJson(PrivetURLFetcher* fetcher,
+                    const base::DictionaryValue& value,
+                    bool has_error) override {
     saved_value_.reset(value.DeepCopy());
     OnParsedJsonInternal(has_error);
   }
diff --git a/chrome/browser/local_discovery/privetv3_session_unittest.cc b/chrome/browser/local_discovery/privetv3_session_unittest.cc
index 3e9c1a4..8cf8e89 100644
--- a/chrome/browser/local_discovery/privetv3_session_unittest.cc
+++ b/chrome/browser/local_discovery/privetv3_session_unittest.cc
@@ -49,17 +49,17 @@ class MockPrivetHTTPClient : public PrivetHTTPClient {
       CreateInfoOperationPtr,
       PrivetJSONOperation*(const PrivetJSONOperation::ResultCallback&));
 
-  virtual void RefreshPrivetToken(
+  void RefreshPrivetToken(
       const PrivetURLFetcher::TokenCallback& callback) override {
     FAIL();
   }
 
-  virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation(
+  scoped_ptr<PrivetJSONOperation> CreateInfoOperation(
       const PrivetJSONOperation::ResultCallback& callback) override {
     return make_scoped_ptr(CreateInfoOperationPtr(callback));
   }
 
-  virtual scoped_ptr<PrivetURLFetcher> CreateURLFetcher(
+  scoped_ptr<PrivetURLFetcher> CreateURLFetcher(
       const GURL& url,
       net::URLFetcher::RequestType request_type,
       PrivetURLFetcher::Delegate* delegate) override {
@@ -78,7 +78,7 @@ class PrivetV3SessionTest : public testing::Test {
       : fetcher_factory_(nullptr),
         session_(make_scoped_ptr(new MockPrivetHTTPClient())) {}
 
-  virtual ~PrivetV3SessionTest() {}
+  ~PrivetV3SessionTest() override {}
 
   MOCK_METHOD2(OnInitialized, void(Result, const std::vector<PairingType>&));
   MOCK_METHOD1(OnPairingStarted, void(Result));
@@ -87,7 +87,7 @@ class PrivetV3SessionTest : public testing::Test {
   MOCK_METHOD1(OnPostData, void(const base::DictionaryValue& data));
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     EXPECT_CALL(*this, OnInitialized(_, _)).Times(0);
     EXPECT_CALL(*this, OnPairingStarted(_)).Times(0);
     EXPECT_CALL(*this, OnCodeConfirmed(_)).Times(0);
diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.cc b/chrome/browser/local_discovery/service_discovery_client_mdns.cc
index fbd077f..cfaa3cf 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mdns.cc
+++ b/chrome/browser/local_discovery/service_discovery_client_mdns.cc
@@ -145,15 +145,15 @@ class ProxyBase : public ServiceDiscoveryClientMdns::Proxy, public T {
       : Proxy(client) {
   }
 
-  virtual ~ProxyBase() {
+  ~ProxyBase() override {
     DeleteOnMdnsThread(implementation_.release());
   }
 
-  virtual bool IsValid() override {
+  bool IsValid() override {
     return !!implementation();
   }
 
-  virtual void OnMdnsDestroy() override {
+  void OnMdnsDestroy() override {
     DeleteOnMdnsThread(implementation_.release());
   };
 
diff --git a/chrome/browser/local_discovery/test_service_discovery_client.h b/chrome/browser/local_discovery/test_service_discovery_client.h
index 28836d4..caf5eec 100644
--- a/chrome/browser/local_discovery/test_service_discovery_client.h
+++ b/chrome/browser/local_discovery/test_service_discovery_client.h
@@ -19,13 +19,13 @@ class TestServiceDiscoveryClient : public ServiceDiscoverySharedClient {
 
   void Start();
 
-  virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
+  scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
       const ServiceWatcher::UpdatedCallback& callback) override;
-  virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
+  scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
       const ServiceResolver::ResolveCompleteCallback& callback) override;
-  virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
+  scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
       const std::string& domain,
       net::AddressFamily address_family,
       const LocalDomainResolver::IPAddressCallback& callback) override;
@@ -35,7 +35,7 @@ class TestServiceDiscoveryClient : public ServiceDiscoverySharedClient {
   void SimulateReceive(const uint8* packet, int size);
 
  private:
-  ~TestServiceDiscoveryClient();
+  ~TestServiceDiscoveryClient() override;
 
   // Owned by mdns_client_impl_.
   net::MockMDnsSocketFactory mock_socket_factory_;
diff --git a/chrome/browser/local_discovery/wifi/credential_getter_win.h b/chrome/browser/local_discovery/wifi/credential_getter_win.h
index 4b28aca..7e4ca21 100644
--- a/chrome/browser/local_discovery/wifi/credential_getter_win.h
+++ b/chrome/browser/local_discovery/wifi/credential_getter_win.h
@@ -20,16 +20,16 @@ class CredentialGetterWin : public content::UtilityProcessHostClient {
       CredentialsCallback;
 
   CredentialGetterWin();
-  virtual ~CredentialGetterWin();
+  ~CredentialGetterWin() override;
 
   void StartGetCredentials(const std::string& network_guid,
                            const CredentialsCallback& callback);
 
  private:
   // UtilityProcessHostClient
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnProcessCrashed(int exit_code) override;
-  virtual void OnProcessLaunchFailed() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnProcessCrashed(int exit_code) override;
+  void OnProcessLaunchFailed() override;
 
   // IPC message handlers.
   void OnGotCredentials(const std::string& key_data, bool success);
diff --git a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
index 80cecb3fd..acf8296 100644
--- a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
+++ b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
@@ -16,11 +16,11 @@ namespace wifi {
 class MockWifiManager : public WifiManager {
  public:
   MockWifiManager();
-  ~MockWifiManager();
+  ~MockWifiManager() override;
 
   MOCK_METHOD0(Start, void());
 
-  virtual void GetSSIDList(const SSIDListCallback& callback) override;
+  void GetSSIDList(const SSIDListCallback& callback) override;
 
   MOCK_METHOD0(GetSSIDListInternal, void());
 
@@ -28,7 +28,7 @@ class MockWifiManager : public WifiManager {
 
   MOCK_METHOD0(RequestScan, void());
 
-  virtual void ConfigureAndConnectNetwork(
+  void ConfigureAndConnectNetwork(
       const std::string& ssid,
       const WifiCredentials& credentials,
       const SuccessCallback& callback) override;
@@ -38,15 +38,15 @@ class MockWifiManager : public WifiManager {
 
   void CallConfigureAndConnectNetworkCallback(bool success);
 
-  virtual void ConnectToNetworkByID(const std::string& internal_id,
-                                    const SuccessCallback& callback) override;
+  void ConnectToNetworkByID(const std::string& internal_id,
+                            const SuccessCallback& callback) override;
 
   MOCK_METHOD1(ConnectToNetworkByIDInternal,
                void(const std::string& internal_id));
 
   void CallConnectToNetworkByIDCallback(bool success);
 
-  virtual void RequestNetworkCredentials(
+  void RequestNetworkCredentials(
       const std::string& internal_id,
       const CredentialsCallback& callback) override;
 
@@ -76,9 +76,9 @@ class MockWifiManager : public WifiManager {
 class MockWifiManagerFactory : public WifiManagerFactory {
  public:
   MockWifiManagerFactory();
-  virtual ~MockWifiManagerFactory();
+  ~MockWifiManagerFactory() override;
 
-  virtual scoped_ptr<WifiManager> CreateWifiManager() override;
+  scoped_ptr<WifiManager> CreateWifiManager() override;
 
   MockWifiManager* GetLastCreatedWifiManager();
 
diff --git a/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc b/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc
index 0542471..9155830 100644
--- a/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc
+++ b/chrome/browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc
@@ -37,9 +37,9 @@ class ITunesFinderWinTest : public InProcessBrowserTest {
  public:
   ITunesFinderWinTest() : test_finder_callback_called_(false) {}
 
-  virtual ~ITunesFinderWinTest() {}
+  ~ITunesFinderWinTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(app_data_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(music_dir_.CreateUniqueTempDir());
     app_data_dir_override_.reset(
diff --git a/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h b/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h
index 7e5d70c..0777c64 100644
--- a/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h
+++ b/chrome/browser/media_galleries/fileapi/safe_itunes_pref_parser_win.h
@@ -43,7 +43,7 @@ class SafeITunesPrefParserWin : public content::UtilityProcessHostClient {
   };
 
   // Private because content::UtilityProcessHostClient is ref-counted.
-  virtual ~SafeITunesPrefParserWin();
+  ~SafeITunesPrefParserWin() override;
 
   void StartWorkOnIOThread();
 
@@ -52,8 +52,8 @@ class SafeITunesPrefParserWin : public content::UtilityProcessHostClient {
   void OnGotITunesDirectory(const base::FilePath& library_file);
 
   // UtilityProcessHostClient implementation.
-  virtual void OnProcessCrashed(int exit_code) override;
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  void OnProcessCrashed(int exit_code) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   const std::string unsafe_xml_;
   const ParserCallback callback_;
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h
index 11f3205..0be9239 100644
--- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h
+++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h
@@ -87,34 +87,34 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate {
                            const base::string16& storage_object_id);
 
   // Destructed via CancelPendingTasksAndDeleteDelegate().
-  virtual ~MTPDeviceDelegateImplWin();
+  ~MTPDeviceDelegateImplWin() override;
 
   // MTPDeviceAsyncDelegate:
-  virtual void GetFileInfo(const base::FilePath& file_path,
-                           const GetFileInfoSuccessCallback& success_callback,
-                           const ErrorCallback& error_callback) override;
-  virtual void CreateDirectory(
+  void GetFileInfo(const base::FilePath& file_path,
+                   const GetFileInfoSuccessCallback& success_callback,
+                   const ErrorCallback& error_callback) override;
+  void CreateDirectory(
       const base::FilePath& directory_path,
       const bool exclusive,
       const bool recursive,
       const CreateDirectorySuccessCallback& success_callback,
       const ErrorCallback& error_callback) override;
-  virtual void ReadDirectory(
+  void ReadDirectory(
       const base::FilePath& root,
       const ReadDirectorySuccessCallback& success_callback,
       const ErrorCallback& error_callback) override;
-  virtual void CreateSnapshotFile(
+  void CreateSnapshotFile(
       const base::FilePath& device_file_path,
       const base::FilePath& local_path,
       const CreateSnapshotFileSuccessCallback& success_callback,
       const ErrorCallback& error_callback) override;
-  virtual bool IsStreaming() override;
-  virtual void ReadBytes(const base::FilePath& device_file_path,
-                         const scoped_refptr<net::IOBuffer>& buf,
-                         int64 offset,
-                         int buf_len,
-                         const ReadBytesSuccessCallback& success_callback,
-                         const ErrorCallback& error_callback) override;
+  bool IsStreaming() override;
+  void ReadBytes(const base::FilePath& device_file_path,
+                 const scoped_refptr<net::IOBuffer>& buf,
+                 int64 offset,
+                 int buf_len,
+                 const ReadBytesSuccessCallback& success_callback,
+                 const ErrorCallback& error_callback) override;
   bool IsReadOnly() const override;
   void CopyFileLocal(
       const base::FilePath& source_file_path,
@@ -151,7 +151,7 @@ class MTPDeviceDelegateImplWin : public MTPDeviceAsyncDelegate {
       const base::FilePath& file_path,
       const bool recursive,
       const storage::WatcherManager::StatusCallback& callback) override;
-  virtual void CancelPendingTasksAndDeleteDelegate() override;
+  void CancelPendingTasksAndDeleteDelegate() override;
 
   // Ensures the device is initialized for communication by doing a
   // call-and-reply to a blocking pool thread. |task_info.task| runs on a
diff --git a/chrome/browser/metrics/google_update_metrics_provider_win.h b/chrome/browser/metrics/google_update_metrics_provider_win.h
index a898851..171ee79 100644
--- a/chrome/browser/metrics/google_update_metrics_provider_win.h
+++ b/chrome/browser/metrics/google_update_metrics_provider_win.h
@@ -16,14 +16,14 @@
 class GoogleUpdateMetricsProviderWin : public metrics::MetricsProvider {
  public:
   GoogleUpdateMetricsProviderWin();
-  virtual ~GoogleUpdateMetricsProviderWin();
+  ~GoogleUpdateMetricsProviderWin() override;
 
   // Fetches Google Update data asynchronously and calls |done_callback| when
   // done.
   void GetGoogleUpdateData(const base::Closure& done_callback);
 
   // metrics::MetricsProvider
-  virtual void ProvideSystemProfileMetrics(
+  void ProvideSystemProfileMetrics(
       metrics::SystemProfileProto* system_profile_proto) override;
 
  private:
diff --git a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h
index 96be8c5..26fae65 100644
--- a/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h
+++ b/chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h
@@ -14,20 +14,19 @@ class FilePath;
 class ChromeMetroViewerProcessHost : public win8::MetroViewerProcessHost {
  public:
   ChromeMetroViewerProcessHost();
-  virtual ~ChromeMetroViewerProcessHost();
+  ~ChromeMetroViewerProcessHost() override;
 
  private:
   // win8::MetroViewerProcessHost implementation
-  virtual void OnChannelError() override;
+  void OnChannelError() override;
 
   // IPC::Listener implementation
-  virtual void OnChannelConnected(int32 peer_pid) override;
-  virtual void OnSetTargetSurface(gfx::NativeViewId target_surface,
-                                  float device_scale) override;
-  virtual void OnOpenURL(const base::string16& url) override;
-  virtual void OnHandleSearchRequest(
-      const base::string16& search_string) override;
-  virtual void OnWindowSizeChanged(uint32 width, uint32 height) override;
+  void OnChannelConnected(int32 peer_pid) override;
+  void OnSetTargetSurface(gfx::NativeViewId target_surface,
+                          float device_scale) override;
+  void OnOpenURL(const base::string16& url) override;
+  void OnHandleSearchRequest(const base::string16& search_string) override;
+  void OnWindowSizeChanged(uint32 width, uint32 height) override;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMetroViewerProcessHost);
 };
diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
index 8d1aa69..3e2fe34 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
@@ -73,7 +73,7 @@ class ChromePasswordManagerClientTest : public ChromeRenderViewHostTestHarness {
  public:
   ChromePasswordManagerClientTest();
 
-  virtual void SetUp() override;
+  void SetUp() override;
 
   TestingPrefServiceSyncable* prefs() {
     return profile()->GetTestingPrefService();
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
index 08d6876..368bec7 100644
--- a/chrome/browser/password_manager/password_store_win.cc
+++ b/chrome/browser/password_manager/password_store_win.cc
@@ -30,7 +30,7 @@ class PasswordStoreWin::DBHandler : public WebDataServiceConsumer {
             PasswordStoreWin* password_store)
       : web_data_service_(web_data_service), password_store_(password_store) {}
 
-  ~DBHandler();
+  ~DBHandler() override;
 
   // Requests the IE7 login for |form|. This is async. |result_callback| will be
   // run when complete.
@@ -60,7 +60,7 @@ class PasswordStoreWin::DBHandler : public WebDataServiceConsumer {
       const PasswordForm& form);
 
   // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(
+  void OnWebDataServiceRequestDone(
       PasswordWebDataService::Handle handle,
       const WDTypedResult* result) override;
 
diff --git a/chrome/browser/password_manager/password_store_win.h b/chrome/browser/password_manager/password_store_win.h
index 8bf0cb7..bfa8c83 100644
--- a/chrome/browser/password_manager/password_store_win.h
+++ b/chrome/browser/password_manager/password_store_win.h
@@ -33,7 +33,7 @@ class PasswordStoreWin : public password_manager::PasswordStoreDefault {
       const scoped_refptr<PasswordWebDataService>& web_data_service);
 
   // PasswordStore:
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
  private:
   class DBHandler;
diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc
index 792ecfb..002363e 100644
--- a/chrome/browser/pdf/pdf_extension_test.cc
+++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -22,20 +22,19 @@
 
 class PDFExtensionTest : public ExtensionApiTest {
  public:
-  virtual ~PDFExtensionTest() {}
+  ~PDFExtensionTest() override {}
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableOutOfProcessPdf);
   }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     ExtensionApiTest::SetUpOnMainThread();
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   }
 
-
-  virtual void TearDownOnMainThread() override {
+  void TearDownOnMainThread() override {
     ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete());
     ExtensionApiTest::TearDownOnMainThread();
   }
diff --git a/chrome/browser/plugins/plugin_infobar_delegates.h b/chrome/browser/plugins/plugin_infobar_delegates.h
index 09bf110..d103462 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.h
+++ b/chrome/browser/plugins/plugin_infobar_delegates.h
@@ -117,16 +117,16 @@ class PluginMetroModeInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  private:
   PluginMetroModeInfoBarDelegate(Mode mode, const base::string16& name);
-  virtual ~PluginMetroModeInfoBarDelegate();
+  ~PluginMetroModeInfoBarDelegate() override;
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const override;
-  virtual base::string16 GetMessageText() const override;
-  virtual int GetButtons() const override;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
-  virtual bool Accept() override;
-  virtual base::string16 GetLinkText() const override;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
+  int GetIconID() const override;
+  base::string16 GetMessageText() const override;
+  int GetButtons() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  base::string16 GetLinkText() const override;
+  bool LinkClicked(WindowOpenDisposition disposition) override;
 
   const Mode mode_;
   const base::string16 name_;
diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc
index 034aacb..d8ab7a9 100644
--- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/cloud/device_management_service_browsertest.cc
@@ -142,7 +142,7 @@ class DeviceManagementServiceIntegrationTest
     base::MessageLoop::current()->Run();
   }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     std::string service_url((this->*(GetParam()))());
     service_.reset(new DeviceManagementService(
         scoped_ptr<DeviceManagementService::Configuration>(
@@ -150,7 +150,7 @@ class DeviceManagementServiceIntegrationTest
     service_->ScheduleInitialization(0);
   }
 
-  virtual void TearDownOnMainThread() override {
+  void TearDownOnMainThread() override {
     service_.reset();
     test_server_.reset();
     interceptor_.reset();
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
index 4cc4e8e..0cd839f 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
@@ -151,7 +151,7 @@ class UserPolicySigninServiceTest : public testing::Test {
     ASSERT_TRUE(IsRequestActive());
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     UserPolicySigninServiceFactory::SetDeviceManagementServiceForTesting(
         &device_management_service_);
 
@@ -208,7 +208,7 @@ class UserPolicySigninServiceTest : public testing::Test {
     Mock::VerifyAndClearExpectations(mock_store_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     UserPolicySigninServiceFactory::SetDeviceManagementServiceForTesting(NULL);
     UserCloudPolicyManagerFactory::GetInstance()->ClearTestingFactory();
     // Free the profile before we clear out the browser prefs.
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 6fdb000..629b966 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -850,9 +850,9 @@ class PolicyTest : public InProcessBrowserTest {
 class LocalePolicyTest : public PolicyTest {
  public:
   LocalePolicyTest() {}
-  virtual ~LocalePolicyTest() {}
+  ~LocalePolicyTest() override {}
 
-  virtual void SetUpInProcessBrowserTestFixture() override {
+  void SetUpInProcessBrowserTestFixture() override {
     PolicyTest::SetUpInProcessBrowserTestFixture();
     PolicyMap policies;
     policies.Set(key::kApplicationLocaleValue,
diff --git a/chrome/browser/predictors/resource_prefetcher_unittest.cc b/chrome/browser/predictors/resource_prefetcher_unittest.cc
index 4e68bdc..efcd18d 100644
--- a/chrome/browser/predictors/resource_prefetcher_unittest.cc
+++ b/chrome/browser/predictors/resource_prefetcher_unittest.cc
@@ -33,7 +33,7 @@ class TestResourcePrefetcher : public ResourcePrefetcher {
       : ResourcePrefetcher(delegate, config, navigation_id,
                            key_type, requests.Pass()) { }
 
-  virtual ~TestResourcePrefetcher() { }
+  ~TestResourcePrefetcher() override {}
 
   MOCK_METHOD1(StartURLRequest, void(net::URLRequest* request));
 
@@ -55,7 +55,7 @@ class TestResourcePrefetcherDelegate : public ResourcePrefetcher::Delegate {
           loop->message_loop_proxy())) { }
   ~TestResourcePrefetcherDelegate() { }
 
-  virtual net::URLRequestContext* GetURLRequestContext() override {
+  net::URLRequestContext* GetURLRequestContext() override {
     return request_context_getter_->GetURLRequestContext();
   }
 
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index c38d6b1..4e1d2b7 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -45,18 +45,18 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>,
     emf_path_ = browser_directory.AppendASCII("metafile_dumps");
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Make sure there is no left overs.
     CleanupDumpDirectory();
     InProcessBrowserTest::SetUp();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     InProcessBrowserTest::TearDown();
     base::DeleteFile(emf_path_, true);
   }
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchPath(switches::kDebugPrint, emf_path_);
   }
 
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc
index db4ec93..303f030 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc
@@ -165,9 +165,9 @@ class AutomaticProfileResetterDelegateTest
     : public extensions::ExtensionServiceTestBase {
  protected:
   AutomaticProfileResetterDelegateTest() {}
-  virtual ~AutomaticProfileResetterDelegateTest() {}
+  ~AutomaticProfileResetterDelegateTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     extensions::ExtensionServiceTestBase::SetUp();
     ExtensionServiceInitParams params = CreateDefaultInitParams();
     params.pref_file.clear();  // Prescribes a TestingPrefService to be created.
@@ -178,7 +178,7 @@ class AutomaticProfileResetterDelegateTest
         new AutomaticProfileResetterDelegateUnderTest(profile()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     resetter_delegate_.reset();
     template_url_service_test_util_.reset();
     extensions::ExtensionServiceTestBase::TearDown();
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc
index 135094f..d900b40 100644
--- a/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_unittest.cc
@@ -62,7 +62,7 @@ class AutomaticProfileResetterUnderTest : public AutomaticProfileResetter {
  public:
   explicit AutomaticProfileResetterUnderTest(Profile* profile)
       : AutomaticProfileResetter(profile) {}
-  virtual ~AutomaticProfileResetterUnderTest() {}
+  ~AutomaticProfileResetterUnderTest() override {}
 
   MOCK_METHOD2(ReportStatistics, void(uint32, uint32));
   MOCK_METHOD1(ReportPromptResult,
@@ -76,7 +76,7 @@ class MockProfileResetterDelegate : public AutomaticProfileResetterDelegate {
  public:
   MockProfileResetterDelegate()
       : emulated_is_default_search_provider_managed_(false) {}
-  virtual ~MockProfileResetterDelegate() {}
+  ~MockProfileResetterDelegate() override {}
 
   MOCK_METHOD0(EnumerateLoadedModulesIfNeeded, void());
   MOCK_CONST_METHOD1(RequestCallbackWhenLoadedModulesAreEnumerated,
@@ -99,26 +99,25 @@ class MockProfileResetterDelegate : public AutomaticProfileResetterDelegate {
   MOCK_METHOD2(TriggerProfileSettingsReset, void(bool, const base::Closure&));
   MOCK_METHOD0(DismissPrompt, void());
 
-  virtual scoped_ptr<base::ListValue>
-      GetLoadedModuleNameDigests() const override {
+  scoped_ptr<base::ListValue> GetLoadedModuleNameDigests() const override {
     OnGetLoadedModuleNameDigestsCalled();
     return scoped_ptr<base::ListValue>(
         emulated_loaded_module_digests_.DeepCopy());
   }
 
-  virtual scoped_ptr<base::DictionaryValue>
+  scoped_ptr<base::DictionaryValue>
       GetDefaultSearchProviderDetails() const override {
     OnGetDefaultSearchProviderDetailsCalled();
     return scoped_ptr<base::DictionaryValue>(
         emulated_default_search_provider_details_.DeepCopy());
   }
 
-  virtual bool IsDefaultSearchProviderManaged() const override {
+  bool IsDefaultSearchProviderManaged() const override {
     OnIsDefaultSearchProviderManagedCalled();
     return emulated_is_default_search_provider_managed_;
   }
 
-  virtual scoped_ptr<base::ListValue>
+  scoped_ptr<base::ListValue>
       GetPrepopulatedSearchProvidersDetails() const override {
     OnGetPrepopulatedSearchProvidersDetailsCalled();
     return scoped_ptr<base::ListValue>(
@@ -515,7 +514,7 @@ class AutomaticProfileResetterTestBase : public testing::Test {
         user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     variations::testing::ClearAllVariationParams();
     base::FieldTrialList::CreateFieldTrial(kAutomaticProfileResetStudyName,
                                            experiment_group_name_);
diff --git a/chrome/browser/profile_resetter/jtl_interpreter.cc b/chrome/browser/profile_resetter/jtl_interpreter.cc
index c918954..be0b368 100644
--- a/chrome/browser/profile_resetter/jtl_interpreter.cc
+++ b/chrome/browser/profile_resetter/jtl_interpreter.cc
@@ -246,8 +246,8 @@ class StoreNodeValue : public Operation {
       : hashed_name_(hashed_name) {
     DCHECK(base::IsStringUTF8(hashed_name));
   }
-  virtual ~StoreNodeValue() {}
-  virtual bool Execute(ExecutionContext* context) override {
+  ~StoreNodeValue() override {}
+  bool Execute(ExecutionContext* context) override {
     scoped_ptr<base::Value> value;
     if (ExpectedTypeIsBooleanNotHashable) {
       if (!context->current_node()->IsType(base::Value::TYPE_BOOLEAN))
@@ -382,8 +382,8 @@ class CompareNodeToStored : public Operation {
  public:
   explicit CompareNodeToStored(const std::string& hashed_name)
       : hashed_name_(hashed_name) {}
-  virtual ~CompareNodeToStored() {}
-  virtual bool Execute(ExecutionContext* context) override {
+  ~CompareNodeToStored() override {}
+  bool Execute(ExecutionContext* context) override {
     const base::Value* stored_value = NULL;
     if (!context->working_memory()->Get(hashed_name_, &stored_value))
       return true;
diff --git a/chrome/browser/profiles/profile_destroyer_unittest.cc b/chrome/browser/profiles/profile_destroyer_unittest.cc
index d401041..8ffcab2 100644
--- a/chrome/browser/profiles/profile_destroyer_unittest.cc
+++ b/chrome/browser/profiles/profile_destroyer_unittest.cc
@@ -21,7 +21,7 @@ class TestingOffTheRecordDestructionProfile : public TestingProfile {
         destroyed_otr_profile_(false) {
     set_incognito(true);
   }
-  virtual void DestroyOffTheRecordProfile() override {
+  void DestroyOffTheRecordProfile() override {
     destroyed_otr_profile_ = true;
   }
   bool destroyed_otr_profile_;
@@ -35,11 +35,11 @@ class TestingOriginalDestructionProfile : public TestingProfile {
     DCHECK_EQ(kNull, living_instance_);
     living_instance_ = this;
   }
-  virtual ~TestingOriginalDestructionProfile() {
+  ~TestingOriginalDestructionProfile() override {
     DCHECK_EQ(this, living_instance_);
     living_instance_ = NULL;
   }
-  virtual void DestroyOffTheRecordProfile() override {
+  void DestroyOffTheRecordProfile() override {
     SetOffTheRecordProfile(NULL);
     destroyed_otr_profile_ = true;
   }
@@ -62,7 +62,7 @@ class ProfileDestroyerTest : public BrowserWithTestWindowTest {
   ProfileDestroyerTest() : off_the_record_profile_(NULL) {}
 
  protected:
-  virtual TestingProfile* CreateProfile() override {
+  TestingProfile* CreateProfile() override {
     if (off_the_record_profile_ == NULL)
       off_the_record_profile_ = new TestingOffTheRecordDestructionProfile();
     return off_the_record_profile_;
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index 3d847eb..71052b5 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -41,7 +41,7 @@ class ProfileShortcutManagerTest : public testing::Test {
         fake_system_desktop_(base::DIR_COMMON_DESKTOP) {
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     CoInitialize(NULL);
 
     TestingBrowserProcess* browser_process =
@@ -59,7 +59,7 @@ class ProfileShortcutManagerTest : public testing::Test {
     profile_3_path_ = CreateProfileDirectory(profile_3_name_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     message_loop_.RunUntilIdle();
 
     // Delete all profiles and ensure their shortcuts got removed.
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.h b/chrome/browser/profiles/profile_shortcut_manager_win.h
index 30e5349..7645b8d 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_win.h
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.h
@@ -50,38 +50,31 @@ class ProfileShortcutManagerWin : public ProfileShortcutManager,
   };
 
   explicit ProfileShortcutManagerWin(ProfileManager* manager);
-  virtual ~ProfileShortcutManagerWin();
+  ~ProfileShortcutManagerWin() override;
 
   // ProfileShortcutManager implementation:
-  virtual void CreateOrUpdateProfileIcon(
-      const base::FilePath& profile_path) override;
-  virtual void CreateProfileShortcut(
-      const base::FilePath& profile_path) override;
-  virtual void RemoveProfileShortcuts(
-      const base::FilePath& profile_path) override;
-  virtual void HasProfileShortcuts(
-      const base::FilePath& profile_path,
-      const base::Callback<void(bool)>& callback) override;
-  virtual void GetShortcutProperties(const base::FilePath& profile_path,
-                                     base::CommandLine* command_line,
-                                     base::string16* name,
-                                     base::FilePath* icon_path) override;
+  void CreateOrUpdateProfileIcon(const base::FilePath& profile_path) override;
+  void CreateProfileShortcut(const base::FilePath& profile_path) override;
+  void RemoveProfileShortcuts(const base::FilePath& profile_path) override;
+  void HasProfileShortcuts(const base::FilePath& profile_path,
+                           const base::Callback<void(bool)>& callback) override;
+  void GetShortcutProperties(const base::FilePath& profile_path,
+                             base::CommandLine* command_line,
+                             base::string16* name,
+                             base::FilePath* icon_path) override;
 
   // ProfileInfoCacheObserver implementation:
-  virtual void OnProfileAdded(const base::FilePath& profile_path) override;
-  virtual void OnProfileWasRemoved(
-      const base::FilePath& profile_path,
-      const base::string16& profile_name) override;
-  virtual void OnProfileNameChanged(
-      const base::FilePath& profile_path,
-      const base::string16& old_profile_name) override;
-  virtual void OnProfileAvatarChanged(
-      const base::FilePath& profile_path) override;
+  void OnProfileAdded(const base::FilePath& profile_path) override;
+  void OnProfileWasRemoved(const base::FilePath& profile_path,
+                           const base::string16& profile_name) override;
+  void OnProfileNameChanged(const base::FilePath& profile_path,
+                            const base::string16& old_profile_name) override;
+  void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
 
   // content::NotificationObserver implementation:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
  private:
   // Gives the profile path of an alternate profile than |profile_path|.
diff --git a/chrome/browser/safe_browsing/protocol_manager_unittest.cc b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
index 2bf6b3d..852a20d 100644
--- a/chrome/browser/safe_browsing/protocol_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
@@ -315,7 +315,7 @@ namespace {
 class MockProtocolDelegate : public SafeBrowsingProtocolManagerDelegate {
  public:
   MockProtocolDelegate() {}
-  virtual ~MockProtocolDelegate() {}
+  ~MockProtocolDelegate() override {}
 
   MOCK_METHOD0(UpdateStarted, void());
   MOCK_METHOD1(UpdateFinished, void(bool));
@@ -328,17 +328,17 @@ class MockProtocolDelegate : public SafeBrowsingProtocolManagerDelegate {
   MOCK_METHOD3(AddChunksRaw, void(const std::string& lists,
                                   const ScopedVector<SBChunkData>& chunks,
                                   AddChunksCallback));
-  virtual void AddChunks(const std::string& list,
-                         scoped_ptr<ScopedVector<SBChunkData> > chunks,
-                         AddChunksCallback callback) override {
+  void AddChunks(const std::string& list,
+                 scoped_ptr<ScopedVector<SBChunkData>> chunks,
+                 AddChunksCallback callback) override {
     AddChunksRaw(list, *chunks, callback);
   }
 
   // TODO(shess): Actually test this case somewhere.
   MOCK_METHOD1(DeleteChunksRaw,
                void(const std::vector<SBChunkDelete>& chunk_deletes));
-  virtual void DeleteChunks(
-      scoped_ptr<std::vector<SBChunkDelete> > chunk_deletes) override{
+  void DeleteChunks(
+      scoped_ptr<std::vector<SBChunkDelete>> chunk_deletes) override {
     DeleteChunksRaw(*chunk_deletes);
   }
 };
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index f38a8f5..884b45b 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -399,7 +399,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
     full_hash->list_id = list_id;
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     // InProcessBrowserTest::SetUp() instantiates SafebrowsingService and
     // RegisterFactory has to be called before SafeBrowsingService is created.
     sb_factory_.reset(new TestSafeBrowsingServiceFactory(
@@ -410,7 +410,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
     InProcessBrowserTest::SetUp();
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     InProcessBrowserTest::TearDown();
 
     // Unregister test factories after InProcessBrowserTest::TearDown
@@ -420,7 +420,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
     SafeBrowsingService::RegisterFactory(NULL);
   }
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     // Makes sure the auto update is not triggered during the test.
     // This test will fill up the database using testing prefixes
     // and urls.
@@ -443,7 +443,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
     InProcessBrowserTest::TearDownOnMainThread();
   }
 
-  virtual void SetUpInProcessBrowserTestFixture() {
+  void SetUpInProcessBrowserTestFixture() override {
     ASSERT_TRUE(test_server()->Start());
   }
 
diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc
index 98f0290..5c931fa 100644
--- a/chrome/browser/service_process/service_process_control_browsertest.cc
+++ b/chrome/browser/service_process/service_process_control_browsertest.cc
@@ -65,14 +65,14 @@ class ServiceProcessControlBrowserTest
     ServiceProcessControl::GetInstance()->Disconnect();
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // This should not be needed because TearDown() ends with a closed
     // service_process_, but HistogramsTimeout and Histograms fail without this
     // on Mac.
     service_process_.Close();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (ServiceProcessControl::GetInstance()->IsConnected())
       EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
 #if defined(OS_MACOSX)
diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc
index 284eb33..74b5a8b 100644
--- a/chrome/browser/shell_integration_win_unittest.cc
+++ b/chrome/browser/shell_integration_win_unittest.cc
@@ -32,7 +32,7 @@ struct ShortcutTestObject {
 
 class ShellIntegrationWinMigrateShortcutTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // A path to a random target.
diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc
index 3cb2e57..8cd42ef 100644
--- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc
+++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc
@@ -48,8 +48,7 @@ static const std::string kNotificationId =
 class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate {
  public:
   ScreenTypeDelegateDesktop() {}
-  virtual gfx::ScreenType GetScreenTypeForNativeView(
-      gfx::NativeView view) override {
+  gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override {
     return chrome::IsNativeViewInAsh(view) ?
         gfx::SCREEN_TYPE_ALTERNATE :
         gfx::SCREEN_TYPE_NATIVE;
diff --git a/chrome/browser/speech/tts_win.cc b/chrome/browser/speech/tts_win.cc
index 2422bed..c711f9e 100644
--- a/chrome/browser/speech/tts_win.cc
+++ b/chrome/browser/speech/tts_win.cc
@@ -15,26 +15,26 @@
 
 class TtsPlatformImplWin : public TtsPlatformImpl {
  public:
-  virtual bool PlatformImplAvailable() {
+  bool PlatformImplAvailable() override {
     return true;
   }
 
-  virtual bool Speak(
+  bool Speak(
       int utterance_id,
       const std::string& utterance,
       const std::string& lang,
       const VoiceData& voice,
-      const UtteranceContinuousParameters& params);
+      const UtteranceContinuousParameters& params) override;
 
-  virtual bool StopSpeaking();
+  bool StopSpeaking() override;
 
-  virtual void Pause();
+  void Pause() override;
 
-  virtual void Resume();
+  void Resume() override;
 
-  virtual bool IsSpeaking();
+  bool IsSpeaking() override;
 
-  virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
+  void GetVoices(std::vector<VoiceData>* out_voices) override;
 
   // Get the single instance of this class.
   static TtsPlatformImplWin* GetInstance();
@@ -43,7 +43,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {
 
  private:
   TtsPlatformImplWin();
-  virtual ~TtsPlatformImplWin() {}
+  ~TtsPlatformImplWin() override {}
 
   void OnSpeechEvent();
 
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
index bbc5a4d..7301b1d 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
@@ -151,9 +151,9 @@ class SyncBackendHostTest : public testing::Test {
         profile_manager_(TestingBrowserProcess::GetGlobal()),
         fake_manager_(NULL) {}
 
-  virtual ~SyncBackendHostTest() {}
+  ~SyncBackendHostTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(profile_manager_.SetUp());
     profile_ = profile_manager_.CreateTestingProfile(kTestProfileName);
     sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs()));
@@ -184,7 +184,7 @@ class SyncBackendHostTest : public testing::Test {
     network_resources_.reset(new syncer::HttpBridgeNetworkResources());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (backend_) {
       backend_->StopSyncingForShutdown();
       backend_->Shutdown(syncer::STOP_SYNC);
diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.h b/chrome/browser/sync/profile_sync_components_factory_mock.h
index 3e10696..c6594b7 100644
--- a/chrome/browser/sync/profile_sync_components_factory_mock.h
+++ b/chrome/browser/sync/profile_sync_components_factory_mock.h
@@ -26,7 +26,7 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
   ProfileSyncComponentsFactoryMock(
       sync_driver::AssociatorInterface* model_associator,
       sync_driver::ChangeProcessor* change_processor);
-  virtual ~ProfileSyncComponentsFactoryMock();
+  ~ProfileSyncComponentsFactoryMock() override;
 
   MOCK_METHOD1(RegisterDataTypes, void(ProfileSyncService*));
   MOCK_METHOD5(CreateDataTypeManager,
@@ -44,14 +44,14 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {
                    const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
                    const base::FilePath& sync_folder));
 
-  virtual scoped_ptr<sync_driver::LocalDeviceInfoProvider>
+  scoped_ptr<sync_driver::LocalDeviceInfoProvider>
       CreateLocalDeviceInfoProvider() override;
   void SetLocalDeviceInfoProvider(
       scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device);
 
   MOCK_METHOD1(GetSyncableServiceForType,
                base::WeakPtr<syncer::SyncableService>(syncer::ModelType));
-  virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
+  scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
       const syncer::UserShare& user_share,
       const std::string& store_birthday,
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index 2a7bc23..3542aa5 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -90,7 +90,7 @@ static const int EXPIRED_VISIT = -1;
 class HistoryBackendMock : public HistoryBackend {
  public:
   HistoryBackendMock() : HistoryBackend(nullptr, nullptr) {}
-  virtual bool IsExpiredVisitTime(const base::Time& time) override {
+  bool IsExpiredVisitTime(const base::Time& time) override {
     return time.ToInternalValue() == EXPIRED_VISIT;
   }
   MOCK_METHOD1(GetAllTypedURLs, bool(history::URLRows* entries));
diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
index 8de7117..6f213a5 100644
--- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
@@ -48,9 +48,8 @@ static const std::string kNotificationId =
 class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate {
  public:
   ScreenTypeDelegateDesktop() {}
-  virtual ~ScreenTypeDelegateDesktop() {}
-  virtual gfx::ScreenType GetScreenTypeForNativeView(
-      gfx::NativeView view) override {
+  ~ScreenTypeDelegateDesktop() override {}
+  gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override {
     return chrome::IsNativeViewInAsh(view) ?
         gfx::SCREEN_TYPE_ALTERNATE :
         gfx::SCREEN_TYPE_NATIVE;
diff --git a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
index 9f794cd..ddf32d0 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
@@ -131,7 +131,7 @@ class SyncFileSystemServiceTest : public testing::Test {
       : thread_bundle_(content::TestBrowserThreadBundle::REAL_FILE_THREAD |
                        content::TestBrowserThreadBundle::REAL_IO_THREAD) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
     file_system_.reset(new CannedSyncableFileSystem(
         GURL(kOrigin),
@@ -165,7 +165,7 @@ class SyncFileSystemServiceTest : public testing::Test {
     file_system_->SetUp(CannedSyncableFileSystem::QUOTA_ENABLED);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     sync_service_->Shutdown();
     file_system_->TearDown();
     RevokeSyncableFileSystem();
diff --git a/chrome/browser/translate/cld_data_harness.h b/chrome/browser/translate/cld_data_harness.h
index 1ca3cb5..6a78d78 100644
--- a/chrome/browser/translate/cld_data_harness.h
+++ b/chrome/browser/translate/cld_data_harness.h
@@ -46,7 +46,7 @@ namespace test {
 //         test::CldDataHarnessFactory::Get->CreateCldDataHarness()) {
 //       // (your additional setup code here)
 //     }
-//     virtual void SetUpOnMainThread() override {
+//     void SetUpOnMainThread() override {
 //       cld_data_scope->Init();
 //       InProcessBrowserTest::SetUpOnMainThread();
 //     }
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index e1e566e..da2d94c 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -115,22 +115,22 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
         false);
   }
 
-  virtual ~TestAutofillDialogController() {}
+  ~TestAutofillDialogController() override {}
 
   GURL FakeSignInUrl() const {
     return GURL(chrome::kChromeUIVersionURL);
   }
 
-  virtual void ShowSignIn(const GURL& url) override {
+  void ShowSignIn(const GURL& url) override {
     AutofillDialogControllerImpl::ShowSignIn(FakeSignInUrl());
   }
 
-  virtual void ViewClosed() override {
+  void ViewClosed() override {
     message_loop_runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
   }
 
-  virtual base::string16 InputValidityMessage(
+  base::string16 InputValidityMessage(
       DialogSection section,
       ServerFieldType type,
       const base::string16& value) override {
@@ -140,7 +140,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
         section, type, value);
   }
 
-  virtual ValidityMessages InputsAreValid(
+  ValidityMessages InputsAreValid(
       DialogSection section,
       const FieldValueMap& inputs) override {
     if (!use_validation_)
@@ -150,7 +150,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   // Saving to Chrome is tested in AutofillDialogControllerImpl unit tests.
   // TODO(estade): test that the view defaults to saving to Chrome.
-  virtual bool ShouldOfferToSaveInChrome() const override {
+  bool ShouldOfferToSaveInChrome() const override {
     return true;
   }
 
@@ -164,7 +164,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   MOCK_METHOD0(LoadRiskFingerprintData, void());
 
-  virtual std::vector<DialogNotification> CurrentNotifications() override {
+  std::vector<DialogNotification> CurrentNotifications() override {
     return notifications_;
   }
 
@@ -206,20 +206,19 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
   }
 
  protected:
-  virtual PersonalDataManager* GetManager() const override {
+  PersonalDataManager* GetManager() const override {
     return &const_cast<TestAutofillDialogController*>(this)->test_manager_;
   }
 
-  virtual AddressValidator* GetValidator() override {
+  AddressValidator* GetValidator() override {
     return &mock_validator_;
   }
 
-  virtual wallet::WalletClient* GetWalletClient() override {
+  wallet::WalletClient* GetWalletClient() override {
     return &mock_wallet_client_;
   }
 
-  virtual bool IsSignInContinueUrl(const GURL& url, size_t* user_index) const
-      override {
+  bool IsSignInContinueUrl(const GURL& url, size_t* user_index) const override {
     *user_index = sign_in_user_index_;
     return url == wallet::GetSignInContinueUrl();
   }
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index 4b7e267..3932837 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -146,73 +146,69 @@ class TestAutofillDialogView : public AutofillDialogView {
  public:
   TestAutofillDialogView()
       : updates_started_(0), save_details_locally_checked_(true) {}
-  virtual ~TestAutofillDialogView() {}
+  ~TestAutofillDialogView() override {}
 
-  virtual void Show() override {}
-  virtual void Hide() override {}
+  void Show() override {}
+  void Hide() override {}
 
-  virtual void UpdatesStarted() override {
+  void UpdatesStarted() override {
     updates_started_++;
   }
 
-  virtual void UpdatesFinished() override {
+  void UpdatesFinished() override {
     updates_started_--;
     EXPECT_GE(updates_started_, 0);
   }
 
-  virtual void UpdateNotificationArea() override {
+  void UpdateNotificationArea() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateAccountChooser() override {
+  void UpdateAccountChooser() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateButtonStrip() override {
+  void UpdateButtonStrip() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateOverlay() override {
+  void UpdateOverlay() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateDetailArea() override {
+  void UpdateDetailArea() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateSection(DialogSection section) override {
+  void UpdateSection(DialogSection section) override {
     section_updates_[section]++;
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateErrorBubble() override {
+  void UpdateErrorBubble() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void FillSection(DialogSection section,
-                           ServerFieldType originating_type) override {}
-  virtual void GetUserInput(DialogSection section, FieldValueMap* output)
-      override {
+  void FillSection(DialogSection section,
+                   ServerFieldType originating_type) override {}
+  void GetUserInput(DialogSection section, FieldValueMap* output) override {
     *output = outputs_[section];
   }
 
-  virtual base::string16 GetCvc() override { return base::string16(); }
+  base::string16 GetCvc() override { return base::string16(); }
 
-  virtual bool SaveDetailsLocally() override {
-    return save_details_locally_checked_;
-  }
+  bool SaveDetailsLocally() override { return save_details_locally_checked_; }
 
-  virtual const content::NavigationController* ShowSignIn(const GURL& url)
-      override {
+  const content::NavigationController* ShowSignIn(const GURL& url) override {
     return NULL;
   }
-  virtual void HideSignIn() override {}
+  void HideSignIn() override {}
 
   MOCK_METHOD0(ModelChanged, void());
   MOCK_METHOD0(UpdateForErrors, void());
 
-  virtual void OnSignInResize(const gfx::Size& pref_size) override {}
-  virtual void ValidateSection(DialogSection) override {}
+  void OnSignInResize(const gfx::Size& pref_size) override {}
+  void ValidateSection(DialogSection) override {}
 
   void SetUserInput(DialogSection section, const FieldValueMap& map) {
     outputs_[section] = map;
@@ -262,9 +258,9 @@ class TestAutofillDialogController
         mock_new_card_bubble_controller_(mock_new_card_bubble_controller),
         submit_button_delay_count_(0) {}
 
-  virtual ~TestAutofillDialogController() {}
+  ~TestAutofillDialogController() override {}
 
-  virtual AutofillDialogView* CreateView() override {
+  AutofillDialogView* CreateView() override {
     return new testing::NiceMock<TestAutofillDialogView>();
   }
 
@@ -333,24 +329,24 @@ class TestAutofillDialogController
   using AutofillDialogControllerImpl::SignedInState;
 
  protected:
-  virtual PersonalDataManager* GetManager() const override {
+  PersonalDataManager* GetManager() const override {
     return const_cast<TestAutofillDialogController*>(this)->
         GetTestingManager();
   }
 
-  virtual AddressValidator* GetValidator() override {
+  AddressValidator* GetValidator() override {
     return &mock_validator_;
   }
 
-  virtual wallet::WalletClient* GetWalletClient() override {
+  wallet::WalletClient* GetWalletClient() override {
     return &mock_wallet_client_;
   }
 
-  virtual void OpenTabWithUrl(const GURL& url) override {
+  void OpenTabWithUrl(const GURL& url) override {
     open_tab_url_ = url;
   }
 
-  virtual void ShowNewCreditCardBubble(
+  void ShowNewCreditCardBubble(
       scoped_ptr<CreditCard> new_card,
       scoped_ptr<AutofillProfile> billing_profile) override {
     mock_new_card_bubble_controller_->Show(new_card.Pass(),
@@ -359,7 +355,7 @@ class TestAutofillDialogController
 
   // AutofillDialogControllerImpl calls this method before showing the dialog
   // window.
-  virtual void SubmitButtonDelayBegin() override {
+  void SubmitButtonDelayBegin() override {
     // Do not delay enabling the submit button in testing.
     submit_button_delay_count_++;
   }
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
index 122bcd9..88dd2d0 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -80,7 +80,7 @@ class TestAutofillPopupController : public AutofillPopupControllerImpl {
         test_controller_common_(new TestPopupControllerCommon(element_bounds)) {
     controller_common_.reset(test_controller_common_);
   }
-  virtual ~TestAutofillPopupController() {}
+  ~TestAutofillPopupController() override {}
 
   void set_display(const gfx::Display& display) {
     test_controller_common_->set_display(display);
@@ -117,7 +117,7 @@ class TestAutofillPopupController : public AutofillPopupControllerImpl {
   }
 
  private:
-  virtual void ShowView() override {}
+  void ShowView() override {}
 
   TestPopupControllerCommon* test_controller_common_;
 };
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index ac03700..8f4764e 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -2157,7 +2157,7 @@ class LaunchBrowserWithNonAsciiUserDatadir : public BrowserTest {
  public:
   LaunchBrowserWithNonAsciiUserDatadir() {}
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile");
     tmp_profile = tmp_profile.Append(L"Test Chrome G\u00E9raldine");
@@ -2187,7 +2187,7 @@ class LaunchBrowserWithTrailingSlashDatadir : public BrowserTest {
  public:
   LaunchBrowserWithTrailingSlashDatadir() {}
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile");
     tmp_profile = tmp_profile.Append(L"Test Chrome\\");
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index ac87bb1..570de3e 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -130,12 +130,12 @@ class SwitchToMetroUIHandler
     default_browser_worker_->StartCheckIsDefault();
   }
 
-  virtual ~SwitchToMetroUIHandler() {
+  ~SwitchToMetroUIHandler() override {
     default_browser_worker_->ObserverDestroyed();
   }
 
  private:
-  virtual void SetDefaultWebClientUIState(
+  void SetDefaultWebClientUIState(
       ShellIntegration::DefaultWebClientUIState state) override {
     switch (state) {
       case ShellIntegration::STATE_PROCESSING:
@@ -157,7 +157,7 @@ class SwitchToMetroUIHandler
     delete this;
   }
 
-  virtual void OnSetAsDefaultConcluded(bool success)  override {
+  void OnSetAsDefaultConcluded(bool success) override {
     if (!success) {
       delete this;
       return;
@@ -166,7 +166,7 @@ class SwitchToMetroUIHandler
     default_browser_worker_->StartCheckIsDefault();
   }
 
-  virtual bool IsInteractiveSetDefaultPermitted() override {
+  bool IsInteractiveSetDefaultPermitted() override {
     return true;
   }
 
diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm
index 37fa729..2c5212c 100644
--- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm
@@ -28,31 +28,31 @@ class MockPasswordGenerationPopupController
 
   MOCK_METHOD0(PasswordAccepted, void());
 
-  virtual void OnSavedPasswordsLinkClicked() override {}
+  void OnSavedPasswordsLinkClicked() override {}
 
-  virtual int GetMinimumWidth() override { return 200; }
+  int GetMinimumWidth() override { return 200; }
 
-  virtual bool display_password() const override { return true; }
+  bool display_password() const override { return true; }
 
-  virtual bool password_selected() const override { return false; }
+  bool password_selected() const override { return false; }
 
   MOCK_CONST_METHOD0(password, base::string16());
 
-  virtual base::string16 SuggestedText() override {
+  base::string16 SuggestedText() override {
     return base::ASCIIToUTF16("Suggested by Chrome");
   }
 
-  virtual const base::string16& HelpText() override { return help_text_; }
+  const base::string16& HelpText() override { return help_text_; }
 
-  virtual const gfx::Range& HelpTextLinkRange() override { return link_range_; }
+  const gfx::Range& HelpTextLinkRange() override { return link_range_; }
 
   // AutofillPopupViewDelegate implementation.
-  virtual void Hide() override {}
+  void Hide() override {}
   MOCK_METHOD0(ViewDestroyed, void());
-  virtual void SetSelectionAtPoint(const gfx::Point&) override {}
-  virtual bool AcceptSelectedLine() override { return true; }
-  virtual void SelectionCleared() override {}
-  virtual const gfx::Rect& popup_bounds() const override {
+  void SetSelectionAtPoint(const gfx::Point&) override {}
+  bool AcceptSelectedLine() override { return true; }
+  void SelectionCleared() override {}
+  const gfx::Rect& popup_bounds() const override {
     return popup_bounds_;
   }
   MOCK_METHOD0(container_view, gfx::NativeView());
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm
index 396eba4..0621695 100644
--- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm
@@ -50,9 +50,9 @@ MediaGalleryPrefInfo MakePrefInfoForTesting(MediaGalleryPrefId pref_id) {
 class MediaGalleriesDialogTest : public testing::Test {
  public:
   MediaGalleriesDialogTest() {}
-  virtual ~MediaGalleriesDialogTest() {}
+  ~MediaGalleriesDialogTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     std::vector<base::string16> headers;
     headers.push_back(base::string16());
     headers.push_back(base::ASCIIToUTF16("header2"));
@@ -62,7 +62,7 @@ class MediaGalleriesDialogTest : public testing::Test {
         Times(AnyNumber());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     Mock::VerifyAndClearExpectations(&controller_);
     dialog_.reset();
   }
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
index 04f4fe8..d16e806 100644
--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
@@ -57,11 +57,11 @@ class MockTranslateInfoBarDelegate
 
   MOCK_METHOD0(TranslationDeclined, void());
 
-  virtual bool IsTranslatableLanguageByPrefs() override { return true; }
+  bool IsTranslatableLanguageByPrefs() override { return true; }
   MOCK_METHOD0(ToggleTranslatableLanguageByPrefs, void());
-  virtual bool IsSiteBlacklisted() override { return false; }
+  bool IsSiteBlacklisted() override { return false; }
   MOCK_METHOD0(ToggleSiteBlacklist, void());
-  virtual bool ShouldAlwaysTranslate() override { return false; }
+  bool ShouldAlwaysTranslate() override { return false; }
   MOCK_METHOD0(ToggleAlwaysTranslate, void());
 };
 
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm
index dd1b20e..5c2936f 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm
@@ -31,7 +31,7 @@ class OneClickSigninBubbleControllerTest : public CocoaProfileTest {
                        weak_ptr_factory_.GetWeakPtr());
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     CocoaProfileTest::SetUp();
     BrowserWindowCocoa* browser_window =
         static_cast<BrowserWindowCocoa*>(browser()->window());
@@ -45,7 +45,7 @@ class OneClickSigninBubbleControllerTest : public CocoaProfileTest {
                 [[controller_ viewController] nibName]);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     controller_.reset();
     CocoaProfileTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
index 6d5b223..e7cbc17 100644
--- a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
@@ -16,11 +16,11 @@ class InstantOverlayControllerMac : public InstantOverlayController {
  public:
   InstantOverlayControllerMac(Browser* browser,
                               OverlayableContentsController* overlay);
-  virtual ~InstantOverlayControllerMac();
+  ~InstantOverlayControllerMac() override;
 
  private:
   // Overridden from InstantOverlayController:
-  virtual void OverlayStateChanged(const InstantOverlayModel& model) override;
+  void OverlayStateChanged(const InstantOverlayModel& model) override;
 
   OverlayableContentsController* const overlay_;
 
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
index 1699a49..ee0a496 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
@@ -52,7 +52,7 @@ class PermissionBubbleControllerTest : public CocoaTest,
   MOCK_METHOD0(Closing, void());
   MOCK_METHOD1(SetView, void(PermissionBubbleView*));
 
-  virtual void SetUp() override {
+  void SetUp() override {
     CocoaTest::SetUp();
     bridge_.reset(new PermissionBubbleCocoa(nil));
     AddRequest(kPermissionA);
@@ -61,7 +61,7 @@ class PermissionBubbleControllerTest : public CocoaTest,
                       bridge:bridge_.get()];
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     [controller_ close];
     chrome::testing::NSRunLoopRunAllPending();
     STLDeleteElements(&requests_);
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
index 28e7c27..5fd817a 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
@@ -51,8 +51,8 @@ class FullscreenControllerTestWindow : public TestBrowserWindow,
   void UpdateFullscreenWithToolbar(bool with_toolbar) override;
   bool IsFullscreenWithToolbar() const override;
 #if defined(OS_WIN)
-  virtual void SetMetroSnapMode(bool enable) override;
-  virtual bool IsInMetroSnapMode() const override;
+  void SetMetroSnapMode(bool enable) override;
+  bool IsInMetroSnapMode() const override;
 #endif
   static const char* GetWindowStateString(WindowState state);
   WindowState state() const { return state_; }
diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.h b/chrome/browser/ui/metro_pin_tab_helper_win.h
index 98ec19b..2233f46 100644
--- a/chrome/browser/ui/metro_pin_tab_helper_win.h
+++ b/chrome/browser/ui/metro_pin_tab_helper_win.h
@@ -22,17 +22,17 @@ class MetroPinTabHelper
     : public content::WebContentsObserver,
       public content::WebContentsUserData<MetroPinTabHelper> {
  public:
-  virtual ~MetroPinTabHelper();
+  ~MetroPinTabHelper() override;
 
   bool IsPinned() const;
 
   void TogglePinnedToStartScreen();
 
   // content::WebContentsObserver overrides:
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
-  virtual void DidUpdateFaviconURL(
+  void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) override;
 
  private:
diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc
index 4b5d23c..e6a6b1b 100644
--- a/chrome/browser/ui/network_profile_bubble.cc
+++ b/chrome/browser/ui/network_profile_bubble.cc
@@ -41,12 +41,12 @@ const int kMaxWarnings = 2;
 // window.
 class BrowserListObserver : public chrome::BrowserListObserver {
  private:
-  virtual ~BrowserListObserver();
+  ~BrowserListObserver() override;
 
   // Overridden from chrome::BrowserListObserver:
-  virtual void OnBrowserAdded(Browser* browser) override;
-  virtual void OnBrowserRemoved(Browser* browser) override;
-  virtual void OnBrowserSetLastActive(Browser* browser) override;
+  void OnBrowserAdded(Browser* browser) override;
+  void OnBrowserRemoved(Browser* browser) override;
+  void OnBrowserSetLastActive(Browser* browser) override;
 };
 
 BrowserListObserver::~BrowserListObserver() {
diff --git a/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
index 3386881..2c03ab8 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
+++ b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
@@ -22,10 +22,10 @@ class MockPasswordUIView : public PasswordUIView {
       : profile_(profile), password_manager_presenter_(this) {
     password_manager_presenter_.Initialize();
   }
-  virtual ~MockPasswordUIView() {}
-  virtual Profile* GetProfile() override;
+  ~MockPasswordUIView() override {}
+  Profile* GetProfile() override;
 #if !defined(OS_ANDROID)
-  virtual gfx::NativeWindow GetNativeWindow() const override;
+  gfx::NativeWindow GetNativeWindow() const override;
 #endif
   MOCK_METHOD2(ShowPassword, void(size_t, const base::string16&));
   MOCK_METHOD2(SetPasswordList,
diff --git a/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h b/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
index 686174c..a95a46d 100644
--- a/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
+++ b/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
@@ -12,21 +12,20 @@ class ChromePDFWebContentsHelperClient
     : public pdf::PDFWebContentsHelperClient {
  public:
   ChromePDFWebContentsHelperClient();
-  virtual ~ChromePDFWebContentsHelperClient();
+  ~ChromePDFWebContentsHelperClient() override;
 
  private:
   // pdf::PDFWebContentsHelperClient:
-  virtual void UpdateLocationBar(content::WebContents* contents) override;
+  void UpdateLocationBar(content::WebContents* contents) override;
 
-  virtual void UpdateContentRestrictions(content::WebContents* contents,
-                                         int content_restrictions) override;
+  void UpdateContentRestrictions(content::WebContents* contents,
+                                 int content_restrictions) override;
 
-  virtual void OnPDFHasUnsupportedFeature(
-      content::WebContents* contents) override;
+  void OnPDFHasUnsupportedFeature(content::WebContents* contents) override;
 
-  virtual void OnSaveURL(content::WebContents* contents) override;
+  void OnSaveURL(content::WebContents* contents) override;
 
-  virtual void OnShowPDFPasswordDialog(
+  void OnShowPDFPasswordDialog(
       content::WebContents* contents,
       const base::string16& prompt,
       const pdf::PasswordDialogClosedCallback& callback) override;
diff --git a/chrome/browser/ui/pdf/pdf_browsertest_base.h b/chrome/browser/ui/pdf/pdf_browsertest_base.h
index 4beecd4..ee14467 100644
--- a/chrome/browser/ui/pdf/pdf_browsertest_base.h
+++ b/chrome/browser/ui/pdf/pdf_browsertest_base.h
@@ -26,7 +26,7 @@ class PDFBrowserTest : public InProcessBrowserTest,
                        public content::NotificationObserver {
  public:
   PDFBrowserTest();
-  virtual ~PDFBrowserTest();
+  ~PDFBrowserTest() override;
 
  protected:
   // Use our own TestServer so that we can serve files from the pdf directory.
@@ -47,12 +47,12 @@ class PDFBrowserTest : public InProcessBrowserTest,
                                     content::ReadbackResponse response);
 
   // content::NotificationObserver
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // InProcessBrowserTest
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // True if the snapshot differed from the expected value.
   bool snapshot_different_;
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index dc40e45..dbdd9d3 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -57,16 +57,16 @@ class PDFEnableAdobeReaderPromptClient
     : public pdf::OpenPDFInReaderPromptClient {
  public:
   explicit PDFEnableAdobeReaderPromptClient(Profile* profile);
-  virtual ~PDFEnableAdobeReaderPromptClient();
+  ~PDFEnableAdobeReaderPromptClient() override;
 
   // pdf::OpenPDFInReaderPromptClient
-  virtual base::string16 GetMessageText() const override;
-  virtual base::string16 GetAcceptButtonText() const override;
-  virtual base::string16 GetCancelButtonText() const override;
-  virtual bool ShouldExpire(
+  base::string16 GetMessageText() const override;
+  base::string16 GetAcceptButtonText() const override;
+  base::string16 GetCancelButtonText() const override;
+  bool ShouldExpire(
       const content::LoadCommittedDetails& details) const override;
-  virtual void Accept() override;
-  virtual void Cancel() override;
+  void Accept() override;
+  void Cancel() override;
 
  private:
   void OnYes();
@@ -163,7 +163,7 @@ class PDFUnsupportedFeatureInterstitial
 
  protected:
   // InterstitialPageDelegate implementation.
-  virtual std::string GetHTMLContents() override {
+  std::string GetHTMLContents() override {
     base::DictionaryValue strings;
     strings.SetString(
         "title",
@@ -191,7 +191,7 @@ class PDFUnsupportedFeatureInterstitial
     return webui::GetI18nTemplateHtml(html, &strings);
   }
 
-  virtual void CommandReceived(const std::string& command) override {
+  void CommandReceived(const std::string& command) override {
     if (command == "0") {
       content::RecordAction(
           UserMetricsAction("PDF_ReaderInterstitialCancel"));
@@ -215,8 +215,7 @@ class PDFUnsupportedFeatureInterstitial
     interstitial_page_->Proceed();
   }
 
-  virtual void OverrideRendererPrefs(
-      content::RendererPreferences* prefs) override {
+  void OverrideRendererPrefs(content::RendererPreferences* prefs) override {
     Profile* profile =
         Profile::FromBrowserContext(web_contents_->GetBrowserContext());
     renderer_preferences_util::UpdateFromSystemSettings(
@@ -238,16 +237,16 @@ class PDFUnsupportedFeaturePromptClient
  public:
   PDFUnsupportedFeaturePromptClient(WebContents* web_contents,
                                     const AdobeReaderPluginInfo& reader_info);
-  virtual ~PDFUnsupportedFeaturePromptClient();
+  ~PDFUnsupportedFeaturePromptClient() override;
 
   // pdf::OpenPDFInReaderPromptClient:
-  virtual base::string16 GetMessageText() const override;
-  virtual base::string16 GetAcceptButtonText() const override;
-  virtual base::string16 GetCancelButtonText() const override;
-  virtual bool ShouldExpire(
+  base::string16 GetMessageText() const override;
+  base::string16 GetAcceptButtonText() const override;
+  base::string16 GetCancelButtonText() const override;
+  bool ShouldExpire(
       const content::LoadCommittedDetails& details) const override;
-  virtual void Accept() override;
-  virtual void Cancel() override;
+  void Accept() override;
+  void Cancel() override;
 
  private:
   WebContents* web_contents_;
diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
index d3e4f60..50a7324 100644
--- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc
+++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
@@ -42,18 +42,17 @@ class AutolaunchInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  private:
   explicit AutolaunchInfoBarDelegate(Profile* profile);
-  virtual ~AutolaunchInfoBarDelegate();
+  ~AutolaunchInfoBarDelegate() override;
 
   void set_should_expire() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const override;
-  virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const override;
-  virtual base::string16 GetMessageText() const override;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
-  virtual bool Accept() override;
-  virtual bool Cancel() override;
+  int GetIconID() const override;
+  bool ShouldExpireInternal(const NavigationDetails& details) const override;
+  base::string16 GetMessageText() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  bool Cancel() override;
 
   // Weak pointer to the profile, not owned by us.
   Profile* profile_;
diff --git a/chrome/browser/ui/startup/default_browser_prompt_win.cc b/chrome/browser/ui/startup/default_browser_prompt_win.cc
index ec438e6..4b19c16 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_win.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt_win.cc
@@ -38,9 +38,9 @@ class SetMetroBrowserFlowLauncher : public content::NotificationObserver {
   }
 
   // content::NotificationObserver override:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   content::NotificationRegistrar registrar_;
   Profile* profile_;
diff --git a/chrome/browser/ui/views/app_list/win/activation_tracker_win.h b/chrome/browser/ui/views/app_list/win/activation_tracker_win.h
index 9daeacf8..6c619b4 100644
--- a/chrome/browser/ui/views/app_list/win/activation_tracker_win.h
+++ b/chrome/browser/ui/views/app_list/win/activation_tracker_win.h
@@ -15,10 +15,10 @@ class AppListServiceWin;
 class ActivationTrackerWin : public app_list::AppListViewObserver {
  public:
   explicit ActivationTrackerWin(AppListServiceWin* service);
-  ~ActivationTrackerWin();
+  ~ActivationTrackerWin() override;
 
   // app_list::AppListViewObserver:
-  virtual void OnActivationChanged(views::Widget* widget, bool active) override;
+  void OnActivationChanged(views::Widget* widget, bool active) override;
 
   void OnViewHidden();
 
diff --git a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h
index 7bc7834..6a21f8a 100644
--- a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h
+++ b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.h
@@ -11,15 +11,15 @@
 class AppListControllerDelegateWin : public AppListControllerDelegateViews {
  public:
   explicit AppListControllerDelegateWin(AppListServiceViews* service);
-  virtual ~AppListControllerDelegateWin();
+  ~AppListControllerDelegateWin() override;
 
   // AppListControllerDelegate overrides:
-  virtual bool ForceNativeDesktop() const override;
-  virtual gfx::ImageSkia GetWindowIcon() override;
+  bool ForceNativeDesktop() const override;
+  gfx::ImageSkia GetWindowIcon() override;
 
  private:
   // AppListcontrollerDelegateImpl:
-  virtual void FillLaunchParams(AppLaunchParams* params) override;
+  void FillLaunchParams(AppLaunchParams* params) override;
 
   DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateWin);
 };
diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.h b/chrome/browser/ui/views/app_list/win/app_list_service_win.h
index 6168b31..16648f9 100644
--- a/chrome/browser/ui/views/app_list/win/app_list_service_win.h
+++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.h
@@ -15,26 +15,26 @@ template <typename T> struct DefaultSingletonTraits;
 
 class AppListServiceWin : public AppListServiceViews {
  public:
-  virtual ~AppListServiceWin();
+  ~AppListServiceWin() override;
 
   static AppListServiceWin* GetInstance();
 
   // AppListService overrides:
-  virtual void SetAppListNextPaintCallback(void (*callback)()) override;
-  virtual void Init(Profile* initial_profile) override;
-  virtual void ShowForProfile(Profile* requested_profile) override;
-  virtual void CreateShortcut() override;
+  void SetAppListNextPaintCallback(void (*callback)()) override;
+  void Init(Profile* initial_profile) override;
+  void ShowForProfile(Profile* requested_profile) override;
+  void CreateShortcut() override;
 
  private:
   friend struct DefaultSingletonTraits<AppListServiceWin>;
 
   // AppListServiceViews overrides:
-  virtual void OnViewBeingDestroyed();
+  void OnViewBeingDestroyed() override;
 
   // AppListShowerDelegate overrides:
-  virtual void OnViewCreated() override;
-  virtual void OnViewDismissed() override;
-  virtual void MoveNearCursor(app_list::AppListView* view) override;
+  void OnViewCreated() override;
+  void OnViewDismissed() override;
+  void MoveNearCursor(app_list::AppListView* view) override;
 
   AppListServiceWin();
 
diff --git a/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc b/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc
index 09cc27f..00b18b7 100644
--- a/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc
+++ b/chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc
@@ -49,7 +49,7 @@ const int kWin8SplitPoint = 200;
 
 class AppListWinUnitTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     display_.set_bounds(gfx::Rect(0, 0, kScreenWidth, kScreenHeight));
     display_.set_work_area(gfx::Rect(0, 0, kScreenWidth, kScreenHeight));
     cursor_ = gfx::Point();
diff --git a/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h b/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h
index 75f3464..2bb5ce2 100644
--- a/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h
+++ b/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h
@@ -29,11 +29,10 @@ class AppWindowDesktopNativeWidgetAuraWin
       ChromeNativeAppWindowViewsWin* app_window);
 
  protected:
-  virtual ~AppWindowDesktopNativeWidgetAuraWin();
+  ~AppWindowDesktopNativeWidgetAuraWin() override;
 
   // Overridden from views::DesktopNativeWidgetAura:
-  virtual void InitNativeWidget(
-      const views::Widget::InitParams& params) override;
+  void InitNativeWidget(const views::Widget::InitParams& params) override;
   void Maximize() override;
   void Minimize() override;
 
diff --git a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h
index 2ef2063..fb3cb19 100644
--- a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h
+++ b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h
@@ -22,15 +22,13 @@ class AppWindowDesktopWindowTreeHostWin
   AppWindowDesktopWindowTreeHostWin(
       ChromeNativeAppWindowViewsWin* app_window,
       views::DesktopNativeWidgetAura* desktop_native_widget_aura);
-  virtual ~AppWindowDesktopWindowTreeHostWin();
+  ~AppWindowDesktopWindowTreeHostWin() override;
 
  private:
   // Overridden from DesktopWindowTreeHostWin:
-  virtual bool GetClientAreaInsets(gfx::Insets* insets) const override;
-  virtual void HandleFrameChanged() override;
-  virtual void PostHandleMSG(UINT message,
-                             WPARAM w_param,
-                             LPARAM l_param) override;
+  bool GetClientAreaInsets(gfx::Insets* insets) const override;
+  void HandleFrameChanged() override;
+  void PostHandleMSG(UINT message, WPARAM w_param, LPARAM l_param) override;
 
   // Updates the glass frame area by calling the DwmExtendFrameIntoClientArea
   // Windows function.
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
index e43ce51..c4d5ed3 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h
@@ -34,23 +34,23 @@ class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViewsAura {
   void EnsureCaptionStyleSet();
 
   // Overridden from ChromeNativeAppWindowViews:
-  virtual void OnBeforeWidgetInit(
+  void OnBeforeWidgetInit(
       const extensions::AppWindow::CreateParams& create_params,
       views::Widget::InitParams* init_params,
       views::Widget* widget) override;
-  virtual void InitializeDefaultWindow(
+  void InitializeDefaultWindow(
       const extensions::AppWindow::CreateParams& create_params) override;
-  virtual views::NonClientFrameView* CreateStandardDesktopAppFrame() override;
+  views::NonClientFrameView* CreateStandardDesktopAppFrame() override;
 
   // Overridden from ui::BaseWindow:
-  virtual void Show() override;
-  virtual void Activate() override;
+  void Show() override;
+  void Activate() override;
 
   // Overridden from views::WidgetDelegate:
   bool CanMinimize() const override;
 
   // Overridden from extensions::NativeAppWindow:
-  virtual void UpdateShelfMenu() override;
+  void UpdateShelfMenu() override;
 
   // Populated if there is a glass frame, which provides special information
   // to the native widget implementation. This will be NULL if there is no
diff --git a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h
index 7de1d1a..cccd40b 100644
--- a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h
+++ b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h
@@ -19,28 +19,27 @@ class GlassAppWindowFrameViewWin : public views::NonClientFrameView {
 
   explicit GlassAppWindowFrameViewWin(extensions::NativeAppWindow* window,
                                       views::Widget* widget);
-  virtual ~GlassAppWindowFrameViewWin();
+  ~GlassAppWindowFrameViewWin() override;
 
   gfx::Insets GetGlassInsets() const;
 
  private:
   // views::NonClientFrameView implementation.
-  virtual gfx::Rect GetBoundsForClientView() const override;
-  virtual gfx::Rect GetWindowBoundsForClientBounds(
+  gfx::Rect GetBoundsForClientView() const override;
+  gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
-  virtual int NonClientHitTest(const gfx::Point& point) override;
-  virtual void GetWindowMask(const gfx::Size& size,
-                             gfx::Path* window_mask) override;
-  virtual void ResetWindowControls() override {}
-  virtual void UpdateWindowIcon() override {}
-  virtual void UpdateWindowTitle() override {}
-  virtual void SizeConstraintsChanged() override {}
+  int NonClientHitTest(const gfx::Point& point) override;
+  void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
+  void ResetWindowControls() override {}
+  void UpdateWindowIcon() override {}
+  void UpdateWindowTitle() override {}
+  void SizeConstraintsChanged() override {}
 
   // views::View implementation.
-  virtual gfx::Size GetPreferredSize() const override;
-  virtual const char* GetClassName() const override;
-  virtual gfx::Size GetMinimumSize() const override;
-  virtual gfx::Size GetMaximumSize() const override;
+  gfx::Size GetPreferredSize() const override;
+  const char* GetClassName() const override;
+  gfx::Size GetMinimumSize() const override;
+  gfx::Size GetMaximumSize() const override;
 
   extensions::NativeAppWindow* window_;
   views::Widget* widget_;
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc
index de06d74..ea4513a 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc
@@ -50,10 +50,10 @@ class TestAutofillDialogViews : public AutofillDialogViews {
 class AutofillDialogViewsTest : public TestWithBrowserView {
  public:
   AutofillDialogViewsTest() {}
-  virtual ~AutofillDialogViewsTest() {}
+  ~AutofillDialogViewsTest() override {}
 
   // TestWithBrowserView:
-  virtual void SetUp() override {
+  void SetUp() override {
     TestWithBrowserView::SetUp();
 
     view_delegate_.SetProfile(profile());
@@ -79,7 +79,7 @@ class AutofillDialogViewsTest : public TestWithBrowserView {
     dialog_->Show();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     dialog_->GetWidget()->CloseNow();
     dialog_.reset();
 
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
index 01931d3..edaf860 100644
--- a/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
+++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc
@@ -41,9 +41,9 @@ class MockAutofillPopupViewDelegate : public AutofillPopupViewDelegate {
 class AutofillPopupBaseViewTest : public InProcessBrowserTest {
  public:
   AutofillPopupBaseViewTest() {}
-  virtual ~AutofillPopupBaseViewTest() {}
+  ~AutofillPopupBaseViewTest() override {}
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     gfx::NativeView native_view =
         browser()->tab_strip_model()->GetActiveWebContents()->GetNativeView();
     EXPECT_CALL(mock_delegate_, container_view())
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h
index d4d197f..8462ed6 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -28,9 +28,9 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
   void NotifyAccessibilityEvent(views::View* view,
                                 ui::AXEvent event_type) override;
 #if defined(OS_WIN)
-  virtual HICON GetDefaultWindowIcon() const override;
-  virtual HICON GetSmallWindowIcon() const override;
-  virtual bool IsWindowInMetro(gfx::NativeWindow window) const override;
+  HICON GetDefaultWindowIcon() const override;
+  HICON GetSmallWindowIcon() const override;
+  bool IsWindowInMetro(gfx::NativeWindow window) const override;
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
   gfx::ImageSkia* GetDefaultWindowIcon() const override;
 #endif
@@ -50,8 +50,8 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
   ui::ContextFactory* GetContextFactory() override;
   std::string GetApplicationName() override;
 #if defined(OS_WIN)
-  virtual int GetAppbarAutohideEdges(HMONITOR monitor,
-                                     const base::Closure& callback) override;
+  int GetAppbarAutohideEdges(HMONITOR monitor,
+                             const base::Closure& callback) override;
 #endif
 
  private:
diff --git a/chrome/browser/ui/views/color_chooser_dialog.h b/chrome/browser/ui/views/color_chooser_dialog.h
index b23061a..0afc50f 100644
--- a/chrome/browser/ui/views/color_chooser_dialog.h
+++ b/chrome/browser/ui/views/color_chooser_dialog.h
@@ -23,11 +23,11 @@ class ColorChooserDialog
   ColorChooserDialog(views::ColorChooserListener* listener,
                      SkColor initial_color,
                      gfx::NativeWindow owning_window);
-  virtual ~ColorChooserDialog();
+  ~ColorChooserDialog() override;
 
   // BaseShellDialog:
-  virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
-  virtual void ListenerDestroyed() override;
+  bool IsRunning(gfx::NativeWindow owning_window) const override;
+  void ListenerDestroyed() override;
 
  private:
   struct ExecuteOpenParams {
diff --git a/chrome/browser/ui/views/color_chooser_win.cc b/chrome/browser/ui/views/color_chooser_win.cc
index ce4ee36..8d44da4 100644
--- a/chrome/browser/ui/views/color_chooser_win.cc
+++ b/chrome/browser/ui/views/color_chooser_win.cc
@@ -23,15 +23,15 @@ class ColorChooserWin : public content::ColorChooser,
 
   ColorChooserWin(content::WebContents* web_contents,
                   SkColor initial_color);
-  ~ColorChooserWin();
+  ~ColorChooserWin() override;
 
   // content::ColorChooser overrides:
-  virtual void End() override;
-  virtual void SetSelectedColor(SkColor color) override {}
+  void End() override;
+  void SetSelectedColor(SkColor color) override {}
 
   // views::ColorChooserListener overrides:
-  virtual void OnColorChosen(SkColor color);
-  virtual void OnColorChooserDialogClosed();
+  void OnColorChosen(SkColor color) override;
+  void OnColorChooserDialogClosed() override;
 
  private:
   static ColorChooserWin* current_color_chooser_;
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.h b/chrome/browser/ui/views/conflicting_module_view_win.h
index 3775092c..fa4e496 100644
--- a/chrome/browser/ui/views/conflicting_module_view_win.h
+++ b/chrome/browser/ui/views/conflicting_module_view_win.h
@@ -32,7 +32,7 @@ class ConflictingModuleView : public views::BubbleDelegateView,
   static void MaybeShow(Browser* browser, views::View* anchor_view);
 
  private:
-  virtual ~ConflictingModuleView();
+  ~ConflictingModuleView() override;
 
   // Shows the bubble and updates the counter for how often it has been shown.
   void ShowBubble();
@@ -42,22 +42,21 @@ class ConflictingModuleView : public views::BubbleDelegateView,
   void DismissBubble();
 
   // views::BubbleDelegateView implementation:
-  virtual void Init() override;
+  void Init() override;
 
   // views::ButtonListener implementation.
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::View implementation.
-  virtual void GetAccessibleState(ui::AXViewState* state) override;
-  virtual void ViewHierarchyChanged(
+  void GetAccessibleState(ui::AXViewState* state) override;
+  void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
   // content::NotificationObserver implementation.
-  virtual void Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) override;
+  void Observe(
+      int type,
+      const content::NotificationSource& source,
+      const content::NotificationDetails& details) override;
 
   Browser* browser_;
 
diff --git a/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc b/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
index 0e2e3f1..50c594c 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views_unittest.cc
@@ -23,9 +23,9 @@ namespace views {
 class DesktopMediaPickerViewsTest : public testing::Test {
  public:
   DesktopMediaPickerViewsTest() {}
-  virtual ~DesktopMediaPickerViewsTest() {}
+  ~DesktopMediaPickerViewsTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     bool enable_pixel_output = false;
     ui::ContextFactory* context_factory =
         ui::InitializeContextFactoryForTests(enable_pixel_output);
@@ -56,7 +56,7 @@ class DesktopMediaPickerViewsTest : public testing::Test {
                                    base::Unretained(this)));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     test_helper_->TearDown();
     ui::TerminateContextFactoryForTests();
   }
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
index 266904a..b865b09 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
@@ -35,8 +35,8 @@ MediaGalleryPrefInfo MakePrefInfoForTesting(MediaGalleryPrefId id) {
 class MediaGalleriesDialogTest : public testing::Test {
  public:
   MediaGalleriesDialogTest() {}
-  virtual ~MediaGalleriesDialogTest() {}
-  virtual void SetUp() override {
+  ~MediaGalleriesDialogTest() override {}
+  void SetUp() override {
     std::vector<base::string16> headers;
     headers.push_back(base::string16());
     headers.push_back(base::ASCIIToUTF16("header2"));
@@ -46,7 +46,7 @@ class MediaGalleriesDialogTest : public testing::Test {
         Times(AnyNumber());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     Mock::VerifyAndClearExpectations(&controller_);
   }
 
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
index a280299..ea2d19d 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
@@ -41,27 +41,27 @@ class DesktopThemeProvider : public ui::ThemeProvider {
       : delegate_(delegate) {
   }
 
-  virtual bool UsingSystemTheme() const override {
+  bool UsingSystemTheme() const override {
     return delegate_->UsingSystemTheme();
   }
-  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
+  gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
     return delegate_->GetImageSkiaNamed(
         chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
   }
-  virtual SkColor GetColor(int id) const override {
+  SkColor GetColor(int id) const override {
     return delegate_->GetColor(id);
   }
-  virtual int GetDisplayProperty(int id) const override {
+  int GetDisplayProperty(int id) const override {
     return delegate_->GetDisplayProperty(id);
   }
-  virtual bool ShouldUseNativeFrame() const override {
+  bool ShouldUseNativeFrame() const override {
     return delegate_->ShouldUseNativeFrame();
   }
-  virtual bool HasCustomImage(int id) const override {
+  bool HasCustomImage(int id) const override {
     return delegate_->HasCustomImage(
         chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
   }
-  virtual base::RefCountedMemory* GetRawData(
+  base::RefCountedMemory* GetRawData(
       int id,
       ui::ScaleFactor scale_factor) const override {
     return delegate_->GetRawData(id, scale_factor);
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
index bfb355b..26f20c2 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
@@ -29,31 +29,29 @@ class BrowserDesktopWindowTreeHostWin : public BrowserDesktopWindowTreeHost,
       views::DesktopNativeWidgetAura* desktop_native_widget_aura,
       BrowserView* browser_view,
       BrowserFrame* browser_frame);
-  virtual ~BrowserDesktopWindowTreeHostWin();
+  ~BrowserDesktopWindowTreeHostWin() override;
 
  private:
   views::NativeMenuWin* GetSystemMenu();
 
   // Overridden from BrowserDesktopWindowTreeHost:
-  virtual DesktopWindowTreeHost* AsDesktopWindowTreeHost() override;
-  virtual int GetMinimizeButtonOffset() const override;
-  virtual bool UsesNativeSystemMenu() const override;
+  DesktopWindowTreeHost* AsDesktopWindowTreeHost() override;
+  int GetMinimizeButtonOffset() const override;
+  bool UsesNativeSystemMenu() const override;
 
   // Overridden from DesktopWindowTreeHostWin:
-  virtual int GetInitialShowState() const override;
-  virtual bool GetClientAreaInsets(gfx::Insets* insets) const override;
-  virtual void HandleCreate() override;
-  virtual void HandleFrameChanged() override;
-  virtual bool PreHandleMSG(UINT message,
-                            WPARAM w_param,
-                            LPARAM l_param,
-                            LRESULT* result) override;
-  virtual void PostHandleMSG(UINT message,
-                             WPARAM w_param,
-                             LPARAM l_param) override;
-  virtual bool IsUsingCustomFrame() const override;
-  virtual bool ShouldUseNativeFrame() const override;
-  virtual void FrameTypeChanged() override;
+  int GetInitialShowState() const override;
+  bool GetClientAreaInsets(gfx::Insets* insets) const override;
+  void HandleCreate() override;
+  void HandleFrameChanged() override;
+  bool PreHandleMSG(UINT message,
+                    WPARAM w_param,
+                    LPARAM l_param,
+                    LRESULT* result) override;
+  void PostHandleMSG(UINT message, WPARAM w_param, LPARAM l_param) override;
+  bool IsUsingCustomFrame() const override;
+  bool ShouldUseNativeFrame() const override;
+  void FrameTypeChanged() override;
 
   void UpdateDWMFrame();
 
diff --git a/chrome/browser/ui/views/frame/browser_frame_ashwin.h b/chrome/browser/ui/views/frame/browser_frame_ashwin.h
index 8bad8ee..2352689 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ashwin.h
+++ b/chrome/browser/ui/views/frame/browser_frame_ashwin.h
@@ -14,11 +14,12 @@ class BrowserFrameAshWin : public BrowserFrameAsh {
   BrowserFrameAshWin(BrowserFrame* browser_frame, BrowserView* browser_view);
 
  protected:
-  virtual ~BrowserFrameAshWin();
+  ~BrowserFrameAshWin() override;
 
   // Overridden from aura::client::ActivationChangeObserver:
-  virtual void OnWindowFocused(aura::Window* gained_focus,
-                               aura::Window* lost_focus) override;
+  void OnWindowFocused(aura::Window* gained_focus,
+                       aura::Window* lost_focus) override;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameAshWin);
 };
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
index ae7560a..ef19840 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -169,7 +169,7 @@ class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest {
  public:
   BrowserTestWithProfileShortcutManager() {}
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kEnableProfileShortcutManager);
   }
 
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
index 7d29eb9..292d56e 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
@@ -17,43 +17,41 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
  public:
   // Constructs a non-client view for an BrowserFrame.
   GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
-  virtual ~GlassBrowserFrameView();
+  ~GlassBrowserFrameView() override;
 
   // BrowserNonClientFrameView:
-  virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
-  virtual int GetTopInset() const override;
-  virtual int GetThemeBackgroundXInset() const override;
-  virtual void UpdateThrobber(bool running) override;
-  virtual gfx::Size GetMinimumSize() const override;
+  gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
+  int GetTopInset() const override;
+  int GetThemeBackgroundXInset() const override;
+  void UpdateThrobber(bool running) override;
+  gfx::Size GetMinimumSize() const override;
 
   // views::NonClientFrameView:
-  virtual gfx::Rect GetBoundsForClientView() const override;
-  virtual gfx::Rect GetWindowBoundsForClientBounds(
+  gfx::Rect GetBoundsForClientView() const override;
+  gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
-  virtual int NonClientHitTest(const gfx::Point& point) override;
-  virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
-      override {}
-  virtual void ResetWindowControls() override {}
-  virtual void UpdateWindowIcon() override {}
-  virtual void UpdateWindowTitle() override {}
-  virtual void SizeConstraintsChanged() override {}
+  int NonClientHitTest(const gfx::Point& point) override;
+  void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override {}
+  void ResetWindowControls() override {}
+  void UpdateWindowIcon() override {}
+  void UpdateWindowTitle() override {}
+  void SizeConstraintsChanged() override {}
 
  protected:
   // views::View:
-  virtual void OnPaint(gfx::Canvas* canvas) override;
-  virtual void Layout() override;
+  void OnPaint(gfx::Canvas* canvas) override;
+  void Layout() override;
 
   // views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // BrowserNonClientFrameView:
   void UpdateNewAvatarButtonImpl() override;
 
  private:
   // views::NonClientFrameView:
-  virtual bool DoesIntersectRect(const views::View* target,
-                                 const gfx::Rect& rect) const override;
+  bool DoesIntersectRect(const views::View* target,
+                         const gfx::Rect& rect) const override;
 
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.
diff --git a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
index 86f03a2..b1bc124 100644
--- a/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
+++ b/chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h
@@ -15,10 +15,10 @@
 class SystemMenuInsertionDelegateWin : public views::MenuInsertionDelegateWin {
  public:
   SystemMenuInsertionDelegateWin() {}
-  virtual ~SystemMenuInsertionDelegateWin() {}
+  ~SystemMenuInsertionDelegateWin() override {}
 
   // Overridden from views::MenuInsertionDelegateWin:
-  virtual int GetInsertionIndex(HMENU native_menu) override;
+  int GetInsertionIndex(HMENU native_menu) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemMenuInsertionDelegateWin);
diff --git a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
index f5c620d..c0b7b21 100644
--- a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
@@ -73,7 +73,7 @@ class StarViewTestNoDWM : public InProcessBrowserTest {
  public:
   StarViewTestNoDWM() {}
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kDisableDwmComposition);
   }
 };
diff --git a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc b/chrome/browser/ui/views/menu_controller_interactive_uitest.cc
index a49aaa8..05c4c23 100644
--- a/chrome/browser/ui/views/menu_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/menu_controller_interactive_uitest.cc
@@ -13,11 +13,11 @@ class MenuControllerMnemonicTest : public MenuTestBase {
   MenuControllerMnemonicTest() {
   }
 
-  virtual ~MenuControllerMnemonicTest() {
+  ~MenuControllerMnemonicTest() override {
   }
 
   // MenuTestBase overrides:
-  virtual void BuildMenu(views::MenuItemView* menu) override {
+  void BuildMenu(views::MenuItemView* menu) override {
     ASSERT_NE(ui::VKEY_DIVIDE, '/');
     menu->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One&/"));
     menu->AppendMenuItemWithLabel(2, base::ASCIIToUTF16("Two"));
diff --git a/chrome/browser/ui/views/menu_controller_test.cc b/chrome/browser/ui/views/menu_controller_test.cc
index 496ea05..64b245f 100644
--- a/chrome/browser/ui/views/menu_controller_test.cc
+++ b/chrome/browser/ui/views/menu_controller_test.cc
@@ -13,17 +13,16 @@ class MenuControllerMnemonicTest : public MenuTestBase {
   MenuControllerMnemonicTest() {
   }
 
-  virtual ~MenuControllerMnemonicTest() {
-  }
+  ~MenuControllerMnemonicTest() override {}
 
   // MenuTestBase overrides:
-  virtual void BuildMenu(views::MenuItemView* menu) override {
+  void BuildMenu(views::MenuItemView* menu) override {
     ASSERT_NE(ui::VKEY_DIVIDE, '/');
     menu->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One&/"));
     menu->AppendMenuItemWithLabel(2, base::ASCIIToUTF16("Two"));
   }
 
-  virtual void DoTestWithMenuOpen() {
+  void DoTestWithMenuOpen() override {
     ASSERT_TRUE(menu()->GetSubmenu()->IsShowing());
     KeyPress(KEYCODE,
              CreateEventTask(this, &MenuControllerMnemonicTest::Step2));
diff --git a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc
index 00160be..c28a9a0d 100644
--- a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc
@@ -18,11 +18,11 @@ class MenuItemViewTestBasic : public MenuTestBase {
   MenuItemViewTestBasic() {
   }
 
-  virtual ~MenuItemViewTestBasic() {
+  ~MenuItemViewTestBasic() override {
   }
 
   // MenuTestBase implementation
-  virtual void BuildMenu(views::MenuItemView* menu) override {
+  void BuildMenu(views::MenuItemView* menu) override {
     menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1"));
     menu->AppendMenuItemWithLabel(2, ASCIIToUTF16("item 2"));
     menu->AppendSeparator();
@@ -30,7 +30,7 @@ class MenuItemViewTestBasic : public MenuTestBase {
   }
 
   // Click on item INDEX.
-  virtual void DoTestWithMenuOpen() override {
+  void DoTestWithMenuOpen() override {
     views::SubmenuView* submenu = menu()->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
@@ -68,17 +68,17 @@ class MenuItemViewTestInsert : public MenuTestBase {
   MenuItemViewTestInsert() : inserted_item_(NULL) {
   }
 
-  virtual ~MenuItemViewTestInsert() {
+  ~MenuItemViewTestInsert() override {
   }
 
   // MenuTestBase implementation
-  virtual void BuildMenu(views::MenuItemView* menu) override {
+  void BuildMenu(views::MenuItemView* menu) override {
     menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1"));
     menu->AppendMenuItemWithLabel(2, ASCIIToUTF16("item 2"));
   }
 
   // Insert item at INSERT_INDEX and click item at SELECT_INDEX.
-  virtual void DoTestWithMenuOpen() override {
+  void DoTestWithMenuOpen() override {
     views::SubmenuView* submenu = menu()->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
@@ -150,11 +150,11 @@ class MenuItemViewTestInsertWithSubmenu : public MenuTestBase {
       inserted_item_(NULL) {
   }
 
-  virtual ~MenuItemViewTestInsertWithSubmenu() {
+  ~MenuItemViewTestInsertWithSubmenu() override {
   }
 
   // MenuTestBase implementation
-  virtual void BuildMenu(views::MenuItemView* menu) override {
+  void BuildMenu(views::MenuItemView* menu) override {
     submenu_ = menu->AppendSubMenu(1, ASCIIToUTF16("My Submenu"));
     submenu_->AppendMenuItemWithLabel(101, ASCIIToUTF16("submenu item 1"));
     submenu_->AppendMenuItemWithLabel(101, ASCIIToUTF16("submenu item 2"));
@@ -162,7 +162,7 @@ class MenuItemViewTestInsertWithSubmenu : public MenuTestBase {
   }
 
   // Post submenu.
-  virtual void DoTestWithMenuOpen() override {
+  void DoTestWithMenuOpen() override {
     Click(submenu_,
           CreateEventTask(this, &MenuItemViewTestInsertWithSubmenu::Step2));
   }
@@ -209,18 +209,18 @@ class MenuItemViewTestRemove : public MenuTestBase {
   MenuItemViewTestRemove() {
   }
 
-  virtual ~MenuItemViewTestRemove() {
+  ~MenuItemViewTestRemove() override {
   }
 
   // MenuTestBase implementation
-  virtual void BuildMenu(views::MenuItemView* menu) override {
+  void BuildMenu(views::MenuItemView* menu) override {
     menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1"));
     menu->AppendMenuItemWithLabel(2, ASCIIToUTF16("item 2"));
     menu->AppendMenuItemWithLabel(3, ASCIIToUTF16("item 3"));
   }
 
   // Remove item at REMOVE_INDEX and click item at SELECT_INDEX.
-  virtual void DoTestWithMenuOpen() override {
+  void DoTestWithMenuOpen() override {
     views::SubmenuView* submenu = menu()->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
@@ -275,11 +275,11 @@ class MenuItemViewTestRemoveWithSubmenu : public MenuTestBase {
   MenuItemViewTestRemoveWithSubmenu() : submenu_(NULL) {
   }
 
-  virtual ~MenuItemViewTestRemoveWithSubmenu() {
+  ~MenuItemViewTestRemoveWithSubmenu() override {
   }
 
   // MenuTestBase implementation
-  virtual void BuildMenu(views::MenuItemView* menu) override {
+  void BuildMenu(views::MenuItemView* menu) override {
     menu->AppendMenuItemWithLabel(1, ASCIIToUTF16("item 1"));
     submenu_ = menu->AppendSubMenu(2, ASCIIToUTF16("My Submenu"));
     submenu_->AppendMenuItemWithLabel(101, ASCIIToUTF16("submenu item 1"));
@@ -287,7 +287,7 @@ class MenuItemViewTestRemoveWithSubmenu : public MenuTestBase {
   }
 
   // Post submenu.
-  virtual void DoTestWithMenuOpen() override {
+  void DoTestWithMenuOpen() override {
     views::SubmenuView* submenu = menu()->GetSubmenu();
     ASSERT_TRUE(submenu);
     ASSERT_TRUE(submenu->IsShowing());
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray.h b/chrome/browser/ui/views/message_center/web_notification_tray.h
index c6ddd0a..e08984c 100644
--- a/chrome/browser/ui/views/message_center/web_notification_tray.h
+++ b/chrome/browser/ui/views/message_center/web_notification_tray.h
@@ -67,7 +67,7 @@ class WebNotificationTray : public message_center::MessageCenterTrayDelegate,
   // StatusIconObserver implementation.
   void OnStatusIconClicked() override;
 #if defined(OS_WIN)
-  virtual void OnBalloonClicked() override;
+  void OnBalloonClicked() override;
 
   // This shows a platform-specific balloon informing the user of the existence
   // of the message center in the status tray area.
diff --git a/chrome/browser/ui/views/network_profile_bubble_view.h b/chrome/browser/ui/views/network_profile_bubble_view.h
index f24c517..97720f6 100644
--- a/chrome/browser/ui/views/network_profile_bubble_view.h
+++ b/chrome/browser/ui/views/network_profile_bubble_view.h
@@ -25,17 +25,16 @@ class NetworkProfileBubbleView : public views::BubbleDelegateView,
                            content::PageNavigator* navigator,
                            Profile* profile);
  private:
-  virtual ~NetworkProfileBubbleView();
+  ~NetworkProfileBubbleView() override;
 
   // views::BubbleDelegateView:
-  virtual void Init() override;
+  void Init() override;
 
   // views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::LinkListener:
-  virtual void LinkClicked(views::Link* source, int event_flags) override;
+  void LinkClicked(views::Link* source, int event_flags) override;
 
   // Used for loading pages.
   content::PageNavigator* navigator_;
diff --git a/chrome/browser/ui/views/panels/panel_stack_view.h b/chrome/browser/ui/views/panels/panel_stack_view.h
index 5abe1e7..56f8ce8 100644
--- a/chrome/browser/ui/views/panels/panel_stack_view.h
+++ b/chrome/browser/ui/views/panels/panel_stack_view.h
@@ -94,14 +94,14 @@ class PanelStackView : public NativePanelStackWindow,
 
 #if defined(OS_WIN)
   // Overridden from ui::HWNDMessageFilter:
-  virtual bool FilterMessage(HWND hwnd,
-                             UINT message,
-                             WPARAM w_param,
-                             LPARAM l_param,
-                             LRESULT* l_result) override;
+  bool FilterMessage(HWND hwnd,
+                     UINT message,
+                     WPARAM w_param,
+                     LPARAM l_param,
+                     LRESULT* l_result) override;
 
   // Overridden from TaskbarWindowThumbnailerDelegateWin:
-  virtual std::vector<HWND> GetSnapshotWindowHandles() const override;
+  std::vector<HWND> GetSnapshotWindowHandles() const override;
 
   // Updates the live preview snapshot when something changes, like
   // adding/removing/moving/resizing a stacked panel.
diff --git a/chrome/browser/ui/views/panels/panel_view.h b/chrome/browser/ui/views/panels/panel_view.h
index 3d4a0a8..b68e76a 100644
--- a/chrome/browser/ui/views/panels/panel_view.h
+++ b/chrome/browser/ui/views/panels/panel_view.h
@@ -143,11 +143,11 @@ class PanelView : public NativePanel,
 
   // Overridden from ui::HWNDMessageFilter:
 #if defined(OS_WIN)
-  virtual bool FilterMessage(HWND hwnd,
-                             UINT message,
-                             WPARAM w_param,
-                             LPARAM l_param,
-                             LRESULT* l_result) override;
+  bool FilterMessage(HWND hwnd,
+                     UINT message,
+                     WPARAM w_param,
+                     LPARAM l_param,
+                     LRESULT* l_result) override;
 #endif
 
   // Overridden from AnimationDelegate:
diff --git a/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h b/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h
index 66e4fa3..3040039 100644
--- a/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h
+++ b/chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h
@@ -25,7 +25,7 @@ class TaskbarWindowThumbnailerWin : public ui::HWNDMessageFilter {
  public:
   TaskbarWindowThumbnailerWin(HWND hwnd,
                               TaskbarWindowThumbnailerDelegateWin* delegate);
-  virtual ~TaskbarWindowThumbnailerWin();
+  ~TaskbarWindowThumbnailerWin() override;
 
   // Starts using the custom snapshot for live preview. The snapshot is only
   // captured once when the system requests it, so the updates of the panels'
@@ -48,11 +48,11 @@ class TaskbarWindowThumbnailerWin : public ui::HWNDMessageFilter {
 
  private:
   // Overridden from ui::HWNDMessageFilter:
-  virtual bool FilterMessage(HWND hwnd,
-                             UINT message,
-                             WPARAM w_param,
-                             LPARAM l_param,
-                             LRESULT* l_result) override;
+  bool FilterMessage(HWND hwnd,
+                     UINT message,
+                     WPARAM w_param,
+                     LPARAM l_param,
+                     LRESULT* l_result) override;
 
   // Message handlers.
   bool OnDwmSendIconicThumbnail(int width, int height, LRESULT* l_result);
diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.h b/chrome/browser/ui/views/status_icons/status_icon_win.h
index 300bf0c..c2f4ac7 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_win.h
+++ b/chrome/browser/ui/views/status_icons/status_icon_win.h
@@ -28,7 +28,7 @@ class StatusIconWin : public StatusIcon {
  public:
   // Constructor which provides this icon's unique ID and messaging window.
   StatusIconWin(StatusTrayWin* tray, UINT id, HWND window, UINT message);
-  virtual ~StatusIconWin();
+  ~StatusIconWin() override;
 
   // Handles a click event from the user - if |left_button_click| is true and
   // there is a registered observer, passes the click event to the observer,
@@ -46,16 +46,16 @@ class StatusIconWin : public StatusIcon {
   UINT message_id() const { return message_id_; }
 
   // Overridden from StatusIcon:
-  virtual void SetImage(const gfx::ImageSkia& image) override;
-  virtual void SetToolTip(const base::string16& tool_tip) override;
-  virtual void DisplayBalloon(const gfx::ImageSkia& icon,
-                              const base::string16& title,
-                              const base::string16& contents) override;
-  virtual void ForceVisible() override;
+  void SetImage(const gfx::ImageSkia& image) override;
+  void SetToolTip(const base::string16& tool_tip) override;
+  void DisplayBalloon(const gfx::ImageSkia& icon,
+                      const base::string16& title,
+                      const base::string16& contents) override;
+  void ForceVisible() override;
 
  protected:
   // Overridden from StatusIcon:
-  virtual void UpdatePlatformContextMenu(StatusIconMenuModel* menu) override;
+  void UpdatePlatformContextMenu(StatusIconMenuModel* menu) override;
 
  private:
   void InitIconData(NOTIFYICONDATA* icon_data);
diff --git a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
index 44676dd..42ec2c0 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
+++ b/chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h
@@ -63,9 +63,9 @@ class StatusTrayStateChangerWin : public INotificationCB,
   void EnsureTrayIconVisible();
 
   // IUnknown.
-  virtual ULONG STDMETHODCALLTYPE AddRef() override;
-  virtual ULONG STDMETHODCALLTYPE Release() override;
-  virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, PVOID*) override;
+  ULONG STDMETHODCALLTYPE AddRef() override;
+  ULONG STDMETHODCALLTYPE Release() override;
+  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, PVOID*) override;
 
   // INotificationCB.
   // Notify is called in response to RegisterCallback for each current
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc
index 471a00a..2a9c2f2 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -70,7 +70,7 @@ class StatusTrayStateChangerProxyImpl : public StatusTrayStateChangerProxy,
     worker_thread_.init_com_with_mta(false);
   }
 
-  virtual void EnqueueChange(UINT icon_id, HWND window) override {
+  void EnqueueChange(UINT icon_id, HWND window) override {
     DCHECK(CalledOnValidThread());
     if (pending_requests_ == 0)
       worker_thread_.Start();
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.h b/chrome/browser/ui/views/status_icons/status_tray_win.h
index e4271d6..260a366 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.h
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.h
@@ -28,7 +28,7 @@ class StatusTrayStateChangerProxy {
 class StatusTrayWin : public StatusTray {
  public:
   StatusTrayWin();
-  ~StatusTrayWin();
+  ~StatusTrayWin() override;
 
   void UpdateIconVisibilityInBackground(StatusIconWin* status_icon);
 
@@ -38,10 +38,9 @@ class StatusTrayWin : public StatusTray {
 
  protected:
   // Overriden from StatusTray:
-  virtual StatusIcon* CreatePlatformStatusIcon(StatusIconType type,
-                                               const gfx::ImageSkia& image,
-                                               const base::string16& tool_tip)
-      override;
+  StatusIcon* CreatePlatformStatusIcon(StatusIconType type,
+                                       const gfx::ImageSkia& image,
+                                       const base::string16& tool_tip) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(StatusTrayWinTest, EnsureVisibleTest);
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index b01e196..3581de7 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -256,7 +256,7 @@ class NewTabButton : public views::ImageButton,
  protected:
   // views::View:
 #if defined(OS_WIN)
-  virtual void OnMouseReleased(const ui::MouseEvent& event) override;
+  void OnMouseReleased(const ui::MouseEvent& event) override;
 #endif
   void OnPaint(gfx::Canvas* canvas) override;
 
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button_test.cc b/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
index 24c34ed..c22775a 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button_test.cc
@@ -20,56 +20,56 @@ class ToolbarButtonDragTest : public ViewEventTestBase,
         menu_closed_(false) {
   }
 
-  virtual ~ToolbarButtonDragTest() {
+  ~ToolbarButtonDragTest() override {
   }
 
   // ViewEventTestBase implementation.
-  virtual void SetUp() override {
+  void SetUp() override {
     button_ = new ToolbarButton(NULL, new ui::SimpleMenuModel(this));
 
     ViewEventTestBase::SetUp();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     ViewEventTestBase::TearDown();
   }
 
-  virtual views::View* CreateContentsView() override {
+  views::View* CreateContentsView() override {
     return button_;
   }
 
-  virtual gfx::Size GetPreferredSize() const override {
+  gfx::Size GetPreferredSize() const override {
     return button_->GetPreferredSize();
   }
 
   // ui::SimpleMenuModel::Delegate implementation.
-  virtual bool IsCommandIdChecked(int id) const override {
+  bool IsCommandIdChecked(int id) const override {
     return false;
   }
 
-  virtual bool IsCommandIdEnabled(int id) const override {
+  bool IsCommandIdEnabled(int id) const override {
     return true;
   }
 
-  virtual bool GetAcceleratorForCommandId(
+  bool GetAcceleratorForCommandId(
       int id,
       ui::Accelerator* accelerator) override {
     return false;
   }
 
-  virtual void ExecuteCommand(int id, int event_flags) override {
+  void ExecuteCommand(int id, int event_flags) override {
   }
 
-  virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) override {
+  void MenuWillShow(ui::SimpleMenuModel* /*source*/) override {
     menu_shown_ = true;
   }
 
-  virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) override {
+  void MenuClosed(ui::SimpleMenuModel* /*source*/) override {
     menu_closed_ = true;
   }
 
   // ViewEventTestBase implementation.
-  virtual void DoTestOnMessageLoop() override {
+  void DoTestOnMessageLoop() override {
     // Click on the ToolbarButton.
     ui_test_utils::MoveMouseToCenterAndPress(
         button_,
diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h
index aca00e0..da2bf74 100644
--- a/chrome/browser/ui/views/uninstall_view.h
+++ b/chrome/browser/ui/views/uninstall_view.h
@@ -30,24 +30,22 @@ class UninstallView : public views::ButtonListener,
  public:
   explicit UninstallView(int* user_selection,
                          const base::Closure& quit_closure);
-  virtual ~UninstallView();
+  ~UninstallView() override;
 
   // Overridden form views::ButtonListener.
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // Overridden from views::DialogDelegateView:
-  virtual bool Accept() override;
-  virtual bool Cancel() override;
-  virtual base::string16 GetDialogButtonLabel(
-      ui::DialogButton button) const override;
+  bool Accept() override;
+  bool Cancel() override;
+  base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
 
   // Overridden from views::WidgetDelegate:
-  virtual base::string16 GetWindowTitle() const override;
+  base::string16 GetWindowTitle() const override;
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const override;
-  virtual base::string16 GetItemAt(int index) override;
+  int GetItemCount() const override;
+  base::string16 GetItemAt(int index) override;
 
  private:
   typedef std::map<base::string16, base::string16> BrowsersMap;
diff --git a/chrome/browser/ui/webui/help/version_updater_win.cc b/chrome/browser/ui/webui/help/version_updater_win.cc
index 7223167..4311801 100644
--- a/chrome/browser/ui/webui/help/version_updater_win.cc
+++ b/chrome/browser/ui/webui/help/version_updater_win.cc
@@ -36,11 +36,11 @@ class VersionUpdaterWin : public VersionUpdater {
 
   // Clients must use VersionUpdater::Create().
   VersionUpdaterWin();
-  virtual ~VersionUpdaterWin();
+  ~VersionUpdaterWin() override;
 
   // VersionUpdater implementation.
-  virtual void CheckForUpdate(const StatusCallback& callback) override;
-  virtual void RelaunchBrowser() const override;
+  void CheckForUpdate(const StatusCallback& callback) override;
+  void RelaunchBrowser() const override;
 
   // chrome::UpdateCheckCallback.
   void OnUpdateCheckResults(GoogleUpdateUpgradeResult result,
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc
index 859b831..049c95a 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc
@@ -345,10 +345,10 @@ class LocalDiscoveryUITest : public WebUIBrowserTest {
       &fetcher_impl_factory_,
       fake_url_fetcher_creator_.callback()) {
   }
-  virtual ~LocalDiscoveryUITest() {
+  ~LocalDiscoveryUITest() override {
   }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     WebUIBrowserTest::SetUpOnMainThread();
 
     test_service_discovery_client_ = new TestServiceDiscoveryClient();
@@ -425,7 +425,7 @@ class LocalDiscoveryUITest : public WebUIBrowserTest {
     AddLibrary(base::FilePath(FILE_PATH_LITERAL("local_discovery_ui_test.js")));
   }
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
 #if defined(OS_CHROMEOS)
     // On chromeos, don't sign in with the stub-user automatically.  Use the
     // kLoginUser instead.
diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.h b/chrome/browser/ui/webui/mojo_web_ui_controller.h
index bb934df..e202525 100644
--- a/chrome/browser/ui/webui/mojo_web_ui_controller.h
+++ b/chrome/browser/ui/webui/mojo_web_ui_controller.h
@@ -54,9 +54,8 @@ class MojoWebUIController : public MojoWebUIControllerBase {
  public:
   explicit MojoWebUIController(content::WebUI* contents)
       : MojoWebUIControllerBase(contents), weak_factory_(this) {}
-  virtual ~MojoWebUIController() {}
-  virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) override {
+  ~MojoWebUIController() override {}
+  void RenderViewCreated(content::RenderViewHost* render_view_host) override {
     MojoWebUIControllerBase::RenderViewCreated(render_view_host);
     render_view_host->GetMainFrame()->GetServiceRegistry()->
         AddService<Interface>(
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h
index 86ae2c4..eeb13b5 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.h
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.h
@@ -36,10 +36,10 @@ class RenderViewHost;
 class PreferencesBrowserTest : public InProcessBrowserTest {
  public:
   PreferencesBrowserTest();
-  ~PreferencesBrowserTest();
+  ~PreferencesBrowserTest() override;
 
   // InProcessBrowserTest implementation:
-  virtual void SetUpOnMainThread() override;
+  void SetUpOnMainThread() override;
 
   void OnPreferenceChanged(const std::string& pref_name);
 
@@ -49,7 +49,7 @@ class PreferencesBrowserTest : public InProcessBrowserTest {
   void SetUpPrefs();
 
   // InProcessBrowserTest implementation:
-  virtual void SetUpInProcessBrowserTestFixture() override;
+  void SetUpInProcessBrowserTestFixture() override;
 
   // Sets user policies through the mock policy provider.
   void SetUserPolicies(const std::vector<std::string>& names,
diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc
index a16c05f..aff5b41 100644
--- a/chrome/browser/ui/webui/profiler_ui.cc
+++ b/chrome/browser/ui/webui/profiler_ui.cc
@@ -53,17 +53,17 @@ class ProfilerWebUIDataSource : public content::URLDataSource {
 
  protected:
   // content::URLDataSource implementation.
-  virtual std::string GetSource() override {
+  std::string GetSource() override {
     return chrome::kChromeUIProfilerHost;
   }
 
-  virtual std::string GetMimeType(const std::string& path) const override {
+  std::string GetMimeType(const std::string& path) const override {
     if (EndsWith(path, ".js", false))
       return "application/javascript";
     return "text/html";
   }
 
-  virtual void StartDataRequest(
+  void StartDataRequest(
       const std::string& path,
       bool is_incognito,
       const content::URLDataSource::GotDataCallback& callback) override {
diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
index 9645460..5674678 100644
--- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc
+++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
@@ -98,16 +98,16 @@ class SetAsDefaultBrowserHandler
  public:
   explicit SetAsDefaultBrowserHandler(
       const base::WeakPtr<ResponseDelegate>& response_delegate);
-  virtual ~SetAsDefaultBrowserHandler();
+  ~SetAsDefaultBrowserHandler() override;
 
   // WebUIMessageHandler implementation.
-  virtual void RegisterMessages() override;
+  void RegisterMessages() override;
 
   // ShellIntegration::DefaultWebClientObserver implementation.
-  virtual void SetDefaultWebClientUIState(
+  void SetDefaultWebClientUIState(
       ShellIntegration::DefaultWebClientUIState state) override;
-  virtual void OnSetAsDefaultConcluded(bool close_chrome)  override;
-  virtual bool IsInteractiveSetDefaultPermitted() override;
+  void OnSetAsDefaultConcluded(bool close_chrome) override;
+  bool IsInteractiveSetDefaultPermitted() override;
 
  private:
   // Handler for the 'Next' (or 'make Chrome the Metro browser') button.
@@ -201,31 +201,29 @@ class SetAsDefaultBrowserDialogImpl : public ui::WebDialogDelegate,
                                       public chrome::BrowserListObserver {
  public:
   SetAsDefaultBrowserDialogImpl(Profile* profile, Browser* browser);
-  virtual ~SetAsDefaultBrowserDialogImpl();
+  ~SetAsDefaultBrowserDialogImpl() override;
   // Show a modal web dialog with kChromeUIMetroFlowURL page.
   void ShowDialog();
 
  protected:
   // Overridden from WebDialogDelegate:
-  virtual ui::ModalType GetDialogModalType() const override;
-  virtual base::string16 GetDialogTitle() const override;
-  virtual GURL GetDialogContentURL() const override;
-  virtual void GetWebUIMessageHandlers(
+  ui::ModalType GetDialogModalType() const override;
+  base::string16 GetDialogTitle() const override;
+  GURL GetDialogContentURL() const override;
+  void GetWebUIMessageHandlers(
       std::vector<WebUIMessageHandler*>* handlers) const override;
-  virtual void GetDialogSize(gfx::Size* size) const override;
-  virtual std::string GetDialogArgs() const override;
-  virtual void OnDialogClosed(const std::string& json_retval) override;
-  virtual void OnCloseContents(WebContents* source,
-                               bool* out_close_dialog) override;
-  virtual bool ShouldShowDialogTitle() const override;
-  virtual bool HandleContextMenu(
-      const content::ContextMenuParams& params) override;
+  void GetDialogSize(gfx::Size* size) const override;
+  std::string GetDialogArgs() const override;
+  void OnDialogClosed(const std::string& json_retval) override;
+  void OnCloseContents(WebContents* source, bool* out_close_dialog) override;
+  bool ShouldShowDialogTitle() const override;
+  bool HandleContextMenu(const content::ContextMenuParams& params) override;
 
   // Overridden from ResponseDelegate:
-  virtual void SetDialogInteractionResult(MakeChromeDefaultResult result);
+  void SetDialogInteractionResult(MakeChromeDefaultResult result) override;
 
   // Overridden from BrowserListObserver:
-  virtual void OnBrowserRemoved(Browser* browser) override;
+  void OnBrowserRemoved(Browser* browser) override;
 
  private:
   Profile* profile_;
diff --git a/chrome/common/local_discovery/local_domain_resolver_unittest.cc b/chrome/common/local_discovery/local_domain_resolver_unittest.cc
index 146cca2..2a61283 100644
--- a/chrome/common/local_discovery/local_domain_resolver_unittest.cc
+++ b/chrome/common/local_discovery/local_domain_resolver_unittest.cc
@@ -60,7 +60,7 @@ const uint8 kSamplePacketAAAA[] = {
 
 class LocalDomainResolverTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     mdns_client_.StartListening(&socket_factory_);
   }
 
diff --git a/chrome/common/safe_browsing/binary_feature_extractor_win_unittest.cc b/chrome/common/safe_browsing/binary_feature_extractor_win_unittest.cc
index 980ce85..f050c0d 100644
--- a/chrome/common/safe_browsing/binary_feature_extractor_win_unittest.cc
+++ b/chrome/common/safe_browsing/binary_feature_extractor_win_unittest.cc
@@ -21,7 +21,7 @@ namespace safe_browsing {
 
 class BinaryFeatureExtractorWinTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     base::FilePath source_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_path));
     testdata_path_ = source_path
diff --git a/chrome/common/safe_browsing/pe_image_reader_win.cc b/chrome/common/safe_browsing/pe_image_reader_win.cc
index 16185ba..74d1d9e 100644
--- a/chrome/common/safe_browsing/pe_image_reader_win.cc
+++ b/chrome/common/safe_browsing/pe_image_reader_win.cc
@@ -37,19 +37,19 @@ class PeImageReader::OptionalHeaderImpl : public PeImageReader::OptionalHeader {
       : optional_header_(reinterpret_cast<const OPTIONAL_HEADER_TYPE*>(
                              optional_header_start)) {}
 
-  virtual WordSize GetWordSize() override {
+  WordSize GetWordSize() override {
     return TraitsType::word_size;
   }
 
-  virtual size_t GetDataDirectoryOffset() override {
+  size_t GetDataDirectoryOffset() override {
     return offsetof(OPTIONAL_HEADER_TYPE, DataDirectory);
   }
 
-  virtual DWORD GetDataDirectorySize() override {
+  DWORD GetDataDirectorySize() override {
     return optional_header_->NumberOfRvaAndSizes;
   }
 
-  virtual const IMAGE_DATA_DIRECTORY* GetDataDirectoryEntries() override {
+  const IMAGE_DATA_DIRECTORY* GetDataDirectoryEntries() override {
     return &optional_header_->DataDirectory[0];
   }
 
diff --git a/chrome/common/safe_browsing/pe_image_reader_win_unittest.cc b/chrome/common/safe_browsing/pe_image_reader_win_unittest.cc
index d0a208b..939e7a6 100644
--- a/chrome/common/safe_browsing/pe_image_reader_win_unittest.cc
+++ b/chrome/common/safe_browsing/pe_image_reader_win_unittest.cc
@@ -35,7 +35,7 @@ class PeImageReaderTest : public testing::TestWithParam<const TestData*> {
  protected:
   PeImageReaderTest() : expected_data_(GetParam()) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_file_path_));
     data_file_path_ = data_file_path_.AppendASCII("safe_browsing");
     data_file_path_ = data_file_path_.AppendASCII(expected_data_->filename);
diff --git a/chrome/installer/setup/archive_patch_helper_unittest.cc b/chrome/installer/setup/archive_patch_helper_unittest.cc
index 099dd17..f42ed5b 100644
--- a/chrome/installer/setup/archive_patch_helper_unittest.cc
+++ b/chrome/installer/setup/archive_patch_helper_unittest.cc
@@ -24,12 +24,12 @@ class ArchivePatchHelperTest : public testing::Test {
     data_dir_.clear();
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Clean up test directory manually so we can fail if it leaks.
     ASSERT_TRUE(test_dir_.Delete());
   }
diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc
index 5c3f32c..d011f7e 100644
--- a/chrome/installer/setup/install_unittest.cc
+++ b/chrome/installer/setup/install_unittest.cc
@@ -33,7 +33,7 @@ namespace {
 
 class CreateVisualElementsManifestTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
 
@@ -46,7 +46,7 @@ class CreateVisualElementsManifestTest : public testing::Test {
         test_dir_.path().Append(installer::kVisualElementsManifest);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Clean up test directory manually so we can fail if it leaks.
     ASSERT_TRUE(test_dir_.Delete());
   }
@@ -66,7 +66,7 @@ class CreateVisualElementsManifestTest : public testing::Test {
 
 class InstallShortcutTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     EXPECT_EQ(S_OK, CoInitialize(NULL));
 
     dist_ = BrowserDistribution::GetDistribution();
@@ -139,7 +139,7 @@ class InstallShortcutTest : public testing::Test {
         fake_user_desktop_.path().Append(alternate_shortcut_name);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Try to unpin potentially pinned shortcuts (although pinning isn't tested,
     // the call itself might still have pinned the Start Menu shortcuts).
     base::win::TaskbarUnpinShortcutLink(
diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc
index c288549..d47f042 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -491,7 +491,7 @@ const wchar_t old_elevation_key[] =
 class OldIELowRightsTests : public InstallWorkerTest,
   public ::testing::WithParamInterface<std::tr1::tuple<bool, bool> > {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     InstallWorkerTest::SetUp();
 
     const ParamType& param = GetParam();
diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
index c07ec98..dd92f56 100644
--- a/chrome/installer/setup/setup_util_unittest.cc
+++ b/chrome/installer/setup/setup_util_unittest.cc
@@ -35,12 +35,12 @@ namespace {
 
 class SetupUtilTestWithDir : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Clean up test directory manually so we can fail if it leaks.
     ASSERT_TRUE(test_dir_.Delete());
   }
@@ -290,7 +290,7 @@ class FindArchiveToPatchTest : public SetupUtilTestWithDir {
     }
   };
 
-  virtual void SetUp() override {
+  void SetUp() override {
     SetupUtilTestWithDir::SetUp();
     product_version_ = Version("30.0.1559.0");
     max_version_ = Version("47.0.1559.0");
@@ -316,7 +316,7 @@ class FindArchiveToPatchTest : public SetupUtilTestWithDir {
     ASSERT_EQ(1, base::WriteFile(GetMaxVersionArchivePath(), "b", 1));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     original_state_.reset();
     SetupUtilTestWithDir::TearDown();
   }
@@ -411,7 +411,7 @@ namespace {
 
 class MigrateMultiToSingleTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     registry_override_manager_.OverrideRegistry(kRootKey);
   }
 
diff --git a/chrome/installer/util/advanced_firewall_manager_win_unittest.cc b/chrome/installer/util/advanced_firewall_manager_win_unittest.cc
index 5920ea2..08037f7 100644
--- a/chrome/installer/util/advanced_firewall_manager_win_unittest.cc
+++ b/chrome/installer/util/advanced_firewall_manager_win_unittest.cc
@@ -17,11 +17,11 @@ class AdvancedFirewallManagerTest : public ::testing::Test {
 
  protected:
   // Sets up the test fixture.
-  virtual void SetUp() override {
+  void SetUp() override {
     if (base::GetCurrentProcessIntegrityLevel() != base::HIGH_INTEGRITY) {
       LOG(WARNING) << "XP or not elevated. Skipping the test.";
       return;
-    };
+    }
     skip_test_ = false;
     base::FilePath exe_path;
     PathService::Get(base::FILE_EXE, &exe_path);
@@ -30,7 +30,7 @@ class AdvancedFirewallManagerTest : public ::testing::Test {
   }
 
   // Tears down the test fixture.
-  virtual void TearDown() override {
+  void TearDown() override {
     if (!skip_test_)
       manager_.DeleteAllRules();
   }
diff --git a/chrome/installer/util/callback_work_item.h b/chrome/installer/util/callback_work_item.h
index c81d02a..3cc22f6 100644
--- a/chrome/installer/util/callback_work_item.h
+++ b/chrome/installer/util/callback_work_item.h
@@ -33,10 +33,10 @@
 // }
 class CallbackWorkItem : public WorkItem {
  public:
-  virtual ~CallbackWorkItem();
+  ~CallbackWorkItem() override;
 
-  virtual bool Do() override;
-  virtual void Rollback() override;
+  bool Do() override;
+  void Rollback() override;
 
   bool IsRollback() const;
 
diff --git a/chrome/installer/util/chrome_binaries_operations.h b/chrome/installer/util/chrome_binaries_operations.h
index f0929f7..88b8199 100644
--- a/chrome/installer/util/chrome_binaries_operations.h
+++ b/chrome/installer/util/chrome_binaries_operations.h
@@ -17,42 +17,40 @@ class ChromeBinariesOperations : public ProductOperations {
  public:
   ChromeBinariesOperations() {}
 
-  virtual void ReadOptions(const MasterPreferences& prefs,
-                           std::set<base::string16>* options) const override;
+  void ReadOptions(const MasterPreferences& prefs,
+                   std::set<base::string16>* options) const override;
 
-  virtual void ReadOptions(const base::CommandLine& uninstall_command,
-                           std::set<base::string16>* options) const override;
+  void ReadOptions(const base::CommandLine& uninstall_command,
+                   std::set<base::string16>* options) const override;
 
-  virtual void AddKeyFiles(
-      const std::set<base::string16>& options,
-      std::vector<base::FilePath>* key_files) const override;
+  void AddKeyFiles(const std::set<base::string16>& options,
+                   std::vector<base::FilePath>* key_files) const override;
 
-  virtual void AddComDllList(
-      const std::set<base::string16>& options,
-      std::vector<base::FilePath>* com_dll_list) const override;
+  void AddComDllList(const std::set<base::string16>& options,
+                     std::vector<base::FilePath>* com_dll_list) const override;
 
-  virtual void AppendProductFlags(const std::set<base::string16>& options,
-                                  base::CommandLine* cmd_line) const override;
+  void AppendProductFlags(const std::set<base::string16>& options,
+                          base::CommandLine* cmd_line) const override;
 
-  virtual void AppendRenameFlags(const std::set<base::string16>& options,
-                                 base::CommandLine* cmd_line) const override;
+  void AppendRenameFlags(const std::set<base::string16>& options,
+                         base::CommandLine* cmd_line) const override;
 
-  virtual bool SetChannelFlags(const std::set<base::string16>& options,
-                               bool set,
-                               ChannelInfo* channel_info) const override;
+  bool SetChannelFlags(const std::set<base::string16>& options,
+                       bool set,
+                       ChannelInfo* channel_info) const override;
 
-  virtual bool ShouldCreateUninstallEntry(
+  bool ShouldCreateUninstallEntry(
       const std::set<base::string16>& options) const override;
 
-  virtual void AddDefaultShortcutProperties(
+  void AddDefaultShortcutProperties(
       BrowserDistribution* dist,
       const base::FilePath& target_exe,
       ShellUtil::ShortcutProperties* properties) const override;
 
-  virtual void LaunchUserExperiment(const base::FilePath& setup_path,
-                                    const std::set<base::string16>& options,
-                                    InstallStatus status,
-                                    bool system_level) const override;
+  void LaunchUserExperiment(const base::FilePath& setup_path,
+                            const std::set<base::string16>& options,
+                            InstallStatus status,
+                            bool system_level) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeBinariesOperations);
diff --git a/chrome/installer/util/chrome_browser_operations.h b/chrome/installer/util/chrome_browser_operations.h
index eb695c7..fe17c91 100644
--- a/chrome/installer/util/chrome_browser_operations.h
+++ b/chrome/installer/util/chrome_browser_operations.h
@@ -16,42 +16,40 @@ class ChromeBrowserOperations : public ProductOperations {
  public:
   ChromeBrowserOperations() {}
 
-  virtual void ReadOptions(const MasterPreferences& prefs,
-                           std::set<base::string16>* options) const override;
+  void ReadOptions(const MasterPreferences& prefs,
+                   std::set<base::string16>* options) const override;
 
-  virtual void ReadOptions(const base::CommandLine& uninstall_command,
-                           std::set<base::string16>* options) const override;
+  void ReadOptions(const base::CommandLine& uninstall_command,
+                   std::set<base::string16>* options) const override;
 
-  virtual void AddKeyFiles(
-      const std::set<base::string16>& options,
-      std::vector<base::FilePath>* key_files) const override;
+  void AddKeyFiles(const std::set<base::string16>& options,
+                   std::vector<base::FilePath>* key_files) const override;
 
-  virtual void AddComDllList(
-      const std::set<base::string16>& options,
-      std::vector<base::FilePath>* com_dll_list) const override;
+  void AddComDllList(const std::set<base::string16>& options,
+                     std::vector<base::FilePath>* com_dll_list) const override;
 
-  virtual void AppendProductFlags(const std::set<base::string16>& options,
-                                  base::CommandLine* cmd_line) const override;
+  void AppendProductFlags(const std::set<base::string16>& options,
+                          base::CommandLine* cmd_line) const override;
 
-  virtual void AppendRenameFlags(const std::set<base::string16>& options,
-                                 base::CommandLine* cmd_line) const override;
+  void AppendRenameFlags(const std::set<base::string16>& options,
+                         base::CommandLine* cmd_line) const override;
 
-  virtual bool SetChannelFlags(const std::set<base::string16>& options,
-                               bool set,
-                               ChannelInfo* channel_info) const override;
+  bool SetChannelFlags(const std::set<base::string16>& options,
+                       bool set,
+                       ChannelInfo* channel_info) const override;
 
-  virtual bool ShouldCreateUninstallEntry(
+  bool ShouldCreateUninstallEntry(
       const std::set<base::string16>& options) const override;
 
-  virtual void AddDefaultShortcutProperties(
+  void AddDefaultShortcutProperties(
       BrowserDistribution* dist,
       const base::FilePath& target_exe,
       ShellUtil::ShortcutProperties* properties) const override;
 
-  virtual void LaunchUserExperiment(const base::FilePath& setup_path,
-                                    const std::set<base::string16>& options,
-                                    InstallStatus status,
-                                    bool system_level) const override;
+  void LaunchUserExperiment(const base::FilePath& setup_path,
+                            const std::set<base::string16>& options,
+                            InstallStatus status,
+                            bool system_level) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserOperations);
diff --git a/chrome/installer/util/chrome_browser_sxs_operations.h b/chrome/installer/util/chrome_browser_sxs_operations.h
index f60a485..06893f1 100644
--- a/chrome/installer/util/chrome_browser_sxs_operations.h
+++ b/chrome/installer/util/chrome_browser_sxs_operations.h
@@ -16,11 +16,11 @@ class ChromeBrowserSxSOperations : public ChromeBrowserOperations {
  public:
   ChromeBrowserSxSOperations() {}
 
-  virtual void AppendProductFlags(const std::set<base::string16>& options,
-                                  base::CommandLine* cmd_line) const override;
+  void AppendProductFlags(const std::set<base::string16>& options,
+                          base::CommandLine* cmd_line) const override;
 
-  virtual void AppendRenameFlags(const std::set<base::string16>& options,
-                                 base::CommandLine* cmd_line) const override;
+  void AppendRenameFlags(const std::set<base::string16>& options,
+                         base::CommandLine* cmd_line) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserSxSOperations);
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index 9088fe2..ac3b879 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -13,46 +13,45 @@
 
 class ChromeFrameDistribution : public BrowserDistribution {
  public:
-  virtual base::string16 GetBrowserProgIdPrefix() override;
+  base::string16 GetBrowserProgIdPrefix() override;
 
-  virtual base::string16 GetBrowserProgIdDesc() override;
+  base::string16 GetBrowserProgIdDesc() override;
 
-  virtual base::string16 GetDisplayName() override;
+  base::string16 GetDisplayName() override;
 
-  virtual base::string16 GetShortcutName(ShortcutType shortcut_type) override;
+  base::string16 GetShortcutName(ShortcutType shortcut_type) override;
 
-  virtual int GetIconIndex(ShortcutType shortcut_type) override;
+  int GetIconIndex(ShortcutType shortcut_type) override;
 
-  virtual base::string16 GetBaseAppName() override;
+  base::string16 GetBaseAppName() override;
 
-  virtual base::string16 GetInstallSubDir() override;
+  base::string16 GetInstallSubDir() override;
 
-  virtual base::string16 GetPublisherName() override;
+  base::string16 GetPublisherName() override;
 
-  virtual base::string16 GetAppDescription() override;
+  base::string16 GetAppDescription() override;
 
-  virtual base::string16 GetLongAppDescription() override;
+  base::string16 GetLongAppDescription() override;
 
-  virtual std::string GetSafeBrowsingName() override;
+  std::string GetSafeBrowsingName() override;
 
-  virtual std::string GetNetworkStatsServer() const override;
+  std::string GetNetworkStatsServer() const override;
 
-  virtual base::string16 GetUninstallLinkName() override;
+  base::string16 GetUninstallLinkName() override;
 
-  virtual base::string16 GetUninstallRegPath() override;
+  base::string16 GetUninstallRegPath() override;
 
-  virtual base::string16 GetIconFilename() override;
+  base::string16 GetIconFilename() override;
 
-  virtual DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
+  DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
 
-  virtual bool CanCreateDesktopShortcuts() override;
+  bool CanCreateDesktopShortcuts() override;
 
-  virtual bool GetCommandExecuteImplClsid(
-      base::string16* handler_class_uuid) override;
+  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
 
-  virtual void UpdateInstallStatus(bool system_install,
-      installer::ArchiveType archive_type,
-      installer::InstallStatus install_status) override;
+  void UpdateInstallStatus(bool system_install,
+                           installer::ArchiveType archive_type,
+                           installer::InstallStatus install_status) override;
 
  protected:
   friend class BrowserDistribution;
diff --git a/chrome/installer/util/chrome_frame_operations.h b/chrome/installer/util/chrome_frame_operations.h
index 60d0dec..407890b 100644
--- a/chrome/installer/util/chrome_frame_operations.h
+++ b/chrome/installer/util/chrome_frame_operations.h
@@ -16,42 +16,40 @@ class ChromeFrameOperations : public ProductOperations {
  public:
   ChromeFrameOperations() {}
 
-  virtual void ReadOptions(const MasterPreferences& prefs,
-                           std::set<base::string16>* options) const override;
+  void ReadOptions(const MasterPreferences& prefs,
+                   std::set<base::string16>* options) const override;
 
-  virtual void ReadOptions(const base::CommandLine& uninstall_command,
-                           std::set<base::string16>* options) const override;
+  void ReadOptions(const base::CommandLine& uninstall_command,
+                   std::set<base::string16>* options) const override;
 
-  virtual void AddKeyFiles(
-      const std::set<base::string16>& options,
-      std::vector<base::FilePath>* key_files) const override;
+  void AddKeyFiles(const std::set<base::string16>& options,
+                   std::vector<base::FilePath>* key_files) const override;
 
-  virtual void AddComDllList(
-      const std::set<base::string16>& options,
-      std::vector<base::FilePath>* com_dll_list) const override;
+  void AddComDllList(const std::set<base::string16>& options,
+                     std::vector<base::FilePath>* com_dll_list) const override;
 
-  virtual void AppendProductFlags(const std::set<base::string16>& options,
-                                  base::CommandLine* cmd_line) const override;
+  void AppendProductFlags(const std::set<base::string16>& options,
+                          base::CommandLine* cmd_line) const override;
 
-  virtual void AppendRenameFlags(const std::set<base::string16>& options,
-                                 base::CommandLine* cmd_line) const override;
+  void AppendRenameFlags(const std::set<base::string16>& options,
+                         base::CommandLine* cmd_line) const override;
 
-  virtual bool SetChannelFlags(const std::set<base::string16>& options,
-                               bool set,
-                               ChannelInfo* channel_info) const override;
+  bool SetChannelFlags(const std::set<base::string16>& options,
+                       bool set,
+                       ChannelInfo* channel_info) const override;
 
-  virtual bool ShouldCreateUninstallEntry(
+  bool ShouldCreateUninstallEntry(
       const std::set<base::string16>& options) const override;
 
-  virtual void AddDefaultShortcutProperties(
+  void AddDefaultShortcutProperties(
       BrowserDistribution* dist,
       const base::FilePath& target_exe,
       ShellUtil::ShortcutProperties* properties) const override;
 
-  virtual void LaunchUserExperiment(const base::FilePath& setup_path,
-                                    const std::set<base::string16>& options,
-                                    InstallStatus status,
-                                    bool system_level) const override;
+  void LaunchUserExperiment(const base::FilePath& setup_path,
+                            const std::set<base::string16>& options,
+                            InstallStatus status,
+                            bool system_level) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeFrameOperations);
diff --git a/chrome/installer/util/chromium_binaries_distribution.h b/chrome/installer/util/chromium_binaries_distribution.h
index 2d440be..986b8f3 100644
--- a/chrome/installer/util/chromium_binaries_distribution.h
+++ b/chrome/installer/util/chromium_binaries_distribution.h
@@ -14,40 +14,39 @@
 
 class ChromiumBinariesDistribution : public BrowserDistribution {
  public:
-  virtual base::string16 GetBrowserProgIdPrefix() override;
+  base::string16 GetBrowserProgIdPrefix() override;
 
-  virtual base::string16 GetBrowserProgIdDesc() override;
+  base::string16 GetBrowserProgIdDesc() override;
 
-  virtual base::string16 GetDisplayName() override;
+  base::string16 GetDisplayName() override;
 
-  virtual base::string16 GetShortcutName(ShortcutType shortcut_type) override;
+  base::string16 GetShortcutName(ShortcutType shortcut_type) override;
 
-  virtual int GetIconIndex(ShortcutType shortcut_type) override;
+  int GetIconIndex(ShortcutType shortcut_type) override;
 
-  virtual base::string16 GetBaseAppName() override;
+  base::string16 GetBaseAppName() override;
 
-  virtual base::string16 GetBaseAppId() override;
+  base::string16 GetBaseAppId() override;
 
-  virtual base::string16 GetInstallSubDir() override;
+  base::string16 GetInstallSubDir() override;
 
-  virtual base::string16 GetPublisherName() override;
+  base::string16 GetPublisherName() override;
 
-  virtual base::string16 GetAppDescription() override;
+  base::string16 GetAppDescription() override;
 
-  virtual base::string16 GetLongAppDescription() override;
+  base::string16 GetLongAppDescription() override;
 
-  virtual std::string GetSafeBrowsingName() override;
+  std::string GetSafeBrowsingName() override;
 
-  virtual base::string16 GetUninstallLinkName() override;
+  base::string16 GetUninstallLinkName() override;
 
-  virtual base::string16 GetUninstallRegPath() override;
+  base::string16 GetUninstallRegPath() override;
 
-  virtual DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
+  DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
 
-  virtual bool GetChromeChannel(base::string16* channel) override;
+  bool GetChromeChannel(base::string16* channel) override;
 
-  virtual bool GetCommandExecuteImplClsid(
-      base::string16* handler_class_uuid) override;
+  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
 
  protected:
   friend class BrowserDistribution;
diff --git a/chrome/installer/util/delete_reg_key_work_item.h b/chrome/installer/util/delete_reg_key_work_item.h
index 0fc11f6..54cddba 100644
--- a/chrome/installer/util/delete_reg_key_work_item.h
+++ b/chrome/installer/util/delete_reg_key_work_item.h
@@ -21,11 +21,11 @@ class RegistryKeyBackup;
 // the key and its subkeys take on their default security descriptors.
 class DeleteRegKeyWorkItem : public WorkItem {
  public:
-  virtual ~DeleteRegKeyWorkItem();
+  ~DeleteRegKeyWorkItem() override;
 
-  virtual bool Do() override;
+  bool Do() override;
 
-  virtual void Rollback() override;
+  void Rollback() override;
 
  private:
   friend class WorkItem;
diff --git a/chrome/installer/util/firewall_manager_win.cc b/chrome/installer/util/firewall_manager_win.cc
index 0171a6f..202d062 100644
--- a/chrome/installer/util/firewall_manager_win.cc
+++ b/chrome/installer/util/firewall_manager_win.cc
@@ -23,23 +23,23 @@ const uint16 kDefaultMdnsPort = 5353;
 class FirewallManagerAdvancedImpl : public FirewallManager {
  public:
   FirewallManagerAdvancedImpl() {}
-  virtual ~FirewallManagerAdvancedImpl() {}
+  ~FirewallManagerAdvancedImpl() override {}
 
   bool Init(const base::string16& app_name, const base::FilePath& app_path) {
     return manager_.Init(app_name, app_path);
   }
 
   // FirewallManager methods.
-  virtual bool CanUseLocalPorts() override {
+  bool CanUseLocalPorts() override {
     return !manager_.IsFirewallEnabled() || manager_.HasAnyRule();
   };
 
-  virtual bool AddFirewallRules() override {
+  bool AddFirewallRules() override {
     return manager_.AddUDPRule(GetMdnsRuleName(), GetMdnsRuleDescription(),
                                kDefaultMdnsPort);
   }
 
-  virtual void RemoveFirewallRules() override {
+  void RemoveFirewallRules() override {
     manager_.DeleteAllRules();
   }
 
@@ -67,25 +67,25 @@ class FirewallManagerAdvancedImpl : public FirewallManager {
 class FirewallManagerLegacyImpl : public FirewallManager {
  public:
   FirewallManagerLegacyImpl() {}
-  virtual ~FirewallManagerLegacyImpl() {}
+  ~FirewallManagerLegacyImpl() override {}
 
   bool Init(const base::string16& app_name, const base::FilePath& app_path) {
     return manager_.Init(app_name, app_path);
   }
 
   // FirewallManager methods.
-  virtual bool CanUseLocalPorts() override {
+  bool CanUseLocalPorts() override {
     return !manager_.IsFirewallEnabled() ||
         manager_.GetAllowIncomingConnection(NULL);
   };
 
-  virtual bool AddFirewallRules() override {
+  bool AddFirewallRules() override {
     // Change nothing if rule is set.
     return manager_.GetAllowIncomingConnection(NULL) ||
         manager_.SetAllowIncomingConnection(true);
   }
 
-  virtual void RemoveFirewallRules() override {
+  void RemoveFirewallRules() override {
     manager_.DeleteRule();
   }
 
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index d6611ba..18076da 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -29,57 +29,56 @@ class GoogleChromeDistribution : public BrowserDistribution {
   // distribution_data contains Google Update related data that will be
   //   concatenated to the survey url if the file in local_data_path indicates
   //   the user has opted in to providing anonymous usage data.
-  virtual void DoPostUninstallOperations(
+  void DoPostUninstallOperations(
       const Version& version,
       const base::FilePath& local_data_path,
       const base::string16& distribution_data) override;
 
-  virtual base::string16 GetActiveSetupGuid() override;
+  base::string16 GetActiveSetupGuid() override;
 
-  virtual base::string16 GetShortcutName(ShortcutType shortcut_type) override;
+  base::string16 GetShortcutName(ShortcutType shortcut_type) override;
 
-  virtual base::string16 GetIconFilename() override;
+  base::string16 GetIconFilename() override;
 
-  virtual int GetIconIndex(ShortcutType shortcut_type) override;
+  int GetIconIndex(ShortcutType shortcut_type) override;
 
-  virtual base::string16 GetBaseAppName() override;
+  base::string16 GetBaseAppName() override;
 
-  virtual base::string16 GetBaseAppId() override;
+  base::string16 GetBaseAppId() override;
 
-  virtual base::string16 GetBrowserProgIdPrefix() override;
+  base::string16 GetBrowserProgIdPrefix() override;
 
-  virtual base::string16 GetBrowserProgIdDesc() override;
+  base::string16 GetBrowserProgIdDesc() override;
 
-  virtual base::string16 GetInstallSubDir() override;
+  base::string16 GetInstallSubDir() override;
 
-  virtual base::string16 GetPublisherName() override;
+  base::string16 GetPublisherName() override;
 
-  virtual base::string16 GetAppDescription() override;
+  base::string16 GetAppDescription() override;
 
-  virtual std::string GetSafeBrowsingName() override;
+  std::string GetSafeBrowsingName() override;
 
-  virtual std::string GetNetworkStatsServer() const override;
+  std::string GetNetworkStatsServer() const override;
 
   // This method reads data from the Google Update ClientState key for
   // potential use in the uninstall survey. It must be called before the
   // key returned by GetVersionKey() is deleted.
-  virtual base::string16 GetDistributionData(HKEY root_key) override;
+  base::string16 GetDistributionData(HKEY root_key) override;
 
-  virtual base::string16 GetUninstallLinkName() override;
+  base::string16 GetUninstallLinkName() override;
 
-  virtual base::string16 GetUninstallRegPath() override;
+  base::string16 GetUninstallRegPath() override;
 
-  virtual bool GetCommandExecuteImplClsid(
-      base::string16* handler_class_uuid) override;
+  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
 
-  virtual void UpdateInstallStatus(
+  void UpdateInstallStatus(
       bool system_install,
       installer::ArchiveType archive_type,
       installer::InstallStatus install_status) override;
 
-  virtual bool ShouldSetExperimentLabels() override;
+  bool ShouldSetExperimentLabels() override;
 
-  virtual bool HasUserExperiments() override;
+  bool HasUserExperiments() override;
 
  protected:
   // Disallow construction from others.
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h
index c1be524..9ae8c3a 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.h
+++ b/chrome/installer/util/google_chrome_sxs_distribution.h
@@ -19,22 +19,21 @@
 // system level install and setting as default browser.
 class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
  public:
-  virtual base::string16 GetBaseAppName() override;
-  virtual base::string16 GetShortcutName(ShortcutType shortcut_type) override;
-  virtual int GetIconIndex(ShortcutType shortcut_type) override;
-  virtual base::string16 GetStartMenuShortcutSubfolder(
+  base::string16 GetBaseAppName() override;
+  base::string16 GetShortcutName(ShortcutType shortcut_type) override;
+  int GetIconIndex(ShortcutType shortcut_type) override;
+  base::string16 GetStartMenuShortcutSubfolder(
       Subfolder subfolder_type) override;
-  virtual base::string16 GetBaseAppId() override;
-  virtual base::string16 GetBrowserProgIdPrefix() override;
-  virtual base::string16 GetBrowserProgIdDesc() override;
-  virtual base::string16 GetInstallSubDir() override;
-  virtual base::string16 GetUninstallRegPath() override;
-  virtual DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
-  virtual bool GetChromeChannel(base::string16* channel) override;
-  virtual bool GetCommandExecuteImplClsid(
-      base::string16* handler_class_uuid) override;
-  virtual bool ShouldSetExperimentLabels() override;
-  virtual bool HasUserExperiments() override;
+  base::string16 GetBaseAppId() override;
+  base::string16 GetBrowserProgIdPrefix() override;
+  base::string16 GetBrowserProgIdDesc() override;
+  base::string16 GetInstallSubDir() override;
+  base::string16 GetUninstallRegPath() override;
+  DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
+  bool GetChromeChannel(base::string16* channel) override;
+  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
+  bool ShouldSetExperimentLabels() override;
+  bool HasUserExperiments() override;
   // returns the channel name for GoogleChromeSxSDistribution
   static base::string16 ChannelName();
  private:
diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc
index 024cf5b..46b933b 100644
--- a/chrome/installer/util/google_update_settings_unittest.cc
+++ b/chrome/installer/util/google_update_settings_unittest.cc
@@ -988,7 +988,7 @@ class GetUninstallCommandLine : public GoogleUpdateSettingsTest,
  protected:
   static const wchar_t kDummyCommand[];
 
-  virtual void SetUp() override {
+  void SetUp() override {
     GoogleUpdateSettingsTest::SetUp();
     system_install_ = GetParam();
     root_key_ = system_install_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ -1047,7 +1047,7 @@ class GetGoogleUpdateVersion : public GoogleUpdateSettingsTest,
  protected:
   static const wchar_t kDummyVersion[];
 
-  virtual void SetUp() override {
+  void SetUp() override {
     GoogleUpdateSettingsTest::SetUp();
     system_install_ = GetParam();
     root_key_ = system_install_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ -1165,7 +1165,7 @@ class CollectStatsConsent : public ::testing::TestWithParam<StatsState> {
   static void SetUpTestCase();
   static void TearDownTestCase();
  protected:
-  virtual void SetUp() override;
+  void SetUp() override;
   static void MakeChromeMultiInstall(HKEY root_key);
   static void ApplySetting(StatsState::StateSetting setting,
                            HKEY root_key,
diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h
index edc6e36..5a26967 100644
--- a/chrome/installer/util/install_util.h
+++ b/chrome/installer/util/install_util.h
@@ -165,7 +165,7 @@ class InstallUtil {
    public:
     explicit ValueEquals(const base::string16& value_to_match)
         : value_to_match_(value_to_match) { }
-    virtual bool Evaluate(const base::string16& value) const override;
+    bool Evaluate(const base::string16& value) const override;
    protected:
     base::string16 value_to_match_;
    private:
@@ -190,8 +190,8 @@ class InstallUtil {
   class ProgramCompare : public RegistryValuePredicate {
    public:
     explicit ProgramCompare(const base::FilePath& path_to_match);
-    virtual ~ProgramCompare();
-    virtual bool Evaluate(const base::string16& value) const override;
+    ~ProgramCompare() override;
+    bool Evaluate(const base::string16& value) const override;
     bool EvaluatePath(const base::FilePath& path) const;
 
    protected:
diff --git a/chrome/installer/util/installation_validator.h b/chrome/installer/util/installation_validator.h
index 28e7a83..b66a253 100644
--- a/chrome/installer/util/installation_validator.h
+++ b/chrome/installer/util/installation_validator.h
@@ -99,40 +99,40 @@ class InstallationValidator {
   // Validation rules for the Chrome browser.
   class ChromeRules : public ProductRules {
    public:
-    virtual BrowserDistribution::Type distribution_type() const override;
-    virtual void AddUninstallSwitchExpectations(
+    BrowserDistribution::Type distribution_type() const override;
+    void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
         SwitchExpectations* expectations) const override;
-    virtual void AddRenameSwitchExpectations(
+    void AddRenameSwitchExpectations(
         const ProductContext& ctx,
         SwitchExpectations* expectations) const override;
-    virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
+    bool UsageStatsAllowed(const ProductContext& ctx) const override;
   };
 
   // Validation rules for Chrome Frame.
   class ChromeFrameRules : public ProductRules {
    public:
-    virtual BrowserDistribution::Type distribution_type() const override;
-    virtual void AddUninstallSwitchExpectations(
+    BrowserDistribution::Type distribution_type() const override;
+    void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
         SwitchExpectations* expectations) const override;
-    virtual void AddRenameSwitchExpectations(
+    void AddRenameSwitchExpectations(
         const ProductContext& ctx,
         SwitchExpectations* expectations) const override;
-    virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
+    bool UsageStatsAllowed(const ProductContext& ctx) const override;
   };
 
   // Validation rules for the multi-install Chrome binaries.
   class ChromeBinariesRules : public ProductRules {
    public:
-    virtual BrowserDistribution::Type distribution_type() const override;
-    virtual void AddUninstallSwitchExpectations(
+    BrowserDistribution::Type distribution_type() const override;
+    void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
         SwitchExpectations* expectations) const override;
-    virtual void AddRenameSwitchExpectations(
+    void AddRenameSwitchExpectations(
         const ProductContext& ctx,
         SwitchExpectations* expectations) const override;
-    virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
+    bool UsageStatsAllowed(const ProductContext& ctx) const override;
   };
 
   struct ProductContext {
diff --git a/chrome/installer/util/legacy_firewall_manager_win_unittest.cc b/chrome/installer/util/legacy_firewall_manager_win_unittest.cc
index 5fd4638..61e5c24 100644
--- a/chrome/installer/util/legacy_firewall_manager_win_unittest.cc
+++ b/chrome/installer/util/legacy_firewall_manager_win_unittest.cc
@@ -16,7 +16,7 @@ class LegacyFirewallManagerTest : public ::testing::Test {
 
  protected:
   // Sets up the test fixture.
-  virtual void SetUp() override {
+  void SetUp() override {
     if (base::GetCurrentProcessIntegrityLevel() != base::HIGH_INTEGRITY) {
       LOG(WARNING) << "Not elevated. Skipping the test.";
       return;
@@ -29,7 +29,7 @@ class LegacyFirewallManagerTest : public ::testing::Test {
   }
 
   // Tears down the test fixture.
-  virtual void TearDown() override {
+  void TearDown() override {
     if (!skip_test_)
       manager_.DeleteRule();
   }
diff --git a/chrome/installer/util/non_updating_app_registration_data.h b/chrome/installer/util/non_updating_app_registration_data.h
index f5d7558..a25f97a 100644
--- a/chrome/installer/util/non_updating_app_registration_data.h
+++ b/chrome/installer/util/non_updating_app_registration_data.h
@@ -14,11 +14,11 @@
 class NonUpdatingAppRegistrationData : public AppRegistrationData {
  public:
   explicit NonUpdatingAppRegistrationData(const base::string16& key_path);
-  virtual ~NonUpdatingAppRegistrationData();
-  virtual base::string16 GetAppGuid() const override;
-  virtual base::string16 GetStateKey() const override;
-  virtual base::string16 GetStateMediumKey() const override;
-  virtual base::string16 GetVersionKey() const override;
+  ~NonUpdatingAppRegistrationData() override;
+  base::string16 GetAppGuid() const override;
+  base::string16 GetStateKey() const override;
+  base::string16 GetStateMediumKey() const override;
+  base::string16 GetVersionKey() const override;
 
  private:
   const base::string16 key_path_;
diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc
index 1897e8b3..0294c43 100644
--- a/chrome/installer/util/shell_util_unittest.cc
+++ b/chrome/installer/util/shell_util_unittest.cc
@@ -52,7 +52,7 @@ class ShellUtilShortcutTest : public testing::Test {
  protected:
   ShellUtilShortcutTest() : test_properties_(ShellUtil::CURRENT_USER) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     dist_ = BrowserDistribution::GetDistribution();
     ASSERT_TRUE(dist_ != NULL);
     product_.reset(new installer::Product(dist_));
@@ -811,7 +811,7 @@ class ShellUtilRegistryTest : public testing::Test {
   ShellUtilRegistryTest() {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     registry_overrides_.OverrideRegistry(HKEY_CURRENT_USER);
 
     // .test2 files already have a default application.
diff --git a/chrome/installer/util/updating_app_registration_data.h b/chrome/installer/util/updating_app_registration_data.h
index e8afdd3..d9114b9 100644
--- a/chrome/installer/util/updating_app_registration_data.h
+++ b/chrome/installer/util/updating_app_registration_data.h
@@ -14,11 +14,11 @@
 class UpdatingAppRegistrationData : public AppRegistrationData {
  public:
   explicit UpdatingAppRegistrationData(const base::string16& app_guid);
-  virtual ~UpdatingAppRegistrationData();
-  virtual base::string16 GetAppGuid() const override;
-  virtual base::string16 GetStateKey() const override;
-  virtual base::string16 GetStateMediumKey() const override;
-  virtual base::string16 GetVersionKey() const override;
+  ~UpdatingAppRegistrationData() override;
+  base::string16 GetAppGuid() const override;
+  base::string16 GetStateKey() const override;
+  base::string16 GetStateMediumKey() const override;
+  base::string16 GetVersionKey() const override;
 
  private:
   const base::string16 app_guid_;
diff --git a/chrome/renderer/prerender/prerender_dispatcher.h b/chrome/renderer/prerender/prerender_dispatcher.h
index aa4b7cf..52038f1 100644
--- a/chrome/renderer/prerender/prerender_dispatcher.h
+++ b/chrome/renderer/prerender/prerender_dispatcher.h
@@ -27,7 +27,7 @@ class PrerenderDispatcher : public content::RenderProcessObserver,
                             public blink::WebPrerenderingSupport {
  public:
   PrerenderDispatcher();
-  virtual ~PrerenderDispatcher();
+  ~PrerenderDispatcher() override;
 
   bool IsPrerenderURL(const GURL& url) const;
 
@@ -46,9 +46,9 @@ class PrerenderDispatcher : public content::RenderProcessObserver,
   bool OnControlMessageReceived(const IPC::Message& message) override;
 
   // From WebPrerenderingSupport:
-  virtual void add(const blink::WebPrerender& prerender) override;
-  virtual void cancel(const blink::WebPrerender& prerender) override;
-  virtual void abandon(const blink::WebPrerender& prerender) override;
+  void add(const blink::WebPrerender& prerender) override;
+  void cancel(const blink::WebPrerender& prerender) override;
+  void abandon(const blink::WebPrerender& prerender) override;
 
   // From WebKit, prerender elements launched by renderers in our process.
   std::map<int, blink::WebPrerender> prerenders_;
diff --git a/chrome/renderer/prerender/prerenderer_client.h b/chrome/renderer/prerender/prerenderer_client.h
index 92f24d6..134f236 100644
--- a/chrome/renderer/prerender/prerenderer_client.h
+++ b/chrome/renderer/prerender/prerenderer_client.h
@@ -20,7 +20,7 @@ class PrerendererClient : public content::RenderViewObserver,
   ~PrerendererClient() override;
 
   // Implements blink::WebPrerendererClient
-  virtual void willAddPrerender(blink::WebPrerender* prerender) override;
+  void willAddPrerender(blink::WebPrerender* prerender) override;
 };
 
 }  // namespace prerender
diff --git a/chrome/renderer/spellchecker/spellcheck_provider.h b/chrome/renderer/spellchecker/spellcheck_provider.h
index 4efe504..793b391 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider.h
+++ b/chrome/renderer/spellchecker/spellcheck_provider.h
@@ -68,27 +68,27 @@ class SpellCheckProvider
                                blink::WebTextCheckingCompletion* completion);
 
   // blink::WebSpellCheckClient implementation.
-  virtual void spellCheck(
+  void spellCheck(
       const blink::WebString& text,
       int& offset,
       int& length,
       blink::WebVector<blink::WebString>* optional_suggestions) override;
-  virtual void checkTextOfParagraph(
+  void checkTextOfParagraph(
       const blink::WebString& text,
       blink::WebTextCheckingTypeMask mask,
       blink::WebVector<blink::WebTextCheckingResult>* results) override;
 
-  virtual void requestCheckingOfText(
+  void requestCheckingOfText(
       const blink::WebString& text,
       const blink::WebVector<uint32>& markers,
       const blink::WebVector<unsigned>& marker_offsets,
       blink::WebTextCheckingCompletion* completion) override;
 
-  virtual blink::WebString autoCorrectWord(
+  blink::WebString autoCorrectWord(
       const blink::WebString& misspelled_word) override;
-  virtual void showSpellingUI(bool show) override;
-  virtual bool isShowingSpellingUI() override;
-  virtual void updateSpellingUIWithMisspelledWord(
+  void showSpellingUI(bool show) override;
+  bool isShowingSpellingUI() override;
+  void updateSpellingUIWithMisspelledWord(
       const blink::WebString& word) override;
 
 #if !defined(OS_MACOSX)
diff --git a/chrome/renderer/spellchecker/spellcheck_provider_test.h b/chrome/renderer/spellchecker/spellcheck_provider_test.h
index 5c1c559..56ab49d 100644
--- a/chrome/renderer/spellchecker/spellcheck_provider_test.h
+++ b/chrome/renderer/spellchecker/spellcheck_provider_test.h
@@ -25,10 +25,9 @@ class FakeTextCheckingCompletion : public blink::WebTextCheckingCompletion {
   FakeTextCheckingCompletion();
   ~FakeTextCheckingCompletion();
 
-  virtual void didFinishCheckingText(
+  void didFinishCheckingText(
       const blink::WebVector<blink::WebTextCheckingResult>& results) override;
-  virtual void didCancelCheckingText() override;
-
+  void didCancelCheckingText() override;
 
   size_t completion_count_;
   size_t cancellation_count_;
diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc
index f82ac80..79f150e 100644
--- a/chrome/renderer/spellchecker/spellcheck_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc
@@ -110,14 +110,13 @@ class MockTextCheckingCompletion : public blink::WebTextCheckingCompletion {
       : completion_count_(0) {
   }
 
-  virtual void didFinishCheckingText(
-      const blink::WebVector<blink::WebTextCheckingResult>& results)
-          override {
+  void didFinishCheckingText(
+      const blink::WebVector<blink::WebTextCheckingResult>& results) override {
     completion_count_++;
     last_results_ = results;
   }
 
-  virtual void didCancelCheckingText() override {
+  void didCancelCheckingText() override {
     completion_count_++;
   }
 
diff --git a/chrome/renderer/translate/translate_helper_browsertest.cc b/chrome/renderer/translate/translate_helper_browsertest.cc
index 3c0db27..4c22f80 100644
--- a/chrome/renderer/translate/translate_helper_browsertest.cc
+++ b/chrome/renderer/translate/translate_helper_browsertest.cc
@@ -28,7 +28,7 @@ class TestTranslateHelper : public translate::TranslateHelper {
             extensions::EXTENSION_GROUP_INTERNAL_TRANSLATE_SCRIPTS,
             extensions::kExtensionScheme) {}
 
-  virtual base::TimeDelta AdjustDelay(int delayInMs) override {
+  base::TimeDelta AdjustDelay(int delayInMs) override {
     // Just returns base::TimeDelta() which has initial value 0.
     // Tasks doesn't need to be delayed in tests.
     return base::TimeDelta();
diff --git a/chrome/renderer/tts_dispatcher.h b/chrome/renderer/tts_dispatcher.h
index cc40403..8dea4c06 100644
--- a/chrome/renderer/tts_dispatcher.h
+++ b/chrome/renderer/tts_dispatcher.h
@@ -34,18 +34,17 @@ class TtsDispatcher
   explicit TtsDispatcher(blink::WebSpeechSynthesizerClient* client);
 
  private:
-  virtual ~TtsDispatcher();
+  ~TtsDispatcher() override;
 
   // RenderProcessObserver override.
   bool OnControlMessageReceived(const IPC::Message& message) override;
 
   // blink::WebSpeechSynthesizer implementation.
-  virtual void updateVoiceList() override;
-  virtual void speak(const blink::WebSpeechSynthesisUtterance& utterance)
-      override;
-  virtual void pause() override;
-  virtual void resume() override;
-  virtual void cancel() override;
+  void updateVoiceList() override;
+  void speak(const blink::WebSpeechSynthesisUtterance& utterance) override;
+  void pause() override;
+  void resume() override;
+  void cancel() override;
 
   blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);
 
diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc
index 30fb0b4..6aed0ba 100644
--- a/chrome/service/cloud_print/print_system_win.cc
+++ b/chrome/service/cloud_print/print_system_win.cc
@@ -133,28 +133,28 @@ class PrintServerWatcherWin
   PrintServerWatcherWin() : delegate_(NULL) {}
 
   // PrintSystem::PrintServerWatcher implementation.
-  virtual bool StartWatching(
-      PrintSystem::PrintServerWatcher::Delegate* delegate) override{
+  bool StartWatching(
+      PrintSystem::PrintServerWatcher::Delegate* delegate) override {
     delegate_ = delegate;
     return watcher_.Start(std::string(), this);
   }
 
-  virtual bool StopWatching() override{
+  bool StopWatching() override {
     bool ret = watcher_.Stop();
     delegate_ = NULL;
     return ret;
   }
 
   // PrintSystemWatcherWin::Delegate implementation.
-  virtual void OnPrinterAdded() override {
+  void OnPrinterAdded() override {
     delegate_->OnPrinterAdded();
   }
-  virtual void OnPrinterDeleted() override {}
-  virtual void OnPrinterChanged() override {}
-  virtual void OnJobChanged() override {}
+  void OnPrinterDeleted() override {}
+  void OnPrinterChanged() override {}
+  void OnJobChanged() override {}
 
  protected:
-  virtual ~PrintServerWatcherWin() {}
+  ~PrintServerWatcherWin() override {}
 
  private:
   PrintSystem::PrintServerWatcher::Delegate* delegate_;
@@ -173,39 +173,38 @@ class PrinterWatcherWin
   }
 
   // PrintSystem::PrinterWatcher implementation.
-  virtual bool StartWatching(
-      PrintSystem::PrinterWatcher::Delegate* delegate) override {
+  bool StartWatching(PrintSystem::PrinterWatcher::Delegate* delegate) override {
     delegate_ = delegate;
     return watcher_.Start(printer_name_, this);
   }
 
-  virtual bool StopWatching() override {
+  bool StopWatching() override {
     bool ret = watcher_.Stop();
     delegate_ = NULL;
     return ret;
   }
 
-  virtual bool GetCurrentPrinterInfo(
+  bool GetCurrentPrinterInfo(
       printing::PrinterBasicInfo* printer_info) override {
     return watcher_.GetCurrentPrinterInfo(printer_info);
   }
 
   // PrintSystemWatcherWin::Delegate implementation.
-  virtual void OnPrinterAdded() override {
+  void OnPrinterAdded() override {
     NOTREACHED();
   }
-  virtual void OnPrinterDeleted() override {
+  void OnPrinterDeleted() override {
     delegate_->OnPrinterDeleted();
   }
-  virtual void OnPrinterChanged() override {
+  void OnPrinterChanged() override {
     delegate_->OnPrinterChanged();
   }
-  virtual void OnJobChanged() override {
+  void OnJobChanged() override {
     delegate_->OnJobChanged();
   }
 
  protected:
-  virtual ~PrinterWatcherWin() {}
+  ~PrinterWatcherWin() override {}
 
  private:
   std::string printer_name_;
@@ -220,14 +219,14 @@ class JobSpoolerWin : public PrintSystem::JobSpooler {
   JobSpoolerWin() : core_(new Core) {}
 
   // PrintSystem::JobSpooler implementation.
-  virtual bool Spool(const std::string& print_ticket,
-                     const std::string& print_ticket_mime_type,
-                     const base::FilePath& print_data_file_path,
-                     const std::string& print_data_mime_type,
-                     const std::string& printer_name,
-                     const std::string& job_title,
-                     const std::vector<std::string>& tags,
-                     JobSpooler::Delegate* delegate) override {
+  bool Spool(const std::string& print_ticket,
+             const std::string& print_ticket_mime_type,
+             const base::FilePath& print_data_file_path,
+             const std::string& print_data_mime_type,
+             const std::string& printer_name,
+             const std::string& job_title,
+             const std::vector<std::string>& tags,
+             JobSpooler::Delegate* delegate) override {
     // TODO(gene): add tags handling.
     scoped_refptr<printing::PrintBackend> print_backend(
         printing::PrintBackend::CreateInstance(NULL));
@@ -239,7 +238,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler {
   }
 
  protected:
-  virtual ~JobSpoolerWin() {}
+  ~JobSpoolerWin() override {}
 
  private:
   // We use a Core class because we want a separate RefCountedThreadSafe
@@ -249,7 +248,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler {
    public:
     Core() : job_id_(-1), delegate_(NULL), saved_dc_(0) {}
 
-    ~Core() {}
+    ~Core() override {}
 
     bool Spool(const std::string& print_ticket,
                const std::string& print_ticket_mime_type,
@@ -331,7 +330,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler {
     }
 
     // ServiceUtilityProcessHost::Client implementation.
-    virtual void OnRenderPDFPagesToMetafilePageDone(
+    void OnRenderPDFPagesToMetafilePageDone(
         float scale_factor,
         const printing::MetafilePlayer& emf) override {
       PreparePageDCForPrinting(printer_dc_.Get(), scale_factor);
@@ -341,14 +340,14 @@ class JobSpoolerWin : public PrintSystem::JobSpooler {
     }
 
     // ServiceUtilityProcessHost::Client implementation.
-    virtual void OnRenderPDFPagesToMetafileDone(bool success) override {
+    void OnRenderPDFPagesToMetafileDone(bool success) override {
       PrintJobDone(success);
     }
 
-    virtual void OnChildDied() override { PrintJobDone(false); }
+    void OnChildDied() override { PrintJobDone(false); }
 
     // base::win::ObjectWatcher::Delegate implementation.
-    virtual void OnObjectSignaled(HANDLE object) override {
+    void OnObjectSignaled(HANDLE object) override {
       DCHECK(xps_print_job_.get());
       DCHECK(object == job_progress_event_.Get());
       ResetEvent(job_progress_event_.Get());
@@ -523,12 +522,12 @@ class PrinterCapsHandler : public ServiceUtilityProcessHost::Client {
   }
 
   // ServiceUtilityProcessHost::Client implementation.
-  virtual void OnChildDied() override {
+  void OnChildDied() override {
     OnGetPrinterCapsAndDefaults(false, printer_name_,
                                 printing::PrinterCapsAndDefaults());
   }
 
-  virtual void OnGetPrinterCapsAndDefaults(
+  void OnGetPrinterCapsAndDefaults(
       bool succeeded,
       const std::string& printer_name,
       const printing::PrinterCapsAndDefaults& caps_and_defaults) override {
@@ -537,7 +536,7 @@ class PrinterCapsHandler : public ServiceUtilityProcessHost::Client {
     Release();
   }
 
-  virtual void OnGetPrinterSemanticCapsAndDefaults(
+  void OnGetPrinterSemanticCapsAndDefaults(
       bool succeeded,
       const std::string& printer_name,
       const printing::PrinterSemanticCapsAndDefaults& semantic_info) override {
@@ -615,26 +614,26 @@ class PrintSystemWin : public PrintSystem {
   PrintSystemWin();
 
   // PrintSystem implementation.
-  virtual PrintSystemResult Init() override;
-  virtual PrintSystem::PrintSystemResult EnumeratePrinters(
+  PrintSystemResult Init() override;
+  PrintSystem::PrintSystemResult EnumeratePrinters(
       printing::PrinterList* printer_list) override;
-  virtual void GetPrinterCapsAndDefaults(
+  void GetPrinterCapsAndDefaults(
       const std::string& printer_name,
       const PrinterCapsAndDefaultsCallback& callback) override;
-  virtual bool IsValidPrinter(const std::string& printer_name) override;
-  virtual bool ValidatePrintTicket(
+  bool IsValidPrinter(const std::string& printer_name) override;
+  bool ValidatePrintTicket(
       const std::string& printer_name,
       const std::string& print_ticket_data,
       const std::string& print_ticket_data_mime_type) override;
-  virtual bool GetJobDetails(const std::string& printer_name,
-                             PlatformJobId job_id,
-                             PrintJobDetails *job_details) override;
-  virtual PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() override;
-  virtual PrintSystem::PrinterWatcher* CreatePrinterWatcher(
+  bool GetJobDetails(const std::string& printer_name,
+                     PlatformJobId job_id,
+                     PrintJobDetails* job_details) override;
+  PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() override;
+  PrintSystem::PrinterWatcher* CreatePrinterWatcher(
       const std::string& printer_name) override;
-  virtual PrintSystem::JobSpooler* CreateJobSpooler() override;
-  virtual bool UseCddAndCjt() override;
-  virtual std::string GetSupportedMimeTypes() override;
+  PrintSystem::JobSpooler* CreateJobSpooler() override;
+  bool UseCddAndCjt() override;
+  std::string GetSupportedMimeTypes() override;
 
  private:
   std::string PrintSystemWin::GetPrinterDriverInfo(
diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc
index 50da0b7..765a430 100644
--- a/chrome/service/service_utility_process_host.cc
+++ b/chrome/service/service_utility_process_host.cc
@@ -60,8 +60,7 @@ class ServiceSandboxedProcessLauncherDelegate
  public:
   ServiceSandboxedProcessLauncherDelegate() {}
 
-  virtual void PreSpawnTarget(sandbox::TargetPolicy* policy,
-                              bool* success) override {
+  void PreSpawnTarget(sandbox::TargetPolicy* policy, bool* success) override {
     // Service process may run as windows service and it fails to create a
     // window station.
     policy->SetAlternateDesktop(false);
diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h
index db9d884..a69c7ac 100644
--- a/chrome/service/service_utility_process_host.h
+++ b/chrome/service/service_utility_process_host.h
@@ -85,7 +85,7 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
 
   ServiceUtilityProcessHost(Client* client,
                             base::MessageLoopProxy* client_message_loop_proxy);
-  virtual ~ServiceUtilityProcessHost();
+  ~ServiceUtilityProcessHost() override;
 
   // Starts a process to render the specified pages in the given PDF file into
   // a metafile. Currently only implemented for Windows. If the PDF has fewer
@@ -113,9 +113,9 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
   virtual base::FilePath GetUtilityProcessCmd();
 
   // ChildProcessHostDelegate implementation:
-  virtual void OnChildDisconnected() override;
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual const base::Process& GetProcess() const override;
+  void OnChildDisconnected() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  const base::Process& GetProcess() const override;
 
  private:
   // Starts a process.  Returns true iff it succeeded.
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index dce9547..e341167 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -76,8 +76,8 @@ class TestBrowserWindow : public BrowserWindow {
   void UpdateFullscreenWithToolbar(bool with_toolbar) override;
   bool IsFullscreenWithToolbar() const override;
 #if defined(OS_WIN)
-  virtual void SetMetroSnapMode(bool enable) override {}
-  virtual bool IsInMetroSnapMode() const override;
+  void SetMetroSnapMode(bool enable) override {}
+  bool IsInMetroSnapMode() const override;
 #endif
   LocationBar* GetLocationBar() const override;
   void SetFocusToLocationBar(bool select_all) override {}
diff --git a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc
index 15ef7f9..28ea7a5 100644
--- a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc
+++ b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc
@@ -43,7 +43,7 @@ const char kChromeTestChromeWebUIControllerFactory[] =
 // going to this handler.
 class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest {
  public:
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     content::WebUIControllerFactory::UnregisterFactoryForTesting(
         ChromeWebUIControllerFactory::GetInstance());
     test_factory_.reset(new TestChromeWebUIControllerFactory);
@@ -52,7 +52,7 @@ class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest {
         GURL(kChromeTestChromeWebUIControllerFactory).host(), &mock_provider_);
   }
 
-  virtual void TearDownOnMainThread() override {
+  void TearDownOnMainThread() override {
     test_factory_->RemoveFactoryOverride(
         GURL(kChromeTestChromeWebUIControllerFactory).host());
     content::WebUIControllerFactory::UnregisterFactoryForTesting(
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index db5c0e0..632b861 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -219,9 +219,9 @@ class WindowedNotificationObserverWithDetails
     return true;
   }
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override {
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override {
     const U* details_ptr = content::Details<U>(details).ptr();
     if (details_ptr)
       details_[source.map_key()] = *details_ptr;
diff --git a/chrome/test/base/web_ui_browser_test_browsertest.cc b/chrome/test/base/web_ui_browser_test_browsertest.cc
index fd66ebd8..8ddf2e9 100644
--- a/chrome/test/base/web_ui_browser_test_browsertest.cc
+++ b/chrome/test/base/web_ui_browser_test_browsertest.cc
@@ -108,7 +108,7 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
     MOCK_METHOD1(HandleTestPasses, void(const base::ListValue*));
 
    private:
-    virtual void RegisterMessages() override {
+    void RegisterMessages() override {
       web_ui()->RegisterMessageCallback("startAsyncTest",
           base::Bind(&AsyncWebUIMessageHandler::HandleStartAsyncTest,
                      base::Unretained(this)));
@@ -138,12 +138,12 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
 
  private:
   // Provide this object's handler.
-  virtual WebUIMessageHandler* GetMockMessageHandler() override {
+  WebUIMessageHandler* GetMockMessageHandler() override {
     return &message_handler_;
   }
 
   // Set up and browse to kDummyURL for all tests.
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     WebUIBrowserTest::SetUpOnMainThread();
     AddLibrary(base::FilePath(FILE_PATH_LITERAL("async.js")));
     ui_test_utils::NavigateToURL(browser(), GURL(kDummyURL));
diff --git a/chrome/test/data/webui/async_gen.h b/chrome/test/data/webui/async_gen.h
index e8af827..f2b05de 100644
--- a/chrome/test/data/webui/async_gen.h
+++ b/chrome/test/data/webui/async_gen.h
@@ -16,7 +16,7 @@ class ListValue;
 class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
  public:
   WebUIBrowserAsyncGenTest();
-  virtual ~WebUIBrowserAsyncGenTest();
+  ~WebUIBrowserAsyncGenTest() override;
 
  protected:
   class AsyncWebUIMessageHandler : public content::WebUIMessageHandler {
@@ -30,7 +30,7 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
     void HandleCallJS(const base::ListValue* list_value);
 
     // WebUIMessageHandler implementation.
-    virtual void RegisterMessages() override;
+    void RegisterMessages() override;
   };
 
   // Handler for this test fixture.
@@ -38,11 +38,11 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
 
  private:
   // Provide this object's handler.
-  virtual content::WebUIMessageHandler* GetMockMessageHandler() override {
+  content::WebUIMessageHandler* GetMockMessageHandler() override {
     return &message_handler_;
   }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     WebUIBrowserTest::SetUpOnMainThread();
     EXPECT_CALL(message_handler_, HandleTearDown(::testing::_));
   }
diff --git a/chrome/test/data/webui/chrome_send_browsertest.h b/chrome/test/data/webui/chrome_send_browsertest.h
index 465ec09..44eef8c 100644
--- a/chrome/test/data/webui/chrome_send_browsertest.h
+++ b/chrome/test/data/webui/chrome_send_browsertest.h
@@ -14,7 +14,7 @@
 class ChromeSendWebUITest : public WebUIBrowserTest {
  public:
   ChromeSendWebUITest();
-  virtual ~ChromeSendWebUITest();
+  ~ChromeSendWebUITest() override;
 
   // Mocked message handler class to register expects using gmock framework.
   class ChromeSendWebUIMessageHandler : public content::WebUIMessageHandler {
@@ -25,7 +25,7 @@ class ChromeSendWebUITest : public WebUIBrowserTest {
     MOCK_METHOD1(HandleCheckSend, void(const base::ListValue*));
 
    private:
-    virtual void RegisterMessages() override;
+    void RegisterMessages() override;
   };
 
 
@@ -34,7 +34,7 @@ class ChromeSendWebUITest : public WebUIBrowserTest {
   ::testing::StrictMock<ChromeSendWebUIMessageHandler> message_handler_;
 
  private:
-  virtual content::WebUIMessageHandler* GetMockMessageHandler() override;
+  content::WebUIMessageHandler* GetMockMessageHandler() override;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSendWebUITest);
 };
diff --git a/chrome/test/logging/win/log_file_printer.cc b/chrome/test/logging/win/log_file_printer.cc
index fc2fb48..943712a 100644
--- a/chrome/test/logging/win/log_file_printer.cc
+++ b/chrome/test/logging/win/log_file_printer.cc
@@ -87,34 +87,34 @@ const char* GetTraceTypeString(char event_type) {
 class EventPrinter : public logging_win::LogFileDelegate {
  public:
   explicit EventPrinter(std::ostream* out);
-  virtual ~EventPrinter();
-
-  virtual void OnUnknownEvent(const EVENT_TRACE* event) override;
-
-  virtual void OnUnparsableEvent(const EVENT_TRACE* event) override;
-
-  virtual void OnFileHeader(const EVENT_TRACE* event,
-                            const TRACE_LOGFILE_HEADER* header) override;
-
-  virtual void OnLogMessage(const EVENT_TRACE* event,
-                            logging::LogSeverity severity,
-                            const base::StringPiece& message) override;
-
-  virtual void OnLogMessageFull(const EVENT_TRACE* event,
-                                logging::LogSeverity severity,
-                                DWORD stack_depth,
-                                const intptr_t* backtrace,
-                                int line,
-                                const base::StringPiece& file,
-                                const base::StringPiece& message) override;
-
-  virtual void OnTraceEvent(const EVENT_TRACE* event,
-                            const base::StringPiece& name,
-                            char type,
-                            intptr_t id,
-                            const base::StringPiece& extra,
-                            DWORD stack_depth,
-                            const intptr_t* backtrace) override;
+  ~EventPrinter() override;
+
+  void OnUnknownEvent(const EVENT_TRACE* event) override;
+
+  void OnUnparsableEvent(const EVENT_TRACE* event) override;
+
+  void OnFileHeader(const EVENT_TRACE* event,
+                    const TRACE_LOGFILE_HEADER* header) override;
+
+  void OnLogMessage(const EVENT_TRACE* event,
+                    logging::LogSeverity severity,
+                    const base::StringPiece& message) override;
+
+  void OnLogMessageFull(const EVENT_TRACE* event,
+                        logging::LogSeverity severity,
+                        DWORD stack_depth,
+                        const intptr_t* backtrace,
+                        int line,
+                        const base::StringPiece& file,
+                        const base::StringPiece& message) override;
+
+  void OnTraceEvent(const EVENT_TRACE* event,
+                    const base::StringPiece& name,
+                    char type,
+                    intptr_t id,
+                    const base::StringPiece& extra,
+                    DWORD stack_depth,
+                    const intptr_t* backtrace) override;
 
  private:
   void PrintTimeStamp(LARGE_INTEGER time_stamp);
diff --git a/chrome/test/logging/win/test_log_collector.cc b/chrome/test/logging/win/test_log_collector.cc
index ec582a5..a218d60 100644
--- a/chrome/test/logging/win/test_log_collector.cc
+++ b/chrome/test/logging/win/test_log_collector.cc
@@ -50,43 +50,40 @@ class TestLogCollector {
     // Ownership of |default_result_printer| is taken by the new instance.
     EventListener(TestLogCollector* test_log_collector,
                   testing::TestEventListener* default_result_printer);
-    virtual ~EventListener();
+    ~EventListener() override;
 
     // Sets up the log collector.
-    virtual void OnTestProgramStart(
-        const testing::UnitTest& unit_test) override {
+    void OnTestProgramStart(const testing::UnitTest& unit_test) override {
       test_log_collector_->SetUp();
       default_result_printer_->OnTestProgramStart(unit_test);
     }
 
-    virtual void OnTestIterationStart(const testing::UnitTest& unit_test,
-                                      int iteration) override {
+    void OnTestIterationStart(const testing::UnitTest& unit_test,
+                              int iteration) override {
       default_result_printer_->OnTestIterationStart(unit_test, iteration);
     }
 
-    virtual void OnEnvironmentsSetUpStart(
-        const testing::UnitTest& unit_test) override {
+    void OnEnvironmentsSetUpStart(const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsSetUpStart(unit_test);
     }
 
-    virtual void OnEnvironmentsSetUpEnd(
-        const testing::UnitTest& unit_test) override {
+    void OnEnvironmentsSetUpEnd(const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsSetUpEnd(unit_test);
     }
 
-    virtual void OnTestCaseStart(const testing::TestCase& test_case) override {
+    void OnTestCaseStart(const testing::TestCase& test_case) override {
       default_result_printer_->OnTestCaseStart(test_case);
     }
 
     // Calls back to the collector to start collecting logs for this test.
-    virtual void OnTestStart(const testing::TestInfo& test_info) override {
+    void OnTestStart(const testing::TestInfo& test_info) override {
       default_result_printer_->OnTestStart(test_info);
       test_log_collector_->StartSessionForTest(test_info);
     }
 
     // Calls back to the collector with the partial result.  If the collector
     // does not handle it, it is given to the default result printer.
-    virtual void OnTestPartResult(
+    void OnTestPartResult(
         const testing::TestPartResult& test_part_result) override {
       if (!test_log_collector_->LogTestPartResult(test_part_result))
         default_result_printer_->OnTestPartResult(test_part_result);
@@ -94,32 +91,32 @@ class TestLogCollector {
 
     // Calls back to the collector to handle the collected log for the test that
     // has just ended.
-    virtual void OnTestEnd(const testing::TestInfo& test_info) override {
+    void OnTestEnd(const testing::TestInfo& test_info) override {
       test_log_collector_->ProcessSessionForTest(test_info);
       default_result_printer_->OnTestEnd(test_info);
     }
 
-    virtual void OnTestCaseEnd(const testing::TestCase& test_case) override {
+    void OnTestCaseEnd(const testing::TestCase& test_case) override {
       default_result_printer_->OnTestCaseEnd(test_case);
     }
 
-    virtual void OnEnvironmentsTearDownStart(
+    void OnEnvironmentsTearDownStart(
         const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsTearDownStart(unit_test);
     }
 
-    virtual void OnEnvironmentsTearDownEnd(
+    void OnEnvironmentsTearDownEnd(
         const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsTearDownEnd(unit_test);
     }
 
-    virtual void OnTestIterationEnd(const testing::UnitTest& unit_test,
-                                    int iteration) override {
+    void OnTestIterationEnd(const testing::UnitTest& unit_test,
+                            int iteration) override {
       default_result_printer_->OnTestIterationEnd(unit_test, iteration);
     }
 
     // Tears down the log collector.
-    virtual void OnTestProgramEnd(const testing::UnitTest& unit_test) override {
+    void OnTestProgramEnd(const testing::UnitTest& unit_test) override {
       default_result_printer_->OnTestProgramEnd(unit_test);
       test_log_collector_->TearDown();
     }
diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index c2a2c62..0110ca5 100644
--- a/chrome/test/ppapi/ppapi_test.h
+++ b/chrome/test/ppapi/ppapi_test.h
@@ -21,8 +21,8 @@ class PPAPITestMessageHandler : public content::TestMessageHandler {
  public:
   PPAPITestMessageHandler();
 
-  virtual MessageResponse HandleMessage(const std::string& json) override;
-  virtual void Reset() override;
+  MessageResponse HandleMessage(const std::string& json) override;
+  void Reset() override;
 
   const std::string& message() const {
     return message_;
@@ -39,9 +39,9 @@ class PPAPITestBase : public InProcessBrowserTest {
   PPAPITestBase();
 
   // InProcessBrowserTest:
-  virtual void SetUp() override;
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
-  virtual void SetUpOnMainThread() override;
+  void SetUp() override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpOnMainThread() override;
 
   virtual std::string BuildQuery(const std::string& base,
                                  const std::string& test_case) = 0;
@@ -66,9 +66,9 @@ class PPAPITestBase : public InProcessBrowserTest {
 
    private:
     // content::NotificationObserver:
-    virtual void Observe(int type,
-                         const content::NotificationSource& source,
-                         const content::NotificationDetails& details) override;
+    void Observe(int type,
+                 const content::NotificationSource& source,
+                 const content::NotificationDetails& details) override;
 
     void VerifyInfoBarState();
 
@@ -94,17 +94,18 @@ class PPAPITest : public PPAPITestBase {
  public:
   PPAPITest();
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+
+  std::string BuildQuery(const std::string& base,
+                         const std::string& test_case) override;
 
-  virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) override;
  protected:
   bool in_process_;  // Controls the --ppapi-in-process switch.
 };
 
 class PPAPIPrivateTest : public PPAPITest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // Variant of PPAPITest that runs plugins out-of-process to test proxy
@@ -113,74 +114,72 @@ class OutOfProcessPPAPITest : public PPAPITest {
  public:
   OutOfProcessPPAPITest();
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 class OutOfProcessPPAPIPrivateTest : public OutOfProcessPPAPITest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // NaCl plugin test runner for Newlib runtime.
 class PPAPINaClTest : public PPAPITestBase {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
-  virtual void SetUpOnMainThread() override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpOnMainThread() override;
   // PPAPITestBase overrides.
-  virtual void RunTest(const std::string& test_case) override;
-  virtual void RunTestViaHTTP(const std::string& test_case) override;
-  virtual void RunTestWithSSLServer(const std::string& test_case) override;
-  virtual void RunTestWithWebSocketServer(
-      const std::string& test_case) override;
-  virtual void RunTestIfAudioOutputAvailable(
-      const std::string& test_case) override;
-  virtual void RunTestViaHTTPIfAudioOutputAvailable(
+  void RunTest(const std::string& test_case) override;
+  void RunTestViaHTTP(const std::string& test_case) override;
+  void RunTestWithSSLServer(const std::string& test_case) override;
+  void RunTestWithWebSocketServer(const std::string& test_case) override;
+  void RunTestIfAudioOutputAvailable(const std::string& test_case) override;
+  void RunTestViaHTTPIfAudioOutputAvailable(
       const std::string& test_case) override;
 };
 
 // NaCl plugin test runner for Newlib runtime.
 class PPAPINaClNewlibTest : public PPAPINaClTest {
  public:
-  virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) override;
+  std::string BuildQuery(const std::string& base,
+                         const std::string& test_case) override;
 };
 
 class PPAPIPrivateNaClNewlibTest : public PPAPINaClNewlibTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // NaCl plugin test runner for GNU-libc runtime.
 class PPAPINaClGLibcTest : public PPAPINaClTest {
  public:
-  virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) override;
+  std::string BuildQuery(const std::string& base,
+                         const std::string& test_case) override;
 };
 
 class PPAPIPrivateNaClGLibcTest : public PPAPINaClGLibcTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // NaCl plugin test runner for the PNaCl + Newlib runtime.
 class PPAPINaClPNaClTest : public PPAPINaClTest {
  public:
-  virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) override;
+  std::string BuildQuery(const std::string& base,
+                         const std::string& test_case) override;
 };
 
 class PPAPIPrivateNaClPNaClTest : public PPAPINaClPNaClTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // Test Non-SFI Mode, using PNaCl toolchain to produce nexes.
 class PPAPINaClPNaClNonSfiTest : public PPAPINaClTest {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line);
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 
-  virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) override;
+  std::string BuildQuery(const std::string& base,
+                         const std::string& test_case) override;
 };
 
 // TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when
@@ -188,12 +187,12 @@ class PPAPINaClPNaClNonSfiTest : public PPAPINaClTest {
 // for more details.
 class PPAPINaClPNaClTransitionalNonSfiTest : public PPAPINaClPNaClNonSfiTest {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 class PPAPIPrivateNaClPNaClNonSfiTest : public PPAPINaClPNaClNonSfiTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when
@@ -202,22 +201,22 @@ class PPAPIPrivateNaClPNaClNonSfiTest : public PPAPINaClPNaClNonSfiTest {
 class PPAPIPrivateNaClPNaClTransitionalNonSfiTest
     : public PPAPIPrivateNaClPNaClNonSfiTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 
 class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
 
-  virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) override;
+  std::string BuildQuery(const std::string& base,
+                         const std::string& test_case) override;
 };
 
 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
  public:
   // PPAPITestBase override:
-  virtual void SetUpOnMainThread() override;
+  void SetUpOnMainThread() override;
 };
 
 #endif  // CHROME_TEST_PPAPI_PPAPI_TEST_H_
diff --git a/chrome/utility/font_cache_handler_win.h b/chrome/utility/font_cache_handler_win.h
index e92ef4a..2e2fb40 100644
--- a/chrome/utility/font_cache_handler_win.h
+++ b/chrome/utility/font_cache_handler_win.h
@@ -24,10 +24,10 @@ class Thread;
 class FontCacheHandler : public UtilityMessageHandler {
  public:
   FontCacheHandler() {}
-  virtual ~FontCacheHandler() {}
+  ~FontCacheHandler() override {}
 
   // IPC::Listener implementation
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   void OnBuildFontCache(const base::FilePath& full_path);
diff --git a/chrome/utility/importer/external_process_importer_bridge.h b/chrome/utility/importer/external_process_importer_bridge.h
index 35566a3..4611859 100644
--- a/chrome/utility/importer/external_process_importer_bridge.h
+++ b/chrome/utility/importer/external_process_importer_bridge.h
@@ -54,7 +54,7 @@ class ExternalProcessImporterBridge : public ImporterBridge {
   void AddHomePage(const GURL& home_page) override;
 
 #if defined(OS_WIN)
-  virtual void AddIE7PasswordInfo(
+  void AddIE7PasswordInfo(
       const importer::ImporterIE7PasswordInfo& password_info) override;
 #endif
 
diff --git a/chrome/utility/importer/ie_importer_win.h b/chrome/utility/importer/ie_importer_win.h
index dd33c9a..08f6995 100644
--- a/chrome/utility/importer/ie_importer_win.h
+++ b/chrome/utility/importer/ie_importer_win.h
@@ -22,9 +22,9 @@ class IEImporter : public Importer {
   IEImporter();
 
   // Importer:
-  virtual void StartImport(const importer::SourceProfile& source_profile,
-                           uint16 items,
-                           ImporterBridge* bridge) override;
+  void StartImport(const importer::SourceProfile& source_profile,
+                   uint16 items,
+                   ImporterBridge* bridge) override;
 
  private:
   typedef std::vector<ImportedBookmarkEntry> BookmarkVector;
diff --git a/chrome/utility/shell_handler_win.h b/chrome/utility/shell_handler_win.h
index 729f111..6c993f7 100644
--- a/chrome/utility/shell_handler_win.h
+++ b/chrome/utility/shell_handler_win.h
@@ -30,10 +30,10 @@ struct ChromeUtilityMsg_GetSaveFileName_Params;
 class ShellHandler : public UtilityMessageHandler {
  public:
   ShellHandler();
-  virtual ~ShellHandler();
+  ~ShellHandler() override;
 
   // IPC::Listener implementation
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   void OnOpenFileViaShell(const base::FilePath& full_path);