Standardize usage of virtual/override/final specifiers.

The Google C++ style guide states:

  Explicitly annotate overrides of virtual functions or virtual
  destructors with an override or (less frequently) final specifier.
  Older (pre-C++11) code will use the virtual keyword as an inferior
  alternative annotation. For clarity, use exactly one of override,
  final, or virtual when declaring an override.

To better conform to these guidelines, the following constructs have
been rewritten:

- if a base class has a virtual destructor, then:
    virtual ~Foo();                   ->  ~Foo() override;
- virtual void Foo() override;        ->  void Foo() override;
- virtual void Foo() override final;  ->  void Foo() final;

This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.

BUG=417463
R=caitkp@chromium.org

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

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

183 files changed, 434 insertions, 498 deletions

diff --git a/components/autofill/content/browser/content_autofill_driver_unittest.cc b/components/autofill/content/browser/content_autofill_driver_unittest.cc
index 3b87c4d..50aacba 100644
--- a/components/autofill/content/browser/content_autofill_driver_unittest.cc
+++ b/components/autofill/content/browser/content_autofill_driver_unittest.cc
@@ -65,7 +65,7 @@ class TestContentAutofillDriver : public ContentAutofillDriver {
 
 class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
 
     test_autofill_client_.reset(new TestAutofillClient());
@@ -73,7 +73,7 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
                                                 test_autofill_client_.get()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Reset the driver now to cause all pref observers to be removed and avoid
     // crashes that otherwise occur in the destructor.
     driver_.reset();
diff --git a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
index 2b72143..c2de017 100644
--- a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
+++ b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
@@ -95,7 +95,7 @@ class RequestAutocompleteManagerTest :
  public:
   RequestAutocompleteManagerTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
 
     driver_.reset(
@@ -104,7 +104,7 @@ class RequestAutocompleteManagerTest :
         new RequestAutocompleteManager(driver_.get()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Reset the driver now to cause all pref observers to be removed and avoid
     // crashes that otherwise occur in the destructor.
     driver_.reset();
diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
index 6109823..8f805dd 100644
--- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
@@ -750,16 +750,14 @@ class WalletClientTest : public testing::Test {
   WalletClientTest()
       : request_context_(new net::TestURLRequestContextGetter(
             base::MessageLoopProxy::current())) {}
-  virtual ~WalletClientTest() {}
+  ~WalletClientTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     wallet_client_.reset(new WalletClient(
         request_context_.get(), &delegate_, GURL(kMerchantUrl)));
   }
 
-  virtual void TearDown() override {
-    wallet_client_.reset();
-  }
+  void TearDown() override { wallet_client_.reset(); }
 
   void VerifyAndFinishRequest(net::HttpStatusCode response_code,
                               const std::string& request_body,
diff --git a/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
index 2187da6..df422a3 100644
--- a/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
@@ -52,16 +52,14 @@ class WalletSigninHelperTest : public testing::Test {
   WalletSigninHelperTest()
       : request_context_(new net::TestURLRequestContextGetter(
             base::MessageLoopProxy::current())) {}
-  virtual ~WalletSigninHelperTest() {}
+  ~WalletSigninHelperTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     signin_helper_.reset(
         new WalletSigninHelper(&mock_delegate_, request_context_.get()));
   }
 
-  virtual void TearDown() override {
-    signin_helper_.reset();
-  }
+  void TearDown() override { signin_helper_.reset(); }
 
   // Sets up a response for the mock URLFetcher and completes the request.
   void SetUpFetcherResponseAndCompleteRequest(
diff --git a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
index c5a082e..0404055 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
@@ -105,7 +105,7 @@ class PasswordFormBuilder {
 class PasswordFormConversionUtilsTest : public content::RenderViewTest {
  public:
   PasswordFormConversionUtilsTest() : content::RenderViewTest() {}
-  virtual ~PasswordFormConversionUtilsTest() {}
+  ~PasswordFormConversionUtilsTest() override {}
 
  protected:
   // Loads the given |html|, retrieves the sole WebFormElement from it, and then
diff --git a/components/autofill/core/browser/autocomplete_history_manager.h b/components/autofill/core/browser/autocomplete_history_manager.h
index fb57474..8a10f18 100644
--- a/components/autofill/core/browser/autocomplete_history_manager.h
+++ b/components/autofill/core/browser/autocomplete_history_manager.h
@@ -26,11 +26,11 @@ class AutocompleteHistoryManager : public WebDataServiceConsumer {
  public:
   AutocompleteHistoryManager(AutofillDriver* driver,
                              AutofillClient* autofill_client);
-  virtual ~AutocompleteHistoryManager() override;
+  ~AutocompleteHistoryManager() override;
 
   // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(
-      WebDataServiceBase::Handle h, const WDTypedResult* result) override;
+  void OnWebDataServiceRequestDone(WebDataServiceBase::Handle h,
+                                   const WDTypedResult* result) override;
 
   // Pass-through functions that are called by AutofillManager, after it has
   // dispatched a message.
diff --git a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
index 55807f6..3431b82 100644
--- a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
@@ -67,7 +67,7 @@ class AutocompleteHistoryManagerTest : public testing::Test {
  protected:
   AutocompleteHistoryManagerTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     web_data_service_ = new MockWebDataService();
     autofill_client_.reset(new MockAutofillClient(web_data_service_));
     autofill_driver_.reset(new TestAutofillDriver());
@@ -75,9 +75,7 @@ class AutocompleteHistoryManagerTest : public testing::Test {
         autofill_driver_.get(), autofill_client_.get()));
   }
 
-  virtual void TearDown() override {
-    autocomplete_manager_.reset();
-  }
+  void TearDown() override { autocomplete_manager_.reset(); }
 
   base::MessageLoop message_loop_;
   scoped_refptr<MockWebDataService> web_data_service_;
diff --git a/components/autofill/core/browser/autofill_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
index 8d94045..eb91b2d 100644
--- a/components/autofill/core/browser/autofill_external_delegate_unittest.cc
+++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
@@ -97,7 +97,7 @@ class MockAutofillManager : public AutofillManager {
 
 class AutofillExternalDelegateUnitTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     autofill_driver_.reset(new MockAutofillDriver());
     autofill_manager_.reset(
         new MockAutofillManager(autofill_driver_.get(), &autofill_client_));
@@ -106,7 +106,7 @@ class AutofillExternalDelegateUnitTest : public testing::Test {
             autofill_manager_.get(), autofill_driver_.get()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed.
     autofill_manager_.reset();
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc
index c556bf9..8e56b60 100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -591,7 +591,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
 
 class AutofillManagerTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     autofill_client_.SetPrefs(test::PrefServiceForTesting());
     personal_data_.set_database(autofill_client_.GetDatabase());
     personal_data_.SetPrefService(autofill_client_.GetPrefs());
@@ -605,7 +605,7 @@ class AutofillManagerTest : public testing::Test {
     autofill_manager_->SetExternalDelegate(external_delegate_.get());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed.
     autofill_manager_.reset();
diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
index 5ab2057..91803e1 100644
--- a/components/autofill/core/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -133,10 +133,10 @@ class AutofillMergeTest : public testing::Test,
                           public DataDrivenTest {
  protected:
   AutofillMergeTest();
-  virtual ~AutofillMergeTest();
+  ~AutofillMergeTest() override;
 
   // testing::Test:
-  virtual void SetUp();
+  void SetUp() override;
 
   // DataDrivenTest:
   void GenerateResults(const std::string& input, std::string* output) override;
diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc
index b02a518..64ca857 100644
--- a/components/autofill/core/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -231,10 +231,10 @@ class TestAutofillManager : public AutofillManager {
 
 class AutofillMetricsTest : public testing::Test {
  public:
-  virtual ~AutofillMetricsTest();
+  ~AutofillMetricsTest() override;
 
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
  protected:
   base::MessageLoop message_loop_;
diff --git a/components/autofill/core/browser/autofill_xml_parser_unittest.cc b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
index ad2489a..b97c774 100644
--- a/components/autofill/core/browser/autofill_xml_parser_unittest.cc
+++ b/components/autofill/core/browser/autofill_xml_parser_unittest.cc
@@ -18,7 +18,7 @@ namespace {
 class AutofillQueryXmlParserTest : public testing::Test {
  public:
   AutofillQueryXmlParserTest(): upload_required_(USE_UPLOAD_RATES) {};
-  virtual ~AutofillQueryXmlParserTest() {};
+  ~AutofillQueryXmlParserTest() override{};
 
  protected:
   void ParseQueryXML(const std::string& xml, bool should_succeed) {
@@ -37,7 +37,7 @@ class AutofillQueryXmlParserTest : public testing::Test {
 class AutofillUploadXmlParserTest : public testing::Test {
  public:
   AutofillUploadXmlParserTest(): positive_(0), negative_(0) {};
-  virtual ~AutofillUploadXmlParserTest() {};
+  ~AutofillUploadXmlParserTest() override{};
 
  protected:
   void ParseUploadXML(const std::string& xml, bool should_succeed) {
diff --git a/components/autofill/core/browser/credit_card_field_unittest.cc b/components/autofill/core/browser/credit_card_field_unittest.cc
index 68719f2..6400bad 100644
--- a/components/autofill/core/browser/credit_card_field_unittest.cc
+++ b/components/autofill/core/browser/credit_card_field_unittest.cc
@@ -18,7 +18,7 @@ namespace autofill {
 class CreditCardFieldTest : public testing::Test {
  public:
   CreditCardFieldTest() {}
-  virtual ~CreditCardFieldTest() {}
+  ~CreditCardFieldTest() override {}
 
  protected:
   ScopedVector<AutofillField> list_;
diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc
index 1c425c1..d1357a8 100644
--- a/components/autofill/core/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -95,7 +95,7 @@ class PersonalDataManagerTest : public testing::Test {
  protected:
   PersonalDataManagerTest() {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     prefs_ = test::PrefServiceForTesting();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath path = temp_dir_.path().AppendASCII("TestWebDB");
diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc b/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc
index be8bb73..e8b82bd 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service_unittest.cc
@@ -227,9 +227,7 @@ class AutofillProfileSyncableServiceTest : public testing::Test {
  public:
   AutofillProfileSyncableServiceTest() {}
 
-  virtual void SetUp() override {
-    sync_processor_.reset(new MockSyncChangeProcessor);
-  }
+  void SetUp() override { sync_processor_.reset(new MockSyncChangeProcessor); }
 
   // Wrapper around AutofillProfileSyncableService::MergeDataAndStartSyncing()
   // that also verifies expectations.
diff --git a/components/autofill/core/browser/webdata/autofill_table_unittest.cc b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
index 96c47b6..75a1037 100644
--- a/components/autofill/core/browser/webdata/autofill_table_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
@@ -115,10 +115,10 @@ int GetAutofillEntryCount(const base::string16& name,
 class AutofillTableTest : public testing::Test {
  public:
   AutofillTableTest() {}
-  virtual ~AutofillTableTest() {}
+  ~AutofillTableTest() override {}
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
 #if defined(OS_MACOSX)
     OSCrypt::UseMockKeychain(true);
 #endif
diff --git a/components/autofill/core/browser/webdata/web_data_service_unittest.cc b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
index e7a7e47..de188d3 100644
--- a/components/autofill/core/browser/webdata/web_data_service_unittest.cc
+++ b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
@@ -96,7 +96,7 @@ class WebDataServiceTest : public testing::Test {
   WebDataServiceTest() : db_thread_("DBThread") {}
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     db_thread_.Start();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ -116,7 +116,7 @@ class WebDataServiceTest : public testing::Test {
     wds_->Init();
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     wds_->ShutdownOnUIThread();
     wdbs_->ShutdownDatabase();
     wds_ = NULL;
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
index 0ad4e77..28bc794 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
@@ -36,12 +36,12 @@ scoped_ptr<PrefService> PrefServiceForTesting() {
 class BookmarkExpandedStateTrackerTest : public testing::Test {
  public:
   BookmarkExpandedStateTrackerTest();
-  virtual ~BookmarkExpandedStateTrackerTest();
+  ~BookmarkExpandedStateTrackerTest() override;
 
  protected:
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   base::MessageLoop message_loop_;
   TestBookmarkClient client_;
diff --git a/components/bookmarks/browser/bookmark_node_data_unittest.cc b/components/bookmarks/browser/bookmark_node_data_unittest.cc
index 21c6e03..5386c79 100644
--- a/components/bookmarks/browser/bookmark_node_data_unittest.cc
+++ b/components/bookmarks/browser/bookmark_node_data_unittest.cc
@@ -26,7 +26,7 @@ class BookmarkNodeDataTest : public testing::Test {
  public:
   BookmarkNodeDataTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     event_source_ = ui::PlatformEventSource::CreateDefault();
     model_ = client_.CreateModel();
     test::WaitForBookmarkModelToLoad(model_.get());
@@ -34,7 +34,7 @@ class BookmarkNodeDataTest : public testing::Test {
     ASSERT_TRUE(success);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     model_.reset();
     event_source_.reset();
     bool success = profile_dir_.Delete();
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index 8c194bf..1a48edd 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -28,11 +28,11 @@ class BookmarkUtilsTest : public testing::Test,
   BookmarkUtilsTest()
       : grouped_changes_beginning_count_(0),
         grouped_changes_ended_count_(0) {}
-  virtual ~BookmarkUtilsTest() {}
+  ~BookmarkUtilsTest() override {}
 
 // Copy and paste is not yet supported on iOS. http://crbug.com/228147
 #if !defined(OS_IOS)
-  virtual void TearDown() override {
+  void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
   }
 #endif  // !defined(OS_IOS)
diff --git a/components/captive_portal/captive_portal_detector_unittest.cc b/components/captive_portal/captive_portal_detector_unittest.cc
index 486baa14..25eb35c 100644
--- a/components/captive_portal/captive_portal_detector_unittest.cc
+++ b/components/captive_portal/captive_portal_detector_unittest.cc
@@ -52,9 +52,9 @@ class CaptivePortalDetectorTest : public testing::Test,
                                   public CaptivePortalDetectorTestBase {
  public:
   CaptivePortalDetectorTest() {}
-  virtual ~CaptivePortalDetectorTest() {}
+  ~CaptivePortalDetectorTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     CHECK(base::MessageLoopProxy::current().get());
     scoped_refptr<net::URLRequestContextGetter> request_context_getter(
         new net::TestURLRequestContextGetter(
@@ -64,9 +64,7 @@ class CaptivePortalDetectorTest : public testing::Test,
     set_detector(detector_.get());
   }
 
-  virtual void TearDown() override {
-    detector_.reset();
-  }
+  void TearDown() override { detector_.reset(); }
 
   void RunTest(const CaptivePortalDetector::Results& expected_results,
                int net_error,
diff --git a/components/component_updater/test/component_patcher_unittest.h b/components/component_updater/test/component_patcher_unittest.h
index 992e0f8..3eb1b97 100644
--- a/components/component_updater/test/component_patcher_unittest.h
+++ b/components/component_updater/test/component_patcher_unittest.h
@@ -24,7 +24,7 @@ const char binary_output_hash[] =
 class ComponentPatcherOperationTest : public testing::Test {
  public:
   explicit ComponentPatcherOperationTest();
-  virtual ~ComponentPatcherOperationTest();
+  ~ComponentPatcherOperationTest() override;
 
  protected:
   base::ScopedTempDir input_dir_;
diff --git a/components/component_updater/test/component_updater_ping_manager_unittest.cc b/components/component_updater/test/component_updater_ping_manager_unittest.cc
index 806c9a8..6504f3f 100644
--- a/components/component_updater/test/component_updater_ping_manager_unittest.cc
+++ b/components/component_updater/test/component_updater_ping_manager_unittest.cc
@@ -18,13 +18,13 @@ namespace component_updater {
 class ComponentUpdaterPingManagerTest : public testing::Test {
  public:
   ComponentUpdaterPingManagerTest();
-  virtual ~ComponentUpdaterPingManagerTest() {}
+  ~ComponentUpdaterPingManagerTest() override {}
 
   void RunThreadsUntilIdle();
 
   // Overrides from testing::Test.
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
  protected:
   scoped_ptr<TestConfigurator> config_;
diff --git a/components/component_updater/test/crx_downloader_unittest.cc b/components/component_updater/test/crx_downloader_unittest.cc
index 9dbe8fe9..ebc8d60 100644
--- a/components/component_updater/test/crx_downloader_unittest.cc
+++ b/components/component_updater/test/crx_downloader_unittest.cc
@@ -40,11 +40,11 @@ base::FilePath MakeTestFilePath(const char* file) {
 class CrxDownloaderTest : public testing::Test {
  public:
   CrxDownloaderTest();
-  virtual ~CrxDownloaderTest();
+  ~CrxDownloaderTest() override;
 
   // Overrides from testing::Test.
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   void Quit();
   void RunThreads();
diff --git a/components/component_updater/test/request_sender_unittest.cc b/components/component_updater/test/request_sender_unittest.cc
index b1e46d7..070bc2b 100644
--- a/components/component_updater/test/request_sender_unittest.cc
+++ b/components/component_updater/test/request_sender_unittest.cc
@@ -27,11 +27,11 @@ const char kUrlPath2[] = "path2";
 class RequestSenderTest : public testing::Test {
  public:
   RequestSenderTest();
-  virtual ~RequestSenderTest();
+  ~RequestSenderTest() override;
 
   // Overrides from testing::Test.
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   void RequestSenderComplete(const net::URLFetcher* source);
 
diff --git a/components/component_updater/test/update_checker_unittest.cc b/components/component_updater/test/update_checker_unittest.cc
index 574db3f..8a26f6d 100644
--- a/components/component_updater/test/update_checker_unittest.cc
+++ b/components/component_updater/test/update_checker_unittest.cc
@@ -38,11 +38,11 @@ base::FilePath test_file(const char* file) {
 class UpdateCheckerTest : public testing::Test {
  public:
   UpdateCheckerTest();
-  virtual ~UpdateCheckerTest();
+  ~UpdateCheckerTest() override;
 
   // Overrides from testing::Test.
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   void UpdateCheckComplete(const GURL& original_url,
                            int error,
diff --git a/components/constrained_window/constrained_window_views.cc b/components/constrained_window/constrained_window_views.cc
index 43d4830..68664fb 100644
--- a/components/constrained_window/constrained_window_views.cc
+++ b/components/constrained_window/constrained_window_views.cc
@@ -43,7 +43,7 @@ class WidgetModalDialogHostObserverViews
     target_widget_->AddObserver(this);
   }
 
-  virtual ~WidgetModalDialogHostObserverViews() {
+  ~WidgetModalDialogHostObserverViews() override {
     if (host_)
       host_->RemoveObserver(this);
     target_widget_->RemoveObserver(this);
@@ -51,16 +51,14 @@ class WidgetModalDialogHostObserverViews
   }
 
   // WidgetObserver overrides
-  virtual void OnWidgetClosing(views::Widget* widget) override {
-    delete this;
-  }
+  void OnWidgetClosing(views::Widget* widget) override { delete this; }
 
   // WebContentsModalDialogHostObserver overrides
-  virtual void OnPositionRequiresUpdate() override {
+  void OnPositionRequiresUpdate() override {
     UpdateWidgetModalDialogPosition(target_widget_, host_);
   }
 
-  virtual void OnHostDestroying() override {
+  void OnHostDestroying() override {
     host_->RemoveObserver(this);
     host_ = NULL;
   }
diff --git a/components/constrained_window/constrained_window_views_unittest.cc b/components/constrained_window/constrained_window_views_unittest.cc
index 9334feb..d163c43 100644
--- a/components/constrained_window/constrained_window_views_unittest.cc
+++ b/components/constrained_window/constrained_window_views_unittest.cc
@@ -19,18 +19,16 @@ namespace views {
 class DialogContents : public DialogDelegateView {
  public:
   DialogContents() {}
-  virtual ~DialogContents() {}
+  ~DialogContents() override {}
 
   void set_preferred_size(const gfx::Size& preferred_size) {
     preferred_size_ = preferred_size;
   }
 
   // Overriden from DialogDelegateView:
-  virtual View* GetContentsView() override { return this; }
-  virtual gfx::Size GetPreferredSize() const override {
-    return preferred_size_;
-  }
-  virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); }
+  View* GetContentsView() override { return this; }
+  gfx::Size GetPreferredSize() const override { return preferred_size_; }
+  gfx::Size GetMinimumSize() const override { return gfx::Size(); }
 
  private:
   gfx::Size preferred_size_;
@@ -41,9 +39,9 @@ class DialogContents : public DialogDelegateView {
 class ConstrainedWindowViewsTest : public ViewsTestBase {
  public:
   ConstrainedWindowViewsTest() : contents_(NULL) {}
-  virtual ~ConstrainedWindowViewsTest() {}
+  ~ConstrainedWindowViewsTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ViewsTestBase::SetUp();
     contents_ = new DialogContents;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
@@ -62,7 +60,7 @@ class ConstrainedWindowViewsTest : public ViewsTestBase {
     contents()->set_preferred_size(preferred_size);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     ViewsTestBase::TearDown();
     contents_ = NULL;
     dialog_host_.reset();
diff --git a/components/copresence/handlers/audio/audio_directive_handler_unittest.cc b/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
index ede0ad8..598a358 100644
--- a/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
+++ b/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
@@ -31,7 +31,7 @@ void EncodeToken(const std::string&,
 class AudioManagerStub final : public AudioManager {
  public:
   AudioManagerStub() {}
-  virtual ~AudioManagerStub() {}
+  ~AudioManagerStub() override {}
 
   // AudioManager overrides:
   void Initialize(const DecodeSamplesCallback& decode_cb,
@@ -63,7 +63,7 @@ class AudioDirectiveHandlerTest : public testing::Test {
     directive_handler_->Initialize(base::Bind(&DecodeSamples),
                                    base::Bind(&EncodeToken));
   }
-  virtual ~AudioDirectiveHandlerTest() {}
+  ~AudioDirectiveHandlerTest() override {}
 
   void DirectiveAdded() {}
 
diff --git a/components/copresence/handlers/audio/audio_directive_list_unittest.cc b/components/copresence/handlers/audio/audio_directive_list_unittest.cc
index 5fda542..7dbcd6e 100644
--- a/components/copresence/handlers/audio/audio_directive_list_unittest.cc
+++ b/components/copresence/handlers/audio/audio_directive_list_unittest.cc
@@ -15,7 +15,7 @@ class AudioDirectiveListTest : public testing::Test {
  public:
   AudioDirectiveListTest() : directive_list_(new AudioDirectiveList()) {}
 
-  virtual ~AudioDirectiveListTest() {}
+  ~AudioDirectiveListTest() override {}
 
  protected:
   base::MessageLoop message_loop_;
diff --git a/components/copresence/mediums/audio/audio_manager_impl.h b/components/copresence/mediums/audio/audio_manager_impl.h
index b1f40ae..60b6130 100644
--- a/components/copresence/mediums/audio/audio_manager_impl.h
+++ b/components/copresence/mediums/audio/audio_manager_impl.h
@@ -28,7 +28,7 @@ class AudioRecorder;
 class AudioManagerImpl final : public AudioManager {
  public:
   AudioManagerImpl();
-  ~AudioManagerImpl();
+  ~AudioManagerImpl() override;
 
   // AudioManager overrides:
   void Initialize(const DecodeSamplesCallback& decode_cb,
diff --git a/components/copresence/mediums/audio/audio_manager_unittest.cc b/components/copresence/mediums/audio/audio_manager_unittest.cc
index 104b1fb..5fcc6d8 100644
--- a/components/copresence/mediums/audio/audio_manager_unittest.cc
+++ b/components/copresence/mediums/audio/audio_manager_unittest.cc
@@ -19,7 +19,7 @@ namespace copresence {
 class AudioPlayerStub final : public AudioPlayer {
  public:
   AudioPlayerStub() : is_playing_(false) {}
-  virtual ~AudioPlayerStub() {}
+  ~AudioPlayerStub() override {}
 
   // AudioPlayer overrides:
   void Initialize() override {}
@@ -38,7 +38,7 @@ class AudioPlayerStub final : public AudioPlayer {
 class AudioRecorderStub final : public AudioRecorder {
  public:
   AudioRecorderStub() : is_recording_(false) {}
-  virtual ~AudioRecorderStub() {}
+  ~AudioRecorderStub() override {}
 
   // AudioRecorder overrides:
   void Initialize(const RecordedSamplesCallback& cb) override { cb_ = cb; }
@@ -74,7 +74,7 @@ class AudioManagerTest : public testing::Test {
         base::Bind(&AudioManagerTest::DecodeSamples, base::Unretained(this)),
         base::Bind(&AudioManagerTest::EncodeToken, base::Unretained(this)));
   }
-  virtual ~AudioManagerTest() {}
+  ~AudioManagerTest() override {}
 
  protected:
   void EncodeToken(const std::string& token,
diff --git a/components/copresence/mediums/audio/audio_player_impl.h b/components/copresence/mediums/audio/audio_player_impl.h
index 84e0753..b89eaa0 100644
--- a/components/copresence/mediums/audio/audio_player_impl.h
+++ b/components/copresence/mediums/audio/audio_player_impl.h
@@ -46,7 +46,7 @@ class AudioPlayerImpl final
   FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, BasicPlayAndStop);
   FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, OutOfOrderPlayAndStopMultiple);
 
-  virtual ~AudioPlayerImpl();
+  ~AudioPlayerImpl() override;
 
   // Methods to do our various operations; all of these need to be run on the
   // audio thread.
diff --git a/components/copresence/mediums/audio/audio_player_unittest.cc b/components/copresence/mediums/audio/audio_player_unittest.cc
index 06a095d..b963e88 100644
--- a/components/copresence/mediums/audio/audio_player_unittest.cc
+++ b/components/copresence/mediums/audio/audio_player_unittest.cc
@@ -78,7 +78,7 @@ class AudioPlayerTest : public testing::Test,
       media::AudioManager::CreateForTesting();
   }
 
-  virtual ~AudioPlayerTest() { DeletePlayer(); }
+  ~AudioPlayerTest() override { DeletePlayer(); }
 
   void CreatePlayer() {
     DeletePlayer();
diff --git a/components/copresence/mediums/audio/audio_recorder_impl.h b/components/copresence/mediums/audio/audio_recorder_impl.h
index 7ef2790..89b50cc 100644
--- a/components/copresence/mediums/audio/audio_recorder_impl.h
+++ b/components/copresence/mediums/audio/audio_recorder_impl.h
@@ -54,7 +54,7 @@ class AudioRecorderImpl final
   }
 
  protected:
-  virtual ~AudioRecorderImpl();
+  ~AudioRecorderImpl() override;
   void set_is_recording(bool is_recording) { is_recording_ = is_recording; }
 
  private:
diff --git a/components/copresence/mediums/audio/audio_recorder_unittest.cc b/components/copresence/mediums/audio/audio_recorder_unittest.cc
index 1d7c959..c6ee40d 100644
--- a/components/copresence/mediums/audio/audio_recorder_unittest.cc
+++ b/components/copresence/mediums/audio/audio_recorder_unittest.cc
@@ -78,7 +78,7 @@ class AudioRecorderTest : public testing::Test {
       media::AudioManager::CreateForTesting();
   }
 
-  virtual ~AudioRecorderTest() {
+  ~AudioRecorderTest() override {
     DeleteRecorder();
     for (size_t i = 0; i < channel_data_.size(); ++i)
       base::AlignedFree(channel_data_[i]);
diff --git a/components/copresence/rpc/http_post_unittest.cc b/components/copresence/rpc/http_post_unittest.cc
index 9a84750..70d1ee3 100644
--- a/components/copresence/rpc/http_post_unittest.cc
+++ b/components/copresence/rpc/http_post_unittest.cc
@@ -35,7 +35,7 @@ class HttpPostTest : public testing::Test {
     proto_.set_client("test_client");
     proto_.set_version_code(123);
   }
-  virtual ~HttpPostTest() {}
+  ~HttpPostTest() override {}
 
   // Record the response sent back to the client for verification.
   void TestResponseCallback(int response_code,
diff --git a/components/crash/app/breakpad_linux.cc b/components/crash/app/breakpad_linux.cc
index 2d7ff7c..4fe127b9 100644
--- a/components/crash/app/breakpad_linux.cc
+++ b/components/crash/app/breakpad_linux.cc
@@ -757,10 +757,10 @@ class NonBrowserCrashHandler : public google_breakpad::CrashGenerationClient {
             kCrashDumpSignal)) {
   }
 
-  virtual ~NonBrowserCrashHandler() {}
+  ~NonBrowserCrashHandler() override {}
 
-  virtual bool RequestDump(const void* crash_context,
-                           size_t crash_context_size) override {
+  bool RequestDump(const void* crash_context,
+                   size_t crash_context_size) override {
     int fds[2] = { -1, -1 };
     if (sys_socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) {
       static const char msg[] = "Failed to create socket for crash dumping.\n";
diff --git a/components/crash/browser/crash_handler_host_linux.h b/components/crash/browser/crash_handler_host_linux.h
index f655360f..876a0a5 100644
--- a/components/crash/browser/crash_handler_host_linux.h
+++ b/components/crash/browser/crash_handler_host_linux.h
@@ -36,7 +36,7 @@ class CrashHandlerHostLinux : public base::MessageLoopForIO::Watcher,
   CrashHandlerHostLinux(const std::string& process_type,
                         const base::FilePath& dumps_path,
                         bool upload);
-  virtual ~CrashHandlerHostLinux();
+  ~CrashHandlerHostLinux() override;
 
   // Starts the uploader thread. Must be called immediately after creating the
   // class.
@@ -49,11 +49,11 @@ class CrashHandlerHostLinux : public base::MessageLoopForIO::Watcher,
   }
 
   // MessagePumbLibevent::Watcher impl:
-  virtual void OnFileCanWriteWithoutBlocking(int fd) override;
-  virtual void OnFileCanReadWithoutBlocking(int fd) override;
+  void OnFileCanWriteWithoutBlocking(int fd) override;
+  void OnFileCanReadWithoutBlocking(int fd) override;
 
   // MessageLoop::DestructionObserver impl:
-  virtual void WillDestroyCurrentMessageLoop() override;
+  void WillDestroyCurrentMessageLoop() override;
 
   // Whether we are shutting down or not.
   bool IsShuttingDown() const;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc
index 904778c..0b0876f 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc
@@ -78,7 +78,7 @@ class MockObserver : public net::ProxyConfigService::Observer {
 
 class DataReductionProxyConfigServiceTest : public testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     observer_.reset(new MockObserver());
     base_service_ = new TestProxyConfigService();
     scoped_ptr<net::ProxyConfigService> base_service(base_service_);
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc
index 812aead..b0b574d 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics_unittest.cc
@@ -40,7 +40,7 @@ class ChromeNetworkDataSavingMetricsTest : public testing::Test {
  protected:
   ChromeNetworkDataSavingMetricsTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     statistics_prefs_.reset(new DataReductionProxyStatisticsPrefs(
         &pref_service_,
         scoped_refptr<base::TestSimpleTaskRunner>(
@@ -136,7 +136,7 @@ class ChromeNetworkDailyDataSavingMetricsTest
     base::Time::FromString(kLastUpdateTime, &now_);
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeNetworkDataSavingMetricsTest::SetUp();
 
     // Only create two lists in Setup to test that adding new lists is fine.
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc
index 03e8d90..bca6bfb 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc
@@ -16,7 +16,7 @@ namespace data_reduction_proxy {
 
 class DataReductionProxyPrefsTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     RegisterPrefs(local_state_prefs_.registry());
     PrefRegistrySimple* profile_registry = profile_prefs_.registry();
     RegisterPrefs(profile_registry);
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h
index a0bfe64..7df9773 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h
@@ -110,11 +110,11 @@ class DataReductionProxySettingsTestBase : public testing::Test {
                                      bool fallback_allowed,
                                      bool alt_allowed,
                                      bool promo_allowed);
-  virtual ~DataReductionProxySettingsTestBase();
+  ~DataReductionProxySettingsTestBase() override;
 
   void AddProxyToCommandLine();
 
-  virtual void SetUp() override;
+  void SetUp() override;
 
   template <class C> void ResetSettings(bool allowed,
                                         bool fallback_allowed,
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc
index 2b50459..369c2ab 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc
@@ -39,9 +39,7 @@ class DataReductionProxyStatisticsPrefsTest : public testing::Test {
       : task_runner_(scoped_refptr<base::TestSimpleTaskRunner>(
             new base::TestSimpleTaskRunner())) {}
 
-  virtual void SetUp() override {
-    RegisterPrefs(simple_pref_service_.registry());
-  }
+  void SetUp() override { RegisterPrefs(simple_pref_service_.registry()); }
 
   // Create daily pref list of |kNumDaysInHistory| zero values.
   void CreatePrefList(const char* pref) {
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc b/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc
index 7d7e8bf..fa14e8a 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc
+++ b/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc
@@ -13,7 +13,7 @@ const char kTestScheme[] = "myscheme";
 
 class DomDistillerViewerSourceTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     source_.reset(new DomDistillerViewerSource(NULL, kTestScheme));
   }
 
diff --git a/components/dom_distiller/core/distilled_content_store_unittest.cc b/components/dom_distiller/core/distilled_content_store_unittest.cc
index dced364..b4b7a3d 100644
--- a/components/dom_distiller/core/distilled_content_store_unittest.cc
+++ b/components/dom_distiller/core/distilled_content_store_unittest.cc
@@ -59,7 +59,7 @@ class InMemoryContentStoreTest : public testing::Test {
 
  protected:
   // testing::Test implementation:
-  virtual void SetUp() override {
+  void SetUp() override {
     store_.reset(new InMemoryContentStore(kDefaultMaxNumCachedEntries));
     save_success_ = false;
     load_success_ = false;
diff --git a/components/dom_distiller/core/distilled_page_prefs_unittests.cc b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
index cf13fce..e7417cc 100644
--- a/components/dom_distiller/core/distilled_page_prefs_unittests.cc
+++ b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
@@ -40,7 +40,7 @@ class TestingObserver : public DistilledPagePrefs::Observer {
 
 class DistilledPagePrefsTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     pref_service_.reset(new user_prefs::TestingPrefServiceSyncable());
     DistilledPagePrefs::RegisterProfilePrefs(pref_service_->registry());
     distilled_page_prefs_.reset(new DistilledPagePrefs(pref_service_.get()));
diff --git a/components/dom_distiller/core/distiller_unittest.cc b/components/dom_distiller/core/distiller_unittest.cc
index ed70ec5..d55e4f7 100644
--- a/components/dom_distiller/core/distiller_unittest.cc
+++ b/components/dom_distiller/core/distiller_unittest.cc
@@ -263,7 +263,7 @@ class MockDistillerURLFetcherFactory : public DistillerURLFetcherFactory {
 
 class DistillerTest : public testing::Test {
  public:
-  virtual ~DistillerTest() {}
+  ~DistillerTest() override {}
 
   void OnDistillArticleDone(scoped_ptr<DistilledArticleProto> proto) {
     article_proto_ = proto.Pass();
diff --git a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
index d2b69b1..f100d5cd 100644
--- a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
+++ b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
@@ -28,7 +28,7 @@ class DistillerURLFetcherTest : public testing::Test {
 
  protected:
   // testing::Test implementation:
-  virtual void SetUp() override {
+  void SetUp() override {
     url_fetcher_.reset(new dom_distiller::DistillerURLFetcher(NULL));
     factory_.reset(new net::FakeURLFetcherFactory(NULL));
     factory_->SetFakeResponse(
diff --git a/components/dom_distiller/core/dom_distiller_service_unittest.cc b/components/dom_distiller/core/dom_distiller_service_unittest.cc
index 4745c25..868b398 100644
--- a/components/dom_distiller/core/dom_distiller_service_unittest.cc
+++ b/components/dom_distiller/core/dom_distiller_service_unittest.cc
@@ -79,7 +79,7 @@ scoped_ptr<DistilledArticleProto> CreateDefaultArticle() {
 
 class DomDistillerServiceTest : public testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     main_loop_.reset(new base::MessageLoop());
     FakeDB<ArticleEntry>* fake_db = new FakeDB<ArticleEntry>(&db_model_);
     FakeDB<ArticleEntry>::EntryMap store_model;
@@ -96,7 +96,7 @@ class DomDistillerServiceTest : public testing::Test {
     fake_db->LoadCallback(true);
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     base::RunLoop().RunUntilIdle();
     store_ = NULL;
     distiller_factory_ = NULL;
diff --git a/components/dom_distiller/core/dom_distiller_store_unittest.cc b/components/dom_distiller/core/dom_distiller_store_unittest.cc
index b84f2b0..b2d0efd 100644
--- a/components/dom_distiller/core/dom_distiller_store_unittest.cc
+++ b/components/dom_distiller/core/dom_distiller_store_unittest.cc
@@ -122,14 +122,14 @@ class MockDistillerObserver : public DomDistillerObserver {
 
 class DomDistillerStoreTest : public testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     db_model_.clear();
     sync_model_.clear();
     store_model_.clear();
     next_sync_id_ = 1;
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     store_.reset();
     fake_db_ = NULL;
     fake_sync_processor_ = NULL;
diff --git a/components/dom_distiller/core/task_tracker_unittest.cc b/components/dom_distiller/core/task_tracker_unittest.cc
index 435d040..d673553f 100644
--- a/components/dom_distiller/core/task_tracker_unittest.cc
+++ b/components/dom_distiller/core/task_tracker_unittest.cc
@@ -57,7 +57,7 @@ class MockSaveCallback {
 
 class DomDistillerTaskTrackerTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     message_loop_.reset(new base::MessageLoop());
     entry_id_ = "id0";
     page_0_url_ = GURL("http://www.example.com/1");
diff --git a/components/dom_distiller/core/viewer_unittest.cc b/components/dom_distiller/core/viewer_unittest.cc
index 75080b8..35e242f 100644
--- a/components/dom_distiller/core/viewer_unittest.cc
+++ b/components/dom_distiller/core/viewer_unittest.cc
@@ -75,9 +75,7 @@ class TestDomDistillerService : public DomDistillerServiceInterface {
 
 class DomDistillerViewerTest : public testing::Test {
  public:
-  virtual void SetUp() override {
-    service_.reset(new TestDomDistillerService());
-  }
+  void SetUp() override { service_.reset(new TestDomDistillerService()); }
 
  protected:
   scoped_ptr<ViewerHandle> CreateViewRequest(
diff --git a/components/dom_distiller/standalone/content_extractor.cc b/components/dom_distiller/standalone/content_extractor.cc
index b6a5a4e..8f960b2 100644
--- a/components/dom_distiller/standalone/content_extractor.cc
+++ b/components/dom_distiller/standalone/content_extractor.cc
@@ -209,11 +209,9 @@ class ContentExtractionRequest : public ViewRequestDelegate {
  private:
   ContentExtractionRequest(const GURL& url) : url_(url) {}
 
-  virtual void OnArticleUpdated(ArticleDistillationUpdate article_update)
-      override {}
+  void OnArticleUpdated(ArticleDistillationUpdate article_update) override {}
 
-  virtual void OnArticleReady(const DistilledArticleProto* article_proto)
-      override {
+  void OnArticleReady(const DistilledArticleProto* article_proto) override {
     article_proto_ = article_proto;
     CHECK(article_proto->pages_size()) << "Failed extracting " << url_;
     base::MessageLoop::current()->PostTask(
@@ -239,7 +237,7 @@ class ContentExtractor : public ContentBrowserTest {
 
   // Change behavior of the default host resolver to avoid DNS lookup errors, so
   // we can make network calls.
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     if (!CommandLine::ForCurrentProcess()->HasSwitch(kDisableDnsSwitch)) {
       EnableDNSLookupForThisTest();
     }
@@ -247,9 +245,7 @@ class ContentExtractor : public ContentBrowserTest {
     AddComponentsResources();
   }
 
-  virtual void TearDownOnMainThread() override {
-    DisableDNSLookupForThisTest();
-  }
+  void TearDownOnMainThread() override { DisableDNSLookupForThisTest(); }
 
  protected:
   // Creates the DomDistillerService and creates and starts the extraction
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
index 4d9f2e7..f1b8994 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
@@ -40,9 +40,9 @@ class EnhancedBookmarkModelTest
         last_added_(NULL),
         last_removed_(NULL),
         last_remote_id_node_(NULL) {}
-  virtual ~EnhancedBookmarkModelTest() {}
+  ~EnhancedBookmarkModelTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
     bookmark_client_.reset(new bookmarks::TestBookmarkClient());
     bookmark_model_.reset(bookmark_client_->CreateModel().release());
@@ -50,7 +50,7 @@ class EnhancedBookmarkModelTest
     model_->AddObserver(this);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (model_)
       model_->Shutdown();
     model_.reset();
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils_unittest.cc b/components/enhanced_bookmarks/enhanced_bookmark_utils_unittest.cc
index 47d0f70..7328016 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_utils_unittest.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_utils_unittest.cc
@@ -18,7 +18,7 @@ const GURL bookmark_url("http://example.com/index.html");
 class EnhancedBookmarkUtilsTest : public testing::Test {
  public:
   EnhancedBookmarkUtilsTest() {}
-  virtual ~EnhancedBookmarkUtilsTest() {}
+  ~EnhancedBookmarkUtilsTest() override {}
 
  protected:
   DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarkUtilsTest);
diff --git a/components/error_page/renderer/net_error_helper_core_unittest.cc b/components/error_page/renderer/net_error_helper_core_unittest.cc
index 2402999..0aed025 100644
--- a/components/error_page/renderer/net_error_helper_core_unittest.cc
+++ b/components/error_page/renderer/net_error_helper_core_unittest.cc
@@ -159,14 +159,12 @@ class NetErrorHelperCoreTest : public testing::Test,
     SetUpCore(false, false, true);
   }
 
-  virtual ~NetErrorHelperCoreTest() {
+  ~NetErrorHelperCoreTest() override {
     // No test finishes while an error page is being fetched.
     EXPECT_FALSE(is_url_being_fetched());
   }
 
-  virtual void SetUp() override {
-    base::StatisticsRecorder::Initialize();
-  }
+  void SetUp() override { base::StatisticsRecorder::Initialize(); }
 
   void SetUpCore(bool auto_reload_enabled,
                  bool auto_reload_visible_only,
@@ -1939,7 +1937,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadDisabled) {
 
 class NetErrorHelperCoreAutoReloadTest : public NetErrorHelperCoreTest {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     NetErrorHelperCoreTest::SetUp();
     SetUpCore(true, false, true);
   }
@@ -2243,9 +2241,7 @@ TEST_F(NetErrorHelperCoreAutoReloadTest, ShownWhileNotReloading) {
 class NetErrorHelperCoreHistogramTest
     : public NetErrorHelperCoreAutoReloadTest {
  public:
-  virtual void SetUp() override {
-    NetErrorHelperCoreAutoReloadTest::SetUp();
-  }
+  void SetUp() override { NetErrorHelperCoreAutoReloadTest::SetUp(); }
 
   static const char kCountAtStop[];
   static const char kErrorAtStop[];
diff --git a/components/feedback/feedback_common_unittest.cc b/components/feedback/feedback_common_unittest.cc
index a88a866..d3fb950 100644
--- a/components/feedback/feedback_common_unittest.cc
+++ b/components/feedback/feedback_common_unittest.cc
@@ -28,7 +28,7 @@ class FeedbackCommonTest : public testing::Test {
     feedback = scoped_refptr<FeedbackCommon>(new FeedbackCommon());
   }
 
-  virtual ~FeedbackCommonTest() {}
+  ~FeedbackCommonTest() override {}
 
   scoped_refptr<FeedbackCommon> feedback;
   userfeedback::ExtensionSubmit report;
diff --git a/components/feedback/feedback_uploader_unittest.cc b/components/feedback/feedback_uploader_unittest.cc
index 1dfa390..4985129 100644
--- a/components/feedback/feedback_uploader_unittest.cc
+++ b/components/feedback/feedback_uploader_unittest.cc
@@ -57,7 +57,7 @@ class FeedbackUploaderTest : public testing::Test {
         kRetryDelayForTest);
   }
 
-  virtual ~FeedbackUploaderTest() {
+  ~FeedbackUploaderTest() override {
     FeedbackUploaderFactory::GetInstance()->SetTestingFactory(
         context_.get(), NULL);
   }
diff --git a/components/gcm_driver/gcm_account_mapper_unittest.cc b/components/gcm_driver/gcm_account_mapper_unittest.cc
index b714e92..665e0f9 100644
--- a/components/gcm_driver/gcm_account_mapper_unittest.cc
+++ b/components/gcm_driver/gcm_account_mapper_unittest.cc
@@ -239,7 +239,7 @@ void CustomFakeGCMDriver::SetLastMessageAction(const std::string& message_id,
 class GCMAccountMapperTest : public testing::Test {
  public:
   GCMAccountMapperTest();
-  virtual ~GCMAccountMapperTest();
+  ~GCMAccountMapperTest() override;
 
   void Restart();
 
diff --git a/components/gcm_driver/gcm_channel_status_request_unittest.cc b/components/gcm_driver/gcm_channel_status_request_unittest.cc
index c551503c..8fd732f 100644
--- a/components/gcm_driver/gcm_channel_status_request_unittest.cc
+++ b/components/gcm_driver/gcm_channel_status_request_unittest.cc
@@ -15,7 +15,7 @@ namespace gcm {
 class GCMChannelStatusRequestTest : public testing::Test {
  public:
   GCMChannelStatusRequestTest();
-  virtual ~GCMChannelStatusRequestTest();
+  ~GCMChannelStatusRequestTest() override;
 
  protected:
   enum GCMStatus {
diff --git a/components/gcm_driver/gcm_client_impl_unittest.cc b/components/gcm_driver/gcm_client_impl_unittest.cc
index 9605cf0..d706276 100644
--- a/components/gcm_driver/gcm_client_impl_unittest.cc
+++ b/components/gcm_driver/gcm_client_impl_unittest.cc
@@ -236,9 +236,9 @@ class GCMClientImplTest : public testing::Test,
                           public GCMClient::Delegate {
  public:
   GCMClientImplTest();
-  virtual ~GCMClientImplTest();
+  ~GCMClientImplTest() override;
 
-  virtual void SetUp() override;
+  void SetUp() override;
 
   void SetUpUrlFetcherFactory();
 
@@ -786,9 +786,9 @@ TEST_F(GCMClientImplTest, SendMessageAcknowledged) {
 class GCMClientImplCheckinTest : public GCMClientImplTest {
  public:
   GCMClientImplCheckinTest();
-  virtual ~GCMClientImplCheckinTest();
+  ~GCMClientImplCheckinTest() override;
 
-  virtual void SetUp() override;
+  void SetUp() override;
 };
 
 GCMClientImplCheckinTest::GCMClientImplCheckinTest() {
@@ -1015,9 +1015,9 @@ TEST_F(GCMClientImplCheckinTest, CheckinWhenAccountReplaced) {
 class GCMClientImplStartAndStopTest : public GCMClientImplTest {
 public:
   GCMClientImplStartAndStopTest();
-  virtual ~GCMClientImplStartAndStopTest();
+  ~GCMClientImplStartAndStopTest() override;
 
-  virtual void SetUp() override;
+  void SetUp() override;
 
   void DefaultCompleteCheckin();
 };
diff --git a/components/gcm_driver/gcm_delayed_task_controller_unittest.cc b/components/gcm_driver/gcm_delayed_task_controller_unittest.cc
index 9b49d42..28f5d6e 100644
--- a/components/gcm_driver/gcm_delayed_task_controller_unittest.cc
+++ b/components/gcm_driver/gcm_delayed_task_controller_unittest.cc
@@ -12,7 +12,7 @@ namespace gcm {
 class GCMDelayedTaskControllerTest : public testing::Test {
  public:
   GCMDelayedTaskControllerTest();
-  virtual ~GCMDelayedTaskControllerTest();
+  ~GCMDelayedTaskControllerTest() override;
 
   void TestTask();
 
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc
index 8d9211b..7ccc5bd 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -99,11 +99,11 @@ class GCMDriverTest : public testing::Test {
   };
 
   GCMDriverTest();
-  virtual ~GCMDriverTest();
+  ~GCMDriverTest() override;
 
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   GCMDriverDesktop* driver() { return driver_.get(); }
   FakeGCMAppHandler* gcm_app_handler() { return gcm_app_handler_.get(); }
@@ -681,10 +681,10 @@ TEST_F(GCMDriverTest, GCMClientNotReadyBeforeSending) {
 class GCMDriverFunctionalTest : public GCMDriverTest {
  public:
   GCMDriverFunctionalTest();
-  virtual ~GCMDriverFunctionalTest();
+  ~GCMDriverFunctionalTest() override;
 
   // GCMDriverTest:
-  virtual void SetUp() override;
+  void SetUp() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GCMDriverFunctionalTest);
@@ -989,10 +989,10 @@ TEST_F(GCMDriverFunctionalTest, MessagesDeleted) {
 class GCMChannelStatusSyncerTest : public GCMDriverTest {
  public:
   GCMChannelStatusSyncerTest();
-  virtual ~GCMChannelStatusSyncerTest();
+  ~GCMChannelStatusSyncerTest() override;
 
   // testing::Test:
-  virtual void SetUp() override;
+  void SetUp() override;
 
   void CompleteGCMChannelStatusRequest(bool enabled, int poll_interval_seconds);
   bool CompareDelaySeconds(bool expected_delay_seconds,
diff --git a/components/gcm_driver/gcm_stats_recorder_impl_unittest.cc b/components/gcm_driver/gcm_stats_recorder_impl_unittest.cc
index c6c6fd2..1223f67 100644
--- a/components/gcm_driver/gcm_stats_recorder_impl_unittest.cc
+++ b/components/gcm_driver/gcm_stats_recorder_impl_unittest.cc
@@ -100,8 +100,8 @@ static const char kIncomingSendErrorDetails[] = "";
 class GCMStatsRecorderImplTest : public testing::Test {
  public:
   GCMStatsRecorderImplTest();
-  virtual ~GCMStatsRecorderImplTest();
-  virtual void SetUp() override;
+  ~GCMStatsRecorderImplTest() override;
+  void SetUp() override;
 
   void VerifyRecordedCheckinCount(int expected_count) {
     EXPECT_EQ(expected_count,
diff --git a/components/google/core/browser/google_url_tracker_unittest.cc b/components/google/core/browser/google_url_tracker_unittest.cc
index 0303d93..675fc3d 100644
--- a/components/google/core/browser/google_url_tracker_unittest.cc
+++ b/components/google/core/browser/google_url_tracker_unittest.cc
@@ -207,11 +207,11 @@ int TestInfoBarManager::GetActiveEntryID() {
 class GoogleURLTrackerTest : public testing::Test {
  protected:
   GoogleURLTrackerTest();
-  virtual ~GoogleURLTrackerTest();
+  ~GoogleURLTrackerTest() override;
 
   // testing::Test
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   net::TestURLFetcher* GetFetcher();
   void MockSearchDomainCheckResponse(const std::string& domain);
diff --git a/components/history/core/browser/url_database_unittest.cc b/components/history/core/browser/url_database_unittest.cc
index 000d70c..1ecced9 100644
--- a/components/history/core/browser/url_database_unittest.cc
+++ b/components/history/core/browser/url_database_unittest.cc
@@ -45,7 +45,7 @@ class URLDatabaseTest : public testing::Test,
 
  private:
   // Test setup.
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath db_file = temp_dir_.path().AppendASCII("URLTest.db");
 
@@ -57,9 +57,7 @@ class URLDatabaseTest : public testing::Test,
     InitKeywordSearchTermsTable();
     CreateKeywordSearchTermsIndices();
   }
-  virtual void TearDown() {
-    db_.Close();
-  }
+  void TearDown() override { db_.Close(); }
 
   base::ScopedTempDir temp_dir_;
   sql::Connection db_;
diff --git a/components/invalidation/gcm_network_channel_unittest.cc b/components/invalidation/gcm_network_channel_unittest.cc
index 4204535..060b834 100644
--- a/components/invalidation/gcm_network_channel_unittest.cc
+++ b/components/invalidation/gcm_network_channel_unittest.cc
@@ -125,10 +125,9 @@ class GCMNetworkChannelTest
         url_fetchers_created_count_(0),
         last_invalidator_state_(TRANSIENT_INVALIDATION_ERROR) {}
 
-  virtual ~GCMNetworkChannelTest() {
-  }
+  ~GCMNetworkChannelTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         base::MessageLoopProxy::current());
     // Ownership of delegate goes to GCNMentworkChannel but test needs pointer
@@ -147,9 +146,7 @@ class GCMNetworkChannelTest
             base::Unretained(this))));
   }
 
-  virtual void TearDown() {
-    gcm_network_channel_->RemoveObserver(this);
-  }
+  void TearDown() override { gcm_network_channel_->RemoveObserver(this); }
 
   // Helper functions to call private methods from test
   GURL BuildUrl(const std::string& registration_id) {
diff --git a/components/invalidation/p2p_invalidator_unittest.cc b/components/invalidation/p2p_invalidator_unittest.cc
index a56dace..2065deb 100644
--- a/components/invalidation/p2p_invalidator_unittest.cc
+++ b/components/invalidation/p2p_invalidator_unittest.cc
@@ -93,7 +93,7 @@ class P2PInvalidatorTest : public testing::Test {
     delegate_.GetInvalidator()->RegisterHandler(&fake_handler_);
   }
 
-  virtual ~P2PInvalidatorTest() {
+  ~P2PInvalidatorTest() override {
     delegate_.GetInvalidator()->UnregisterHandler(&fake_handler_);
   }
 
diff --git a/components/invalidation/push_client_channel_unittest.cc b/components/invalidation/push_client_channel_unittest.cc
index 6ffab4f..3e2104d 100644
--- a/components/invalidation/push_client_channel_unittest.cc
+++ b/components/invalidation/push_client_channel_unittest.cc
@@ -29,7 +29,7 @@ class PushClientChannelTest
     push_client_channel_.SetSystemResources(NULL);
   }
 
-  virtual ~PushClientChannelTest() {
+  ~PushClientChannelTest() override {
     push_client_channel_.RemoveObserver(this);
   }
 
diff --git a/components/invalidation/registration_manager_unittest.cc b/components/invalidation/registration_manager_unittest.cc
index c7bd729..b98de58 100644
--- a/components/invalidation/registration_manager_unittest.cc
+++ b/components/invalidation/registration_manager_unittest.cc
@@ -148,7 +148,7 @@ class RegistrationManagerTest : public testing::Test {
   RegistrationManagerTest()
       : fake_registration_manager_(&fake_invalidation_client_) {}
 
-  virtual ~RegistrationManagerTest() {}
+  ~RegistrationManagerTest() override {}
 
   void LoseRegistrations(const ObjectIdSet& oids) {
     for (ObjectIdSet::const_iterator it = oids.begin(); it != oids.end();
diff --git a/components/invalidation/sync_invalidation_listener_unittest.cc b/components/invalidation/sync_invalidation_listener_unittest.cc
index 3e1caf1..29fd0b2 100644
--- a/components/invalidation/sync_invalidation_listener_unittest.cc
+++ b/components/invalidation/sync_invalidation_listener_unittest.cc
@@ -264,7 +264,7 @@ class SyncInvalidationListenerTest : public testing::Test {
             scoped_ptr<notifier::PushClient>(fake_push_client_)))),
         fake_delegate_(&listener_) {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     StartClient();
 
     registered_ids_.insert(kBookmarksId_);
@@ -272,9 +272,7 @@ class SyncInvalidationListenerTest : public testing::Test {
     listener_.UpdateRegisteredIds(registered_ids_);
   }
 
-  virtual void TearDown() {
-    StopClient();
-  }
+  void TearDown() override { StopClient(); }
 
   // Restart client without re-registering IDs.
   void RestartClient() {
@@ -1062,7 +1060,7 @@ TEST_F(SyncInvalidationListenerTest, InvalidationClientAuthError) {
 class SyncInvalidationListenerTest_WithInitialState
     : public SyncInvalidationListenerTest {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     UnackedInvalidationSet bm_state(kBookmarksId_);
     UnackedInvalidationSet ext_state(kExtensionsId_);
 
diff --git a/components/invalidation/sync_system_resources_unittest.cc b/components/invalidation/sync_system_resources_unittest.cc
index ea2fb52..3501f1e 100644
--- a/components/invalidation/sync_system_resources_unittest.cc
+++ b/components/invalidation/sync_system_resources_unittest.cc
@@ -54,7 +54,7 @@ class SyncSystemResourcesTest : public testing::Test {
             scoped_ptr<notifier::PushClient>(new notifier::FakePushClient())),
         sync_system_resources_(&push_client_channel_, &mock_state_writer_) {}
 
-  virtual ~SyncSystemResourcesTest() {}
+  ~SyncSystemResourcesTest() override {}
 
   void ScheduleShouldNotRun() {
     {
@@ -212,9 +212,7 @@ class SyncNetworkChannelTest
             this, &SyncNetworkChannelTest::OnNetworkStatusChange));
   }
 
-  virtual ~SyncNetworkChannelTest() {
-    network_channel_.RemoveObserver(this);
-  }
+  ~SyncNetworkChannelTest() override { network_channel_.RemoveObserver(this); }
 
   void OnNetworkChannelStateChanged(
       InvalidatorState invalidator_state) override {
diff --git a/components/keyed_service/content/browser_context_dependency_manager.h b/components/keyed_service/content/browser_context_dependency_manager.h
index 639b63d..18a273f 100644
--- a/components/keyed_service/content/browser_context_dependency_manager.h
+++ b/components/keyed_service/content/browser_context_dependency_manager.h
@@ -87,11 +87,11 @@ class KEYED_SERVICE_EXPORT BrowserContextDependencyManager
                                       bool is_testing_context);
 
   BrowserContextDependencyManager();
-  virtual ~BrowserContextDependencyManager();
+  ~BrowserContextDependencyManager() override;
 
 #ifndef NDEBUG
   // DependencyManager:
-  virtual void DumpContextDependencies(
+  void DumpContextDependencies(
       const base::SupportsUserData* context) const final;
 #endif  // NDEBUG
 
diff --git a/components/keyed_service/content/browser_context_keyed_base_factory.h b/components/keyed_service/content/browser_context_keyed_base_factory.h
index c7603af..f589e78 100644
--- a/components/keyed_service/content/browser_context_keyed_base_factory.h
+++ b/components/keyed_service/content/browser_context_keyed_base_factory.h
@@ -43,7 +43,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedBaseFactory
  protected:
   BrowserContextKeyedBaseFactory(const char* name,
                                  BrowserContextDependencyManager* manager);
-  virtual ~BrowserContextKeyedBaseFactory();
+  ~BrowserContextKeyedBaseFactory() override;
 
   // Interface for people building a concrete FooServiceFactory: --------------
 
@@ -61,7 +61,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedBaseFactory
   // TestingBrowserContext is NULL. (This is just a shortcut around
   // SetTestingFactory() to make sure our contexts don't directly refer to the
   // services they use.)
-  virtual bool ServiceIsNULLWhileTesting() const override;
+  bool ServiceIsNULLWhileTesting() const override;
 
   // Interface for people building a type of BrowserContextKeyedFactory: -------
 
@@ -102,17 +102,17 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedBaseFactory
   virtual void CreateServiceNow(content::BrowserContext* context) = 0;
 
   // KeyedServiceBaseFactory:
-  virtual user_prefs::PrefRegistrySyncable* GetAssociatedPrefRegistry(
+  user_prefs::PrefRegistrySyncable* GetAssociatedPrefRegistry(
       base::SupportsUserData* context) const final;
-  virtual base::SupportsUserData* GetContextToUse(
+  base::SupportsUserData* GetContextToUse(
       base::SupportsUserData* context) const final;
-  virtual bool ServiceIsCreatedWithContext() const final;
-  virtual void ContextShutdown(base::SupportsUserData* context) final;
-  virtual void ContextDestroyed(base::SupportsUserData* context) final;
-  virtual void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) final;
-  virtual void SetEmptyTestingFactory(base::SupportsUserData* context) final;
-  virtual bool HasTestingFactory(base::SupportsUserData* context) final;
-  virtual void CreateServiceNow(base::SupportsUserData* context) final;
+  bool ServiceIsCreatedWithContext() const final;
+  void ContextShutdown(base::SupportsUserData* context) final;
+  void ContextDestroyed(base::SupportsUserData* context) final;
+  void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) final;
+  void SetEmptyTestingFactory(base::SupportsUserData* context) final;
+  bool HasTestingFactory(base::SupportsUserData* context) final;
+  void CreateServiceNow(base::SupportsUserData* context) final;
 };
 
 #endif  // COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_BASE_FACTORY_H_
diff --git a/components/leveldb_proto/proto_database_impl_unittest.cc b/components/leveldb_proto/proto_database_impl_unittest.cc
index 5120452..095b9d4 100644
--- a/components/leveldb_proto/proto_database_impl_unittest.cc
+++ b/components/leveldb_proto/proto_database_impl_unittest.cc
@@ -83,13 +83,13 @@ void ExpectEntryPointersEquals(EntryMap expected,
 
 class ProtoDatabaseImplTest : public testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     main_loop_.reset(new MessageLoop());
     db_.reset(
         new ProtoDatabaseImpl<TestProto>(main_loop_->message_loop_proxy()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     db_.reset();
     base::RunLoop().RunUntilIdle();
     main_loop_.reset();
diff --git a/components/login/screens/screen_context_unittest.cc b/components/login/screens/screen_context_unittest.cc
index 4deac92..c6a75b1 100644
--- a/components/login/screens/screen_context_unittest.cc
+++ b/components/login/screens/screen_context_unittest.cc
@@ -14,11 +14,11 @@ namespace login {
 class ScreenContextTest : public testing::Test {
  public:
   ScreenContextTest() {}
-  virtual ~ScreenContextTest() {}
+  ~ScreenContextTest() override {}
 
-  virtual void SetUp() { context_.reset(new ScreenContext()); }
+  void SetUp() override { context_.reset(new ScreenContext()); }
 
-  virtual void TearDown() {}
+  void TearDown() override {}
 
  protected:
   ScreenContext& context() { return *context_.get(); }
diff --git a/components/metrics/gpu/gpu_metrics_provider_unittest.cc b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
index 64f9579..931b731 100644
--- a/components/metrics/gpu/gpu_metrics_provider_unittest.cc
+++ b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
@@ -42,7 +42,7 @@ class TestGPUMetricsProvider : public GPUMetricsProvider {
 class GPUMetricsProviderTest : public testing::Test {
  public:
   GPUMetricsProviderTest() {}
-  virtual ~GPUMetricsProviderTest() {}
+  ~GPUMetricsProviderTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GPUMetricsProviderTest);
diff --git a/components/metrics/metrics_log_unittest.cc b/components/metrics/metrics_log_unittest.cc
index da38382..4a3650b 100644
--- a/components/metrics/metrics_log_unittest.cc
+++ b/components/metrics/metrics_log_unittest.cc
@@ -93,8 +93,7 @@ class MetricsLogTest : public testing::Test {
     MetricsStateManager::RegisterPrefs(prefs_.registry());
   }
 
-  virtual ~MetricsLogTest() {
-  }
+  ~MetricsLogTest() override {}
 
  protected:
   // Check that the values in |system_values| correspond to the test data
diff --git a/components/metrics/metrics_reporting_scheduler_unittest.cc b/components/metrics/metrics_reporting_scheduler_unittest.cc
index 2a13c1b..ee80cc7 100644
--- a/components/metrics/metrics_reporting_scheduler_unittest.cc
+++ b/components/metrics/metrics_reporting_scheduler_unittest.cc
@@ -15,7 +15,7 @@ namespace metrics {
 class MetricsReportingSchedulerTest : public testing::Test {
  public:
   MetricsReportingSchedulerTest() : callback_call_count_(0) {}
-  virtual ~MetricsReportingSchedulerTest() {}
+  ~MetricsReportingSchedulerTest() override {}
 
   base::Closure GetCallback() {
     return base::Bind(&MetricsReportingSchedulerTest::SchedulerCallback,
diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc
index 0c5d6ea..5a8ba66 100644
--- a/components/metrics/metrics_service_unittest.cc
+++ b/components/metrics/metrics_service_unittest.cc
@@ -99,7 +99,7 @@ class MetricsServiceTest : public testing::Test {
         base::Bind(&ReturnNoBackup));
   }
 
-  virtual ~MetricsServiceTest() {
+  ~MetricsServiceTest() override {
     MetricsService::SetExecutionPhase(MetricsService::UNINITIALIZED_PHASE,
                                       GetLocalState());
   }
diff --git a/components/metrics/serialization/serialization_utils_unittest.cc b/components/metrics/serialization/serialization_utils_unittest.cc
index aa1c724..083735c 100644
--- a/components/metrics/serialization/serialization_utils_unittest.cc
+++ b/components/metrics/serialization/serialization_utils_unittest.cc
@@ -25,9 +25,7 @@ class SerializationUtilsTest : public testing::Test {
     }
   }
 
-  virtual void SetUp() override {
-    base::DeleteFile(filepath, false);
-  }
+  void SetUp() override { base::DeleteFile(filepath, false); }
 
   void TestSerialization(MetricSample* sample) {
     std::string serialized(sample->ToString());
diff --git a/components/nacl/browser/nacl_file_host_unittest.cc b/components/nacl/browser/nacl_file_host_unittest.cc
index 292ac46..89f726c 100644
--- a/components/nacl/browser/nacl_file_host_unittest.cc
+++ b/components/nacl/browser/nacl_file_host_unittest.cc
@@ -35,14 +35,14 @@ class FileHostTestNaClBrowserDelegate : public TestNaClBrowserDelegate {
 class NaClFileHostTest : public testing::Test {
  protected:
   NaClFileHostTest();
-  virtual ~NaClFileHostTest();
+  ~NaClFileHostTest() override;
 
-  virtual void SetUp() override {
+  void SetUp() override {
     nacl_browser_delegate_ = new FileHostTestNaClBrowserDelegate;
     nacl::NaClBrowser::SetDelegate(nacl_browser_delegate_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // This deletes nacl_browser_delegate_.
     nacl::NaClBrowser::SetDelegate(NULL);
   }
diff --git a/components/nacl/browser/nacl_validation_cache_unittest.cc b/components/nacl/browser/nacl_validation_cache_unittest.cc
index 3b52ca7..945db2f 100644
--- a/components/nacl/browser/nacl_validation_cache_unittest.cc
+++ b/components/nacl/browser/nacl_validation_cache_unittest.cc
@@ -20,7 +20,7 @@ class NaClValidationCacheTest : public ::testing::Test {
   NaClValidationCache cache1;
   NaClValidationCache cache2;
 
-  virtual void SetUp() {
+  void SetUp() override {
     // The compiler chokes if std::string(key1) is passed directly as an arg.
     std::string key(key1);
     cache1.SetValidationCacheKey(key);
diff --git a/components/nacl/browser/pnacl_host_unittest.cc b/components/nacl/browser/pnacl_host_unittest.cc
index 8326932..3f2d3ef 100644
--- a/components/nacl/browser/pnacl_host_unittest.cc
+++ b/components/nacl/browser/pnacl_host_unittest.cc
@@ -37,14 +37,14 @@ class PnaclHostTest : public testing::Test {
         temp_callback_count_(0),
         write_callback_count_(0),
         thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
-  virtual void SetUp() {
+  void SetUp() override {
     host_ = new PnaclHost();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     host_->InitForTest(temp_dir_.path(), true);
     base::RunLoop().RunUntilIdle();
     EXPECT_EQ(PnaclHost::CacheReady, host_->cache_state_);
   }
-  virtual void TearDown() {
+  void TearDown() override {
     EXPECT_EQ(0U, host_->pending_translations());
     // Give the host a chance to de-init the backend, and then delete it.
     host_->RendererClosing(0);
@@ -436,7 +436,7 @@ TEST_F(PnaclHostTest, ClearTranslationCache) {
 // A version of PnaclHostTest that initializes cache on disk.
 class PnaclHostTestDisk : public PnaclHostTest {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     host_ = new PnaclHost();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     host_->InitForTest(temp_dir_.path(), false);
diff --git a/components/nacl/browser/pnacl_translation_cache_unittest.cc b/components/nacl/browser/pnacl_translation_cache_unittest.cc
index 98cfbe7..bfc3052 100644
--- a/components/nacl/browser/pnacl_translation_cache_unittest.cc
+++ b/components/nacl/browser/pnacl_translation_cache_unittest.cc
@@ -26,9 +26,9 @@ class PnaclTranslationCacheTest : public testing::Test {
  protected:
   PnaclTranslationCacheTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
-  virtual ~PnaclTranslationCacheTest() {}
-  virtual void SetUp() { cache_.reset(new PnaclTranslationCache()); }
-  virtual void TearDown() {
+  ~PnaclTranslationCacheTest() override {}
+  void SetUp() override { cache_.reset(new PnaclTranslationCache()); }
+  void TearDown() override {
     // The destructor of PnaclTranslationCacheWriteEntry posts a task to the IO
     // thread to close the backend cache entry. We want to make sure the entries
     // are closed before we delete the backend (and in particular the destructor
diff --git a/components/nacl/loader/nacl_ipc_adapter_unittest.cc b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
index 99f4638..826b41d 100644
--- a/components/nacl/loader/nacl_ipc_adapter_unittest.cc
+++ b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
@@ -24,7 +24,7 @@ class NaClIPCAdapterTest : public testing::Test {
   NaClIPCAdapterTest() {}
 
   // testing::Test implementation.
-  virtual void SetUp() override {
+  void SetUp() override {
     sink_ = new IPC::TestSink;
 
     // Takes ownership of the sink_ pointer. Note we provide the current message
@@ -33,7 +33,7 @@ class NaClIPCAdapterTest : public testing::Test {
     adapter_ = new NaClIPCAdapter(scoped_ptr<IPC::Channel>(sink_),
                                   base::MessageLoopProxy::current().get());
   }
-  virtual void TearDown() override {
+  void TearDown() override {
     sink_ = NULL;  // This pointer is actually owned by the IPCAdapter.
     adapter_ = NULL;
     // The adapter destructor has to post a task to destroy the Channel on the
diff --git a/components/nacl/loader/nacl_validation_query_unittest.cc b/components/nacl/loader/nacl_validation_query_unittest.cc
index 6c2dfa8..9c03ce3f 100644
--- a/components/nacl/loader/nacl_validation_query_unittest.cc
+++ b/components/nacl/loader/nacl_validation_query_unittest.cc
@@ -101,7 +101,7 @@ class NaClValidationQueryTest : public ::testing::Test {
   scoped_ptr<TestQuery> query1;
   scoped_ptr<TestQuery> query2;
 
-  virtual void SetUp() {
+  void SetUp() override {
     query1.reset(new TestQuery(kKey, kVersion));
     query2.reset(new TestQuery(kKey, kVersion));
   }
diff --git a/components/nacl/loader/nonsfi/nonsfi_listener.h b/components/nacl/loader/nonsfi/nonsfi_listener.h
index de869f2..e755e85 100644
--- a/components/nacl/loader/nonsfi/nonsfi_listener.h
+++ b/components/nacl/loader/nonsfi/nonsfi_listener.h
@@ -29,14 +29,14 @@ namespace nonsfi {
 class NonSfiListener : public IPC::Listener {
  public:
   NonSfiListener();
-  virtual ~NonSfiListener();
+  ~NonSfiListener() override;
 
   // Listen for a request to launch a non-SFI NaCl module.
   void Listen();
   bool Send(IPC::Message* msg);
 
  private:
-  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  bool OnMessageReceived(const IPC::Message& msg) override;
   void OnStart(const nacl::NaClStartParams& params);
 
   base::Thread io_thread_;
diff --git a/components/nacl/loader/nonsfi/nonsfi_main.cc b/components/nacl/loader/nonsfi/nonsfi_main.cc
index c053586..f452a49 100644
--- a/components/nacl/loader/nonsfi/nonsfi_main.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_main.cc
@@ -28,10 +28,9 @@ class PluginMainDelegate : public base::PlatformThread::Delegate {
       : entry_point_(entry_point) {
   }
 
-  virtual ~PluginMainDelegate() {
-  }
+  ~PluginMainDelegate() override {}
 
-  virtual void ThreadMain() override {
+  void ThreadMain() override {
     base::PlatformThread::SetName("NaClMainThread");
 
     // This will only happen once per process, so we give the permission to
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox.h b/components/nacl/loader/nonsfi/nonsfi_sandbox.h
index 83efd7c..2441ff3 100644
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox.h
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox.h
@@ -18,11 +18,10 @@ namespace nonsfi {
 class NaClNonSfiBPFSandboxPolicy : public sandbox::bpf_dsl::Policy {
  public:
   explicit NaClNonSfiBPFSandboxPolicy() {}
-  virtual ~NaClNonSfiBPFSandboxPolicy() {}
+  ~NaClNonSfiBPFSandboxPolicy() override {}
 
-  virtual sandbox::bpf_dsl::ResultExpr EvaluateSyscall(
-      int sysno) const override;
-  virtual sandbox::bpf_dsl::ResultExpr InvalidSyscall() const override;
+  sandbox::bpf_dsl::ResultExpr EvaluateSyscall(int sysno) const override;
+  sandbox::bpf_dsl::ResultExpr InvalidSyscall() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NaClNonSfiBPFSandboxPolicy);
diff --git a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
index 9bd807e..0a8085a 100644
--- a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
+++ b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
@@ -38,10 +38,10 @@ class NaClBPFSandboxPolicy : public sandbox::bpf_dsl::Policy {
  public:
   NaClBPFSandboxPolicy()
       : baseline_policy_(content::GetBPFSandboxBaselinePolicy()) {}
-  virtual ~NaClBPFSandboxPolicy() {}
+  ~NaClBPFSandboxPolicy() override {}
 
-  virtual ResultExpr EvaluateSyscall(int system_call_number) const override;
-  virtual ResultExpr InvalidSyscall() const override {
+  ResultExpr EvaluateSyscall(int system_call_number) const override;
+  ResultExpr InvalidSyscall() const override {
     return baseline_policy_->InvalidSyscall();
   }
 
diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.h b/components/nacl/zygote/nacl_fork_delegate_linux.h
index 5d7b6b8..ba79a7c 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.h
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.h
@@ -34,20 +34,23 @@ void AddNaClZygoteForkDelegates(
 class NaClForkDelegate : public content::ZygoteForkDelegate {
  public:
   explicit NaClForkDelegate(bool nonsfi_mode);
-  virtual ~NaClForkDelegate();
-
-  virtual void Init(int sandboxdesc, bool enable_layer1_sandbox) override;
-  virtual void InitialUMA(std::string* uma_name,
-                          int* uma_sample,
-                          int* uma_boundary_value) override;
-  virtual bool CanHelp(const std::string& process_type, std::string* uma_name,
-                          int* uma_sample, int* uma_boundary_value) override;
-  virtual pid_t Fork(const std::string& process_type,
-                     const std::vector<int>& fds,
-                     const std::string& channel_id) override;
-  virtual bool GetTerminationStatus(pid_t pid, bool known_dead,
-                                    base::TerminationStatus* status,
-                                    int* exit_code) override;
+  ~NaClForkDelegate() override;
+
+  void Init(int sandboxdesc, bool enable_layer1_sandbox) override;
+  void InitialUMA(std::string* uma_name,
+                  int* uma_sample,
+                  int* uma_boundary_value) override;
+  bool CanHelp(const std::string& process_type,
+               std::string* uma_name,
+               int* uma_sample,
+               int* uma_boundary_value) override;
+  pid_t Fork(const std::string& process_type,
+             const std::vector<int>& fds,
+             const std::string& channel_id) override;
+  bool GetTerminationStatus(pid_t pid,
+                            bool known_dead,
+                            base::TerminationStatus* status,
+                            int* exit_code) override;
 
  private:
   static void AddPassthroughEnvToOptions(base::LaunchOptions* options);
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
index a55cda3..801efe4 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
+++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
@@ -184,11 +184,9 @@ class InterceptNavigationResourceThrottleTest
         io_thread_state_(NULL) {
   }
 
-  virtual void SetUp() override {
-    RenderViewHostTestHarness::SetUp();
-  }
+  void SetUp() override { RenderViewHostTestHarness::SetUp(); }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (web_contents())
       web_contents()->SetDelegate(NULL);
 
diff --git a/components/network_time/network_time_tracker_unittest.cc b/components/network_time/network_time_tracker_unittest.cc
index a401fff..b2352c0 100644
--- a/components/network_time/network_time_tracker_unittest.cc
+++ b/components/network_time/network_time_tracker_unittest.cc
@@ -42,9 +42,9 @@ class TestTickClock : public base::TickClock {
 
 class NetworkTimeTrackerTest : public testing::Test {
  public:
-  virtual ~NetworkTimeTrackerTest() {}
+  ~NetworkTimeTrackerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     NetworkTimeTracker::RegisterPrefs(pref_service_.registry());
 
     now_ = base::Time::NowFromSystemTime();
diff --git a/components/omnibox/autocomplete_result_unittest.cc b/components/omnibox/autocomplete_result_unittest.cc
index 534831e..9da4d45 100644
--- a/components/omnibox/autocomplete_result_unittest.cc
+++ b/components/omnibox/autocomplete_result_unittest.cc
@@ -88,7 +88,7 @@ class AutocompleteResultTest : public testing::Test  {
     variations::testing::ClearAllVariationParams();
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     template_url_service_.reset(new TemplateURLService(NULL, 0));
     template_url_service_->Load();
   }
diff --git a/components/omnibox/base_search_provider_unittest.cc b/components/omnibox/base_search_provider_unittest.cc
index 42a9f18..dc07827 100644
--- a/components/omnibox/base_search_provider_unittest.cc
+++ b/components/omnibox/base_search_provider_unittest.cc
@@ -93,10 +93,10 @@ class TestBaseSearchProvider : public BaseSearchProvider {
 
 class BaseSearchProviderTest : public testing::Test {
  public:
-  virtual ~BaseSearchProviderTest() {}
+  ~BaseSearchProviderTest() override {}
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     service_.reset(
         new TemplateURLService(NULL,
                                scoped_ptr<SearchTermsData>(new SearchTermsData),
diff --git a/components/omnibox/keyword_provider_unittest.cc b/components/omnibox/keyword_provider_unittest.cc
index fef9a6c..cbfc0b9 100644
--- a/components/omnibox/keyword_provider_unittest.cc
+++ b/components/omnibox/keyword_provider_unittest.cc
@@ -47,10 +47,10 @@ class KeywordProviderTest : public testing::Test {
   };
 
   KeywordProviderTest() : kw_provider_(NULL) { }
-  virtual ~KeywordProviderTest() { }
+  ~KeywordProviderTest() override {}
 
-  virtual void SetUp();
-  virtual void TearDown();
+  void SetUp() override;
+  void TearDown() override;
 
   template<class ResultType>
   void RunTest(TestData<ResultType>* keyword_cases,
diff --git a/components/os_crypt/os_crypt_unittest.cc b/components/os_crypt/os_crypt_unittest.cc
index bd7aef7..7f742ba 100644
--- a/components/os_crypt/os_crypt_unittest.cc
+++ b/components/os_crypt/os_crypt_unittest.cc
@@ -17,7 +17,7 @@ class OSCryptTest : public testing::Test {
  public:
   OSCryptTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
 #if defined(OS_MACOSX)
     OSCrypt::UseMockKeychain(true);
 #endif
diff --git a/components/ownership/mock_owner_key_util.h b/components/ownership/mock_owner_key_util.h
index 7c4f9cd..4b0cc8d 100644
--- a/components/ownership/mock_owner_key_util.h
+++ b/components/ownership/mock_owner_key_util.h
@@ -25,9 +25,8 @@ class OWNERSHIP_EXPORT MockOwnerKeyUtil : public OwnerKeyUtil {
   // OwnerKeyUtil implementation:
   bool ImportPublicKey(std::vector<uint8>* output) override;
 #if defined(USE_NSS)
-  virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
-      const std::vector<uint8>& key,
-      PK11SlotInfo* slot) override;
+  crypto::RSAPrivateKey* FindPrivateKeyInSlot(const std::vector<uint8>& key,
+                                              PK11SlotInfo* slot) override;
 #endif  // defined(USE_NSS)
   bool IsPublicKeyPresent() override;
 
diff --git a/components/ownership/owner_key_util_impl.h b/components/ownership/owner_key_util_impl.h
index b6f18a7..9358cca 100644
--- a/components/ownership/owner_key_util_impl.h
+++ b/components/ownership/owner_key_util_impl.h
@@ -22,9 +22,8 @@ class OWNERSHIP_EXPORT OwnerKeyUtilImpl : public OwnerKeyUtil {
   // OwnerKeyUtil implementation:
   bool ImportPublicKey(std::vector<uint8>* output) override;
 #if defined(USE_NSS)
-  virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
-      const std::vector<uint8>& key,
-      PK11SlotInfo* slot) override;
+  crypto::RSAPrivateKey* FindPrivateKeyInSlot(const std::vector<uint8>& key,
+                                              PK11SlotInfo* slot) override;
 #endif  // defined(USE_NSS)
   bool IsPublicKeyPresent() override;
 
diff --git a/components/ownership/owner_key_util_impl_unittest.cc b/components/ownership/owner_key_util_impl_unittest.cc
index 950201e..d79b3b2 100644
--- a/components/ownership/owner_key_util_impl_unittest.cc
+++ b/components/ownership/owner_key_util_impl_unittest.cc
@@ -49,9 +49,9 @@ const uint8 kTestKeyData[] = {
 class OwnerKeyUtilImplTest : public testing::Test {
  protected:
   OwnerKeyUtilImplTest() {}
-  virtual ~OwnerKeyUtilImplTest() {}
+  ~OwnerKeyUtilImplTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(tmpdir_.CreateUniqueTempDir());
     key_file_ = tmpdir_.path().Append(FILE_PATH_LITERAL("key"));
     util_ = new OwnerKeyUtilImpl(key_file_);
diff --git a/components/ownership/owner_settings_service.h b/components/ownership/owner_settings_service.h
index db36595..a1d7c52 100644
--- a/components/ownership/owner_settings_service.h
+++ b/components/ownership/owner_settings_service.h
@@ -59,7 +59,7 @@ class OWNERSHIP_EXPORT OwnerSettingsService : public KeyedService {
 
   explicit OwnerSettingsService(
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
-  virtual ~OwnerSettingsService();
+  ~OwnerSettingsService() override;
 
   base::WeakPtr<OwnerSettingsService> as_weak_ptr() {
     return weak_factory_.GetWeakPtr();
diff --git a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
index 2b16656..bdefff8 100644
--- a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
+++ b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
@@ -79,7 +79,7 @@ class ContentCredentialManagerDispatcherTest
  public:
   ContentCredentialManagerDispatcherTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
     store_ = new TestPasswordStore;
     client_.reset(new TestPasswordManagerClient(store_.get()));
@@ -99,7 +99,7 @@ class ContentCredentialManagerDispatcherTest
     EXPECT_TRUE(store_->IsEmpty());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     store_->Shutdown();
     content::RenderViewHostTestHarness::TearDown();
   }
diff --git a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
index ad35b1d..4d4de67 100644
--- a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
+++ b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
@@ -20,15 +20,15 @@ class CredentialManagerClientTest : public content::RenderViewTest {
  public:
   CredentialManagerClientTest()
       : callback_errored_(false), callback_succeeded_(false) {}
-  virtual ~CredentialManagerClientTest() {}
+  ~CredentialManagerClientTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     content::RenderViewTest::SetUp();
     credential_.reset(new blink::WebLocalCredential("", "", GURL(), ""));
     client_.reset(new CredentialManagerClient(view_));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     credential_.reset();
     content::RenderViewTest::TearDown();
   }
diff --git a/components/password_manager/core/browser/login_database_unittest.cc b/components/password_manager/core/browser/login_database_unittest.cc
index 4dd83f8..e3fe7e5 100644
--- a/components/password_manager/core/browser/login_database_unittest.cc
+++ b/components/password_manager/core/browser/login_database_unittest.cc
@@ -42,7 +42,7 @@ std::vector<base::string16> DeserializeVector(const Pickle& pickle);
 
 class LoginDatabaseTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     file_ = temp_dir_.path().AppendASCII("TestMetadataStoreMacDatabase");
 
diff --git a/components/password_manager/core/browser/password_autofill_manager_unittest.cc b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
index 99e43c2..c2056c1 100644
--- a/components/password_manager/core/browser/password_autofill_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
@@ -72,7 +72,7 @@ class PasswordAutofillManagerTest : public testing::Test {
       : test_username_(base::ASCIIToUTF16(kAliceUsername)),
         test_password_(base::ASCIIToUTF16(kAlicePassword)) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Add a preferred login and an additional login to the FillData.
     username_field_.name = base::ASCIIToUTF16(kUsernameName);
     username_field_.value = test_username_;
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index 9219429..c38ed9a 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -153,7 +153,7 @@ class PasswordFormManagerTest : public testing::Test {
   // SimulateMatchingPhase.
   enum ResultOfSimulatedMatching { RESULT_MATCH_FOUND, RESULT_NO_MATCH };
 
-  virtual void SetUp() {
+  void SetUp() override {
     observed_form_.origin = GURL("http://accounts.google.com/a/LoginAuth");
     observed_form_.action = GURL("http://accounts.google.com/a/Login");
     observed_form_.username_element = ASCIIToUTF16("Email");
@@ -174,7 +174,7 @@ class PasswordFormManagerTest : public testing::Test {
     client_.reset(new TestPasswordManagerClient(mock_store_.get()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     if (mock_store_.get())
       mock_store_->Shutdown();
   }
diff --git a/components/password_manager/core/browser/password_generation_manager_unittest.cc b/components/password_manager/core/browser/password_generation_manager_unittest.cc
index 90d8024..e67620f 100644
--- a/components/password_manager/core/browser/password_generation_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_generation_manager_unittest.cc
@@ -111,7 +111,7 @@ class TestAutofillMetrics : public autofill::AutofillMetrics {
 
 class PasswordGenerationManagerTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Construct a PrefService and register all necessary prefs before handing
     // it off to |client_|, as the initialization flow of |client_| will
     // indirectly cause those prefs to be immediately accessed.
@@ -121,7 +121,7 @@ class PasswordGenerationManagerTest : public testing::Test {
     client_.reset(new TestPasswordManagerClient(prefs.Pass()));
   }
 
-  virtual void TearDown() override { client_.reset(); }
+  void TearDown() override { client_.reset(); }
 
   PasswordGenerationManager* GetGenerationManager() {
     return client_->GetDriver()->GetPasswordGenerationManager();
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc
index 4bb9f4a..c2bb40c 100644
--- a/components/password_manager/core/browser/password_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -91,7 +91,7 @@ class TestPasswordManager : public PasswordManager {
 
 class PasswordManagerTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled,
                                            true);
 
@@ -120,7 +120,7 @@ class PasswordManagerTest : public testing::Test {
         .WillRepeatedly(Return(false));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     store_->Shutdown();
     store_ = NULL;
   }
diff --git a/components/password_manager/core/browser/password_store_default_unittest.cc b/components/password_manager/core/browser/password_store_default_unittest.cc
index 2e1b2a6..b0e7a70 100644
--- a/components/password_manager/core/browser/password_store_default_unittest.cc
+++ b/components/password_manager/core/browser/password_store_default_unittest.cc
@@ -48,16 +48,14 @@ class MockPasswordStoreObserver : public PasswordStore::Observer {
 
 class PasswordStoreDefaultTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     login_db_.reset(new LoginDatabase());
     ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append(
         FILE_PATH_LITERAL("login_test"))));
   }
 
-  virtual void TearDown() override {
-    ASSERT_TRUE(temp_dir_.Delete());
-  }
+  void TearDown() override { ASSERT_TRUE(temp_dir_.Delete()); }
 
   base::MessageLoopForUI message_loop_;
   scoped_ptr<LoginDatabase> login_db_;
diff --git a/components/password_manager/core/browser/password_store_unittest.cc b/components/password_manager/core/browser/password_store_unittest.cc
index 667eb35..12dbe57 100644
--- a/components/password_manager/core/browser/password_store_unittest.cc
+++ b/components/password_manager/core/browser/password_store_unittest.cc
@@ -43,16 +43,14 @@ class StartSyncFlareMock {
 
 class PasswordStoreTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     login_db_.reset(new LoginDatabase());
     ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append(
         FILE_PATH_LITERAL("login_test"))));
   }
 
-  virtual void TearDown() override {
-    ASSERT_TRUE(temp_dir_.Delete());
-  }
+  void TearDown() override { ASSERT_TRUE(temp_dir_.Delete()); }
 
   base::MessageLoopForUI message_loop_;
   scoped_ptr<LoginDatabase> login_db_;
diff --git a/components/policy/core/browser/configuration_policy_pref_store_test.h b/components/policy/core/browser/configuration_policy_pref_store_test.h
index cc60dca..78003e8 100644
--- a/components/policy/core/browser/configuration_policy_pref_store_test.h
+++ b/components/policy/core/browser/configuration_policy_pref_store_test.h
@@ -24,8 +24,8 @@ class ConfigurationPolicyPrefStore;
 class ConfigurationPolicyPrefStoreTest : public testing::Test {
  protected:
   ConfigurationPolicyPrefStoreTest();
-  virtual ~ConfigurationPolicyPrefStoreTest();
-  virtual void TearDown() override;
+  ~ConfigurationPolicyPrefStoreTest() override;
+  void TearDown() override;
   void UpdateProviderPolicy(const PolicyMap& policy);
 
   // A unit test can override this method to populate the policy handler
diff --git a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
index c1d3cfc..c8a20366 100644
--- a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
@@ -39,7 +39,7 @@ namespace policy {
 // Test cases for list-valued policy settings.
 class ConfigurationPolicyPrefStoreListTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() override {
+  void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_LIST)));
@@ -67,7 +67,7 @@ TEST_F(ConfigurationPolicyPrefStoreListTest, SetValue) {
 // Test cases for string-valued policy settings.
 class ConfigurationPolicyPrefStoreStringTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() override {
+  void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_STRING)));
@@ -95,7 +95,7 @@ TEST_F(ConfigurationPolicyPrefStoreStringTest, SetValue) {
 // Test cases for boolean-valued policy settings.
 class ConfigurationPolicyPrefStoreBooleanTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() override {
+  void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_BOOLEAN)));
@@ -139,7 +139,7 @@ TEST_F(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
 // Test cases for integer-valued policy settings.
 class ConfigurationPolicyPrefStoreIntegerTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() override {
+  void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_INTEGER)));
@@ -167,7 +167,7 @@ TEST_F(ConfigurationPolicyPrefStoreIntegerTest, SetValue) {
 class ConfigurationPolicyPrefStoreRefreshTest
     : public ConfigurationPolicyPrefStoreTest {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ConfigurationPolicyPrefStoreTest::SetUp();
     store_->AddObserver(&observer_);
     handler_list_.AddHandler(
@@ -175,7 +175,7 @@ class ConfigurationPolicyPrefStoreRefreshTest
             kTestPolicy, kTestPref, base::Value::TYPE_STRING)));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     store_->RemoveObserver(&observer_);
     ConfigurationPolicyPrefStoreTest::TearDown();
   }
diff --git a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
index 295e8b5..9b609fb 100644
--- a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
+++ b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
@@ -32,15 +32,15 @@ namespace policy {
 class ManagedBookmarksTrackerTest : public testing::Test {
  public:
   ManagedBookmarksTrackerTest() : managed_node_(NULL) {}
-  virtual ~ManagedBookmarksTrackerTest() {}
+  ~ManagedBookmarksTrackerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     prefs_.registry()->RegisterListPref(bookmarks::prefs::kManagedBookmarks);
     prefs_.registry()->RegisterListPref(
         bookmarks::prefs::kBookmarkEditorExpandedNodes);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (model_)
       model_->RemoveObserver(&observer_);
   }
diff --git a/components/policy/core/common/async_policy_provider_unittest.cc b/components/policy/core/common/async_policy_provider_unittest.cc
index 2768de7..6219346 100644
--- a/components/policy/core/common/async_policy_provider_unittest.cc
+++ b/components/policy/core/common/async_policy_provider_unittest.cc
@@ -78,10 +78,10 @@ scoped_ptr<PolicyBundle> MockPolicyLoader::Load() {
 class AsyncPolicyProviderTest : public testing::Test {
  protected:
   AsyncPolicyProviderTest();
-  virtual ~AsyncPolicyProviderTest();
+  ~AsyncPolicyProviderTest() override;
 
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   base::MessageLoop loop_;
   SchemaRegistry schema_registry_;
diff --git a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
index 186cce6..16372d5 100644
--- a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
@@ -35,9 +35,7 @@ class CloudPolicyCoreTest : public testing::Test,
     core_.AddObserver(this);
   }
 
-  virtual ~CloudPolicyCoreTest() {
-    core_.RemoveObserver(this);
-  }
+  ~CloudPolicyCoreTest() override { core_.RemoveObserver(this); }
 
   void OnCoreConnected(CloudPolicyCore* core) override {
     // Make sure core is connected at callback time.
diff --git a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
index 1d6f053..70299fa3 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
@@ -176,7 +176,7 @@ class CloudPolicyManagerTest : public testing::Test {
   CloudPolicyManagerTest()
       : policy_ns_key_(dm_protocol::kChromeUserPolicyType, std::string()) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Set up a policy map for testing.
     policy_map_.Set("key",
                     POLICY_LEVEL_MANDATORY,
@@ -197,7 +197,7 @@ class CloudPolicyManagerTest : public testing::Test {
     manager_->AddObserver(&observer_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     manager_->RemoveObserver(&observer_);
     manager_->Shutdown();
   }
diff --git a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
index 7a1ea6f..9ebc4d4 100644
--- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
@@ -35,7 +35,7 @@ class CloudPolicyRefreshSchedulerTest : public testing::Test {
       : task_runner_(new base::TestSimpleTaskRunner()),
         network_change_notifier_(net::NetworkChangeNotifier::CreateMock()) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     client_.SetDMToken("token");
 
     // Set up the protobuf timestamp to be one minute in the past. Since the
@@ -314,7 +314,7 @@ class CloudPolicyRefreshSchedulerSteadyStateTest
  protected:
   CloudPolicyRefreshSchedulerSteadyStateTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     refresh_scheduler_.reset(CreateRefreshScheduler());
     refresh_scheduler_->SetRefreshDelay(kPolicyRefreshRate);
     CloudPolicyRefreshSchedulerTest::SetUp();
diff --git a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
index 7eca8c8..605be1a 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
@@ -111,7 +111,7 @@ class ComponentCloudPolicyServiceTest : public testing::Test {
               &store_,
               loop_.message_loop_proxy()) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     cache_ = new ResourceCache(temp_dir_.path(), loop_.message_loop_proxy());
@@ -144,7 +144,7 @@ class ComponentCloudPolicyServiceTest : public testing::Test {
                          NULL);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // The service cleans up its backend on the background thread.
     service_.reset();
     RunUntilIdle();
diff --git a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
index ddacf55d..e3b15e4 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
@@ -68,7 +68,7 @@ class MockComponentCloudPolicyStoreDelegate
 
 class ComponentCloudPolicyStoreTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     cache_.reset(new ResourceCache(
         temp_dir_.path(),
diff --git a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
index 2d0c50d..3412cc0 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
@@ -66,8 +66,8 @@ class MockComponentCloudPolicyStoreDelegate
 
 class ComponentCloudPolicyUpdaterTest : public testing::Test {
  protected:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   scoped_ptr<em::PolicyFetchResponse> CreateResponse();
 
diff --git a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
index e75726a..a2b43b0 100644
--- a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
+++ b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
@@ -35,10 +35,10 @@ const char* kExternalPolicyDataPayload = "External policy data";
 class ExternalPolicyDataFetcherTest : public testing::Test {
  protected:
   ExternalPolicyDataFetcherTest();
-  virtual ~ExternalPolicyDataFetcherTest();
+  ~ExternalPolicyDataFetcherTest() override;
 
   // testing::Test:
-  virtual void SetUp() override;
+  void SetUp() override;
 
   void StartJob(int index);
   void CancelJob(int index);
diff --git a/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc b/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
index 2f4df01..a165a88 100644
--- a/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
+++ b/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
@@ -59,7 +59,7 @@ ExternalPolicyDataUpdater::FetchSuccessCallback
 
 class ExternalPolicyDataUpdaterTest : public testing::Test {
  protected:
-  virtual void SetUp() override;
+  void SetUp() override;
 
   void CreateUpdater(size_t max_parallel_fetches);
   ExternalPolicyDataUpdater::Request CreateRequest(
diff --git a/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc b/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
index 082bcf3..cbec8f39 100644
--- a/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
+++ b/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
@@ -22,15 +22,15 @@ class PolicyHeaderIOHelperTest : public testing::Test {
   PolicyHeaderIOHelperTest() {
     task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner());
   }
-  virtual ~PolicyHeaderIOHelperTest() {}
+  ~PolicyHeaderIOHelperTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     helper_ = make_scoped_ptr(new PolicyHeaderIOHelper(kDMServerURL,
                                                        kInitialPolicyHeader,
                                                        task_runner_));
     task_runner_->RunUntilIdle();
   }
-  virtual void TearDown() override {
+  void TearDown() override {
     task_runner_->RunUntilIdle();
     helper_.reset();
   }
diff --git a/components/policy/core/common/cloud/policy_header_service_unittest.cc b/components/policy/core/common/cloud/policy_header_service_unittest.cc
index 7b2ef53..2903ec4 100644
--- a/components/policy/core/common/cloud/policy_header_service_unittest.cc
+++ b/components/policy/core/common/cloud/policy_header_service_unittest.cc
@@ -37,9 +37,9 @@ class PolicyHeaderServiceTest : public testing::Test {
   PolicyHeaderServiceTest() {
     task_runner_ = make_scoped_refptr(new base::TestSimpleTaskRunner());
   }
-  virtual ~PolicyHeaderServiceTest() {}
+  ~PolicyHeaderServiceTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     service_.reset(new PolicyHeaderService(kDMServerURL,
                                            kPolicyVerificationKeyHash,
                                            &user_store_,
@@ -47,7 +47,7 @@ class PolicyHeaderServiceTest : public testing::Test {
     helper_ = service_->CreatePolicyHeaderIOHelper(task_runner_).Pass();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     task_runner_->RunUntilIdle();
     // Helper should outlive the service.
     service_.reset();
diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
index 9080f5b..fb4e5b9 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
@@ -31,7 +31,7 @@ class UserCloudPolicyManagerTest : public testing::Test {
  protected:
   UserCloudPolicyManagerTest() : store_(NULL) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Set up a policy map for testing.
     policy_map_.Set("key",
                     POLICY_LEVEL_MANDATORY,
@@ -42,7 +42,7 @@ class UserCloudPolicyManagerTest : public testing::Test {
         .CopyFrom(policy_map_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (manager_) {
       manager_->RemoveObserver(&observer_);
       manager_->Shutdown();
diff --git a/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
index 8af301a..7576a8a 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
@@ -55,7 +55,7 @@ class UserCloudPolicyStoreTest : public testing::Test {
  public:
   UserCloudPolicyStoreTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
     store_.reset(
         new UserCloudPolicyStore(policy_file(),
@@ -77,7 +77,7 @@ class UserCloudPolicyStoreTest : public testing::Test {
     policy_.Build();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     store_->RemoveObserver(&observer_);
     external_data_manager_.reset();
     store_.reset();
diff --git a/components/policy/core/common/config_dir_policy_loader_unittest.cc b/components/policy/core/common/config_dir_policy_loader_unittest.cc
index fe1f506..a29136c 100644
--- a/components/policy/core/common/config_dir_policy_loader_unittest.cc
+++ b/components/policy/core/common/config_dir_policy_loader_unittest.cc
@@ -173,7 +173,7 @@ INSTANTIATE_TEST_CASE_P(
 // Some tests that exercise special functionality in ConfigDirPolicyLoader.
 class ConfigDirPolicyLoaderTest : public PolicyTestBase {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     PolicyTestBase::SetUp();
     harness_.SetUp();
   }
diff --git a/components/policy/core/common/configuration_policy_provider_test.h b/components/policy/core/common/configuration_policy_provider_test.h
index 0cf8e6a..a8a0d43 100644
--- a/components/policy/core/common/configuration_policy_provider_test.h
+++ b/components/policy/core/common/configuration_policy_provider_test.h
@@ -41,11 +41,11 @@ extern const char kKeyDictionary[];
 class PolicyTestBase : public testing::Test {
  public:
   PolicyTestBase();
-  virtual ~PolicyTestBase();
+  ~PolicyTestBase() override;
 
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
  protected:
   bool RegisterSchema(const PolicyNamespace& ns,
@@ -120,8 +120,8 @@ class ConfigurationPolicyProviderTest
   ConfigurationPolicyProviderTest();
   virtual ~ConfigurationPolicyProviderTest();
 
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   // Installs a valid policy and checks whether the provider returns the
   // |expected_value|.
diff --git a/components/policy/core/common/forwarding_policy_provider_unittest.cc b/components/policy/core/common/forwarding_policy_provider_unittest.cc
index 0a8ae35..e546206 100644
--- a/components/policy/core/common/forwarding_policy_provider_unittest.cc
+++ b/components/policy/core/common/forwarding_policy_provider_unittest.cc
@@ -43,7 +43,7 @@ class ForwardingPolicyProviderTest : public testing::Test {
     forwarding_provider_.AddObserver(&observer_);
   }
 
-  virtual ~ForwardingPolicyProviderTest() {
+  ~ForwardingPolicyProviderTest() override {
     forwarding_provider_.RemoveObserver(&observer_);
     forwarding_provider_.Shutdown();
     mock_provider_.Shutdown();
diff --git a/components/policy/core/common/policy_statistics_collector_unittest.cc b/components/policy/core/common/policy_statistics_collector_unittest.cc
index 3387681..984f63b 100644
--- a/components/policy/core/common/policy_statistics_collector_unittest.cc
+++ b/components/policy/core/common/policy_statistics_collector_unittest.cc
@@ -77,7 +77,7 @@ class PolicyStatisticsCollectorTest : public testing::Test {
         task_runner_(new base::TestSimpleTaskRunner()) {
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     std::string error;
     chrome_schema_ = Schema::Parse(kTestChromeSchema, &error);
     ASSERT_TRUE(chrome_schema_.valid()) << error;
diff --git a/components/precache/content/precache_manager_unittest.cc b/components/precache/content/precache_manager_unittest.cc
index 56a67b8..5517460 100644
--- a/components/precache/content/precache_manager_unittest.cc
+++ b/components/precache/content/precache_manager_unittest.cc
@@ -140,7 +140,7 @@ class PrecacheManagerTest : public testing::Test {
                                   base::Unretained(&url_callback_))) {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     base::StatisticsRecorder::Initialize();
 
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
diff --git a/components/precache/core/precache_database_unittest.cc b/components/precache/core/precache_database_unittest.cc
index 6de5086..2365816 100644
--- a/components/precache/core/precache_database_unittest.cc
+++ b/components/precache/core/precache_database_unittest.cc
@@ -54,10 +54,10 @@ namespace precache {
 class PrecacheDatabaseTest : public testing::Test {
  public:
   PrecacheDatabaseTest() {}
-  virtual ~PrecacheDatabaseTest() {}
+  ~PrecacheDatabaseTest() override {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     base::StatisticsRecorder::Initialize();
     precache_database_ = new PrecacheDatabase();
 
diff --git a/components/precache/core/precache_url_table_unittest.cc b/components/precache/core/precache_url_table_unittest.cc
index 05c9299..51965b2 100644
--- a/components/precache/core/precache_url_table_unittest.cc
+++ b/components/precache/core/precache_url_table_unittest.cc
@@ -19,10 +19,10 @@ namespace {
 class PrecacheURLTableTest : public testing::Test {
  public:
   PrecacheURLTableTest() {}
-  virtual ~PrecacheURLTableTest() {}
+  ~PrecacheURLTableTest() override {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     precache_url_table_.reset(new PrecacheURLTable());
     db_.reset(new sql::Connection());
     ASSERT_TRUE(db_->OpenInMemory());
diff --git a/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc
index 89ebe7f..2d1cf5c 100644
--- a/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc
+++ b/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc
@@ -28,7 +28,7 @@ class ProximityAuthCryptAuthApiCallFlowTest
             new base::TestSimpleTaskRunner())),
         flow_(GURL(kRequestUrl)) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // The TestURLFetcherFactory will override the global URLFetcherFactory for
     // the entire test.
     url_fetcher_factory_.reset(new net::TestURLFetcherFactory());
diff --git a/components/renderer_context_menu/views/toolkit_delegate_views.h b/components/renderer_context_menu/views/toolkit_delegate_views.h
index b56a76e..cb20987 100644
--- a/components/renderer_context_menu/views/toolkit_delegate_views.h
+++ b/components/renderer_context_menu/views/toolkit_delegate_views.h
@@ -26,7 +26,7 @@ class SimpleMenuModel;
 class ToolkitDelegateViews : public RenderViewContextMenuBase::ToolkitDelegate {
  public:
   ToolkitDelegateViews();
-  virtual ~ToolkitDelegateViews();
+  ~ToolkitDelegateViews() override;
 
   void RunMenuAt(views::Widget* parent,
                  const gfx::Point& point,
@@ -34,12 +34,12 @@ class ToolkitDelegateViews : public RenderViewContextMenuBase::ToolkitDelegate {
 
  private:
   // ToolkitDelegate:
-  virtual void Init(ui::SimpleMenuModel* menu_model) override;
-  virtual void Cancel() override;
-  virtual void UpdateMenuItem(int command_id,
-                              bool enabled,
-                              bool hidden,
-                              const base::string16& title) override;
+  void Init(ui::SimpleMenuModel* menu_model) override;
+  void Cancel() override;
+  void UpdateMenuItem(int command_id,
+                      bool enabled,
+                      bool hidden,
+                      const base::string16& title) override;
 
   scoped_ptr<views::MenuModelAdapter> menu_adapter_;
   scoped_ptr<views::MenuRunner> menu_runner_;
diff --git a/components/search/search_unittest.cc b/components/search/search_unittest.cc
index f4382cc..d3bd873 100644
--- a/components/search/search_unittest.cc
+++ b/components/search/search_unittest.cc
@@ -13,7 +13,7 @@ namespace chrome {
 
 class EmbeddedSearchFieldTrialTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     field_trial_list_.reset(new base::FieldTrialList(
         new metrics::SHA1EntropyProvider("42")));
     base::StatisticsRecorder::Initialize();
diff --git a/components/search_engines/default_search_manager_unittest.cc b/components/search_engines/default_search_manager_unittest.cc
index 9c9bb91..a6718d6 100644
--- a/components/search_engines/default_search_manager_unittest.cc
+++ b/components/search_engines/default_search_manager_unittest.cc
@@ -141,7 +141,7 @@ class DefaultSearchManagerTest : public testing::Test {
  public:
   DefaultSearchManagerTest() {};
 
-  virtual void SetUp() override {
+  void SetUp() override {
     pref_service_.reset(new user_prefs::TestingPrefServiceSyncable);
     DefaultSearchManager::RegisterProfilePrefs(pref_service_->registry());
     TemplateURLPrepopulateData::RegisterProfilePrefs(pref_service_->registry());
diff --git a/components/search_engines/default_search_policy_handler_unittest.cc b/components/search_engines/default_search_policy_handler_unittest.cc
index e5376c0..26e3279 100644
--- a/components/search_engines/default_search_policy_handler_unittest.cc
+++ b/components/search_engines/default_search_policy_handler_unittest.cc
@@ -29,7 +29,7 @@ class DefaultSearchPolicyHandlerTest
         "http://www.google.com/search#q={searchTerms}");
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
         new DefaultSearchPolicyHandler));
   }
diff --git a/components/search_engines/search_host_to_urls_map_unittest.cc b/components/search_engines/search_host_to_urls_map_unittest.cc
index f87db78..1e79294 100644
--- a/components/search_engines/search_host_to_urls_map_unittest.cc
+++ b/components/search_engines/search_host_to_urls_map_unittest.cc
@@ -16,7 +16,7 @@ class SearchHostToURLsMapTest : public testing::Test {
  public:
   SearchHostToURLsMapTest() {}
 
-  virtual void SetUp();
+  void SetUp() override;
 
  protected:
   scoped_ptr<SearchHostToURLsMap> provider_map_;
diff --git a/components/search_engines/template_url_fetcher_unittest.cc b/components/search_engines/template_url_fetcher_unittest.cc
index 0a45406..18ff0f7 100644
--- a/components/search_engines/template_url_fetcher_unittest.cc
+++ b/components/search_engines/template_url_fetcher_unittest.cc
@@ -26,7 +26,7 @@ class TemplateURLFetcherTest : public testing::Test {
  public:
   TemplateURLFetcherTest();
 
-  virtual void SetUp() override {
+  void SetUp() override {
     TestingProfile* profile = test_util_.profile();
     ASSERT_TRUE(profile->GetRequestContext());
     template_url_fetcher_.reset(new TemplateURLFetcher(
@@ -35,7 +35,7 @@ class TemplateURLFetcherTest : public testing::Test {
     ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
   }
 
diff --git a/components/search_engines/template_url_parser_unittest.cc b/components/search_engines/template_url_parser_unittest.cc
index 15214ff..ea94a51 100644
--- a/components/search_engines/template_url_parser_unittest.cc
+++ b/components/search_engines/template_url_parser_unittest.cc
@@ -52,9 +52,9 @@ bool ParamFilterImpl::KeepParameter(const std::string& key,
 class TemplateURLParserTest : public testing::Test {
  protected:
   TemplateURLParserTest();
-  virtual ~TemplateURLParserTest();
+  ~TemplateURLParserTest() override;
 
-  virtual void SetUp() override;
+  void SetUp() override;
 
   bool is_disabled() const;
 
diff --git a/components/search_engines/template_url_prepopulate_data_unittest.cc b/components/search_engines/template_url_prepopulate_data_unittest.cc
index 9732529..49eca46 100644
--- a/components/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/components/search_engines/template_url_prepopulate_data_unittest.cc
@@ -35,7 +35,7 @@ std::string GetHostFromTemplateURLData(const TemplateURLData& data) {
 
 class TemplateURLPrepopulateDataTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     TemplateURLPrepopulateData::RegisterProfilePrefs(prefs_.registry());
   }
 
diff --git a/components/search_engines/template_url_service_sync_unittest.cc b/components/search_engines/template_url_service_sync_unittest.cc
index bef95f1..a7b5a6a 100644
--- a/components/search_engines/template_url_service_sync_unittest.cc
+++ b/components/search_engines/template_url_service_sync_unittest.cc
@@ -153,8 +153,8 @@ class TemplateURLServiceSyncTest : public testing::Test {
 
   TemplateURLServiceSyncTest();
 
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   TemplateURLService* model() { return test_util_a_->model(); }
   // For readability, we redefine an accessor for Model A for use in tests that
diff --git a/components/search_engines/template_url_service_unittest.cc b/components/search_engines/template_url_service_unittest.cc
index 7b8980b..690504a 100644
--- a/components/search_engines/template_url_service_unittest.cc
+++ b/components/search_engines/template_url_service_unittest.cc
@@ -133,8 +133,8 @@ class TemplateURLServiceTest : public testing::Test {
   TemplateURLServiceTest();
 
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   TemplateURL* AddKeywordWithDate(const std::string& short_name,
                                   const std::string& keyword,
@@ -176,12 +176,12 @@ class TemplateURLServiceWithoutFallbackTest : public TemplateURLServiceTest {
  public:
   TemplateURLServiceWithoutFallbackTest() : TemplateURLServiceTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(true);
     TemplateURLServiceTest::SetUp();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     TemplateURLServiceTest::TearDown();
     DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(false);
   }
diff --git a/components/search_provider_logos/logo_cache_unittest.cc b/components/search_provider_logos/logo_cache_unittest.cc
index 8bf4471..a483c98 100644
--- a/components/search_provider_logos/logo_cache_unittest.cc
+++ b/components/search_provider_logos/logo_cache_unittest.cc
@@ -95,7 +95,7 @@ void ShortenFile(base::FilePath path) {
 
 class LogoCacheTest : public ::testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(cache_parent_dir_.CreateUniqueTempDir());
     InitCache();
   }
diff --git a/components/sessions/content/content_serialized_navigation_driver.h b/components/sessions/content/content_serialized_navigation_driver.h
index 499d258..c7829f2 100644
--- a/components/sessions/content/content_serialized_navigation_driver.h
+++ b/components/sessions/content/content_serialized_navigation_driver.h
@@ -18,17 +18,17 @@ namespace sessions {
 class SESSIONS_EXPORT_PRIVATE ContentSerializedNavigationDriver
     : public SerializedNavigationDriver {
  public:
-  virtual ~ContentSerializedNavigationDriver();
+  ~ContentSerializedNavigationDriver() override;
 
   // Returns the singleton ContentSerializedNavigationDriver.  Almost all
   // callers should use SerializedNavigationDriver::Get() instead.
   static ContentSerializedNavigationDriver* GetInstance();
 
   // SerializedNavigationDriver implementation.
-  virtual int GetDefaultReferrerPolicy() const override;
-  virtual std::string GetSanitizedPageStateForPickle(
+  int GetDefaultReferrerPolicy() const override;
+  std::string GetSanitizedPageStateForPickle(
       const SerializedNavigationEntry* navigation) const override;
-  virtual void Sanitize(SerializedNavigationEntry* navigation) const override;
+  void Sanitize(SerializedNavigationEntry* navigation) const override;
 
  private:
   ContentSerializedNavigationDriver();
diff --git a/components/signin/core/browser/account_tracker_service_unittest.cc b/components/signin/core/browser/account_tracker_service_unittest.cc
index 7a4d327..356f06f 100644
--- a/components/signin/core/browser/account_tracker_service_unittest.cc
+++ b/components/signin/core/browser/account_tracker_service_unittest.cc
@@ -192,9 +192,9 @@ class AccountTrackerServiceTest : public testing::Test {
  public:
   AccountTrackerServiceTest() {}
 
-  virtual ~AccountTrackerServiceTest() {}
+  ~AccountTrackerServiceTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     fake_oauth2_token_service_.reset(new FakeOAuth2TokenService());
 
     pref_service_.registry()->RegisterListPref(
@@ -211,7 +211,7 @@ class AccountTrackerServiceTest : public testing::Test {
     account_tracker_->AddObserver(&observer_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     account_tracker_->RemoveObserver(&observer_);
     account_tracker_->Shutdown();
   }
diff --git a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
index d53f427..a7d75ed 100644
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
+++ b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
@@ -37,7 +37,7 @@ class MutableProfileOAuth2TokenServiceTest
         start_batch_changes_(0),
         end_batch_changes_(0) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
 #if defined(OS_MACOSX)
     OSCrypt::UseMockKeychain(true);
 #endif
@@ -52,7 +52,7 @@ class MutableProfileOAuth2TokenServiceTest
     oauth2_service_.AddObserver(this);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     oauth2_service_.RemoveObserver(this);
     oauth2_service_.Shutdown();
   }
diff --git a/components/signin/core/browser/signin_error_controller_unittest.cc b/components/signin/core/browser/signin_error_controller_unittest.cc
index e946d20..311496d 100644
--- a/components/signin/core/browser/signin_error_controller_unittest.cc
+++ b/components/signin/core/browser/signin_error_controller_unittest.cc
@@ -17,7 +17,7 @@ static const char kOtherTestUsername[] = "otheruser@test.com";
 
 class SigninErrorControllerTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     error_controller_.reset(new SigninErrorController());
   }
 
diff --git a/components/signin/core/browser/webdata/token_service_table_unittest.cc b/components/signin/core/browser/webdata/token_service_table_unittest.cc
index 8478aac..a2d1801c 100644
--- a/components/signin/core/browser/webdata/token_service_table_unittest.cc
+++ b/components/signin/core/browser/webdata/token_service_table_unittest.cc
@@ -15,10 +15,10 @@ using base::Time;
 class TokenServiceTableTest : public testing::Test {
  public:
   TokenServiceTableTest() {}
-  virtual ~TokenServiceTableTest() {}
+  ~TokenServiceTableTest() override {}
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     file_ = temp_dir_.path().AppendASCII("TestWebDatabase");
 
diff --git a/components/storage_monitor/media_storage_util_unittest.cc b/components/storage_monitor/media_storage_util_unittest.cc
index de13437..5dab94c 100644
--- a/components/storage_monitor/media_storage_util_unittest.cc
+++ b/components/storage_monitor/media_storage_util_unittest.cc
@@ -31,7 +31,7 @@ class MediaStorageUtilTest : public testing::Test {
  public:
   MediaStorageUtilTest()
       : thread_bundle_(content::TestBrowserThreadBundle::REAL_FILE_THREAD) {}
-  virtual ~MediaStorageUtilTest() {}
+  ~MediaStorageUtilTest() override {}
 
   // Verify mounted device type.
   void CheckDCIMDeviceType(const base::FilePath& mount_point) {
@@ -60,12 +60,12 @@ class MediaStorageUtilTest : public testing::Test {
     return scoped_temp_dir_.path();
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     monitor_ = TestStorageMonitor::CreateAndInstall();
     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     WaitForFileThread();
     TestStorageMonitor::Destroy();
   }
diff --git a/components/storage_monitor/media_transfer_protocol_device_observer_linux.h b/components/storage_monitor/media_transfer_protocol_device_observer_linux.h
index 3b9d122..50467ad 100644
--- a/components/storage_monitor/media_transfer_protocol_device_observer_linux.h
+++ b/components/storage_monitor/media_transfer_protocol_device_observer_linux.h
@@ -37,7 +37,7 @@ class MediaTransferProtocolDeviceObserverLinux
   MediaTransferProtocolDeviceObserverLinux(
       StorageMonitor::Receiver* receiver,
       device::MediaTransferProtocolManager* mtp_manager);
-  virtual ~MediaTransferProtocolDeviceObserverLinux();
+  ~MediaTransferProtocolDeviceObserverLinux() override;
 
   // Finds the storage that contains |path| and populates |storage_info|.
   // Returns false if unable to find the storage.
@@ -56,8 +56,8 @@ class MediaTransferProtocolDeviceObserverLinux
 
   // device::MediaTransferProtocolManager::Observer implementation.
   // Exposed for unit tests.
-  virtual void StorageChanged(bool is_attached,
-                              const std::string& storage_name) override;
+  void StorageChanged(bool is_attached,
+                      const std::string& storage_name) override;
 
  private:
   // Mapping of storage location and mtp storage info object.
diff --git a/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc b/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
index f39ccdf..10f6e9a 100644
--- a/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
+++ b/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
@@ -96,10 +96,10 @@ class MediaTransferProtocolDeviceObserverLinuxTest : public testing::Test {
   MediaTransferProtocolDeviceObserverLinuxTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
 
-  virtual ~MediaTransferProtocolDeviceObserverLinuxTest() {}
+  ~MediaTransferProtocolDeviceObserverLinuxTest() override {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     mock_storage_observer_.reset(new MockRemovableStorageObserver);
     TestStorageMonitor* monitor = TestStorageMonitor::CreateAndInstall();
     mtp_device_observer_.reset(
@@ -108,7 +108,7 @@ class MediaTransferProtocolDeviceObserverLinuxTest : public testing::Test {
     monitor->AddObserver(mock_storage_observer_.get());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     StorageMonitor* monitor = StorageMonitor::GetInstance();
     monitor->RemoveObserver(mock_storage_observer_.get());
     mtp_device_observer_.reset();
diff --git a/components/storage_monitor/storage_monitor_linux.h b/components/storage_monitor/storage_monitor_linux.h
index ce44369..c8ff79a 100644
--- a/components/storage_monitor/storage_monitor_linux.h
+++ b/components/storage_monitor/storage_monitor_linux.h
@@ -39,10 +39,10 @@ class StorageMonitorLinux : public StorageMonitor,
   // Use StorageMonitor::GetInstance() instead.
   // |mtab_file_path| is the path to a mtab file to watch for mount points.
   explicit StorageMonitorLinux(const base::FilePath& mtab_file_path);
-  virtual ~StorageMonitorLinux();
+  ~StorageMonitorLinux() override;
 
   // Must be called for StorageMonitorLinux to work.
-  virtual void Init() override;
+  void Init() override;
 
  protected:
   // Gets device information given a |device_path| and |mount_point|.
@@ -57,7 +57,7 @@ class StorageMonitorLinux : public StorageMonitor,
       device::MediaTransferProtocolManager* test_manager);
 
   // MtabWatcherLinux::Delegate implementation.
-  virtual void UpdateMtab(
+  void UpdateMtab(
       const MtabWatcherLinux::MountPointDeviceMap& new_mtab) override;
 
  private:
@@ -90,12 +90,12 @@ class StorageMonitorLinux : public StorageMonitor,
   typedef std::map<base::FilePath, ReferencedMountPoint> MountPriorityMap;
 
   // StorageMonitor implementation.
-  virtual bool GetStorageInfoForPath(const base::FilePath& path,
-                                     StorageInfo* device_info) const override;
-  virtual void EjectDevice(const std::string& device_id,
-                           base::Callback<void(EjectStatus)> callback) override;
-  virtual device::MediaTransferProtocolManager*
-      media_transfer_protocol_manager() override;
+  bool GetStorageInfoForPath(const base::FilePath& path,
+                             StorageInfo* device_info) const override;
+  void EjectDevice(const std::string& device_id,
+                   base::Callback<void(EjectStatus)> callback) override;
+  device::MediaTransferProtocolManager* media_transfer_protocol_manager()
+      override;
 
   // Called when the MtabWatcher has been created.
   void OnMtabWatcherCreated(MtabWatcherLinux* watcher);
diff --git a/components/storage_monitor/storage_monitor_linux_unittest.cc b/components/storage_monitor/storage_monitor_linux_unittest.cc
index 96e23f6..3e77145 100644
--- a/components/storage_monitor/storage_monitor_linux_unittest.cc
+++ b/components/storage_monitor/storage_monitor_linux_unittest.cc
@@ -126,10 +126,10 @@ class TestStorageMonitorLinux : public StorageMonitorLinux {
         new TestMediaTransferProtocolManagerLinux());
     SetGetDeviceInfoCallbackForTest(base::Bind(&GetDeviceInfo));
   }
-  virtual ~TestStorageMonitorLinux() {}
+  ~TestStorageMonitorLinux() override {}
 
  private:
-  virtual void UpdateMtab(
+  void UpdateMtab(
       const MtabWatcherLinux::MountPointDeviceMap& new_mtab) override {
     StorageMonitorLinux::UpdateMtab(new_mtab);
     base::MessageLoopProxy::current()->PostTask(
@@ -157,10 +157,10 @@ class StorageMonitorLinuxTest : public testing::Test {
 
   StorageMonitorLinuxTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
-  virtual ~StorageMonitorLinuxTest() {}
+  ~StorageMonitorLinuxTest() override {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create and set up a temp dir with files for the test.
     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
     base::FilePath test_dir = scoped_temp_dir_.path().AppendASCII("test_etc");
@@ -182,7 +182,7 @@ class StorageMonitorLinuxTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     base::RunLoop().RunUntilIdle();
     monitor_->RemoveObserver(mock_storage_observer_.get());
     base::RunLoop().RunUntilIdle();
diff --git a/components/storage_monitor/test_media_transfer_protocol_manager_linux.h b/components/storage_monitor/test_media_transfer_protocol_manager_linux.h
index 64bd18d..195c891 100644
--- a/components/storage_monitor/test_media_transfer_protocol_manager_linux.h
+++ b/components/storage_monitor/test_media_transfer_protocol_manager_linux.h
@@ -14,31 +14,31 @@ class TestMediaTransferProtocolManagerLinux
     : public device::MediaTransferProtocolManager {
  public:
   TestMediaTransferProtocolManagerLinux();
-  virtual ~TestMediaTransferProtocolManagerLinux();
+  ~TestMediaTransferProtocolManagerLinux() override;
 
  private:
   // device::MediaTransferProtocolManager implementation.
-  virtual void AddObserver(Observer* observer) override;
-  virtual void RemoveObserver(Observer* observer) override;
-  virtual const std::vector<std::string> GetStorages() const override;
-  virtual const MtpStorageInfo* GetStorageInfo(
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
+  const std::vector<std::string> GetStorages() const override;
+  const MtpStorageInfo* GetStorageInfo(
       const std::string& storage_name) const override;
-  virtual void OpenStorage(const std::string& storage_name,
-                           const std::string& mode,
-                           const OpenStorageCallback& callback) override;
-  virtual void CloseStorage(const std::string& storage_handle,
-                            const CloseStorageCallback& callback) override;
-  virtual void ReadDirectory(const std::string& storage_handle,
-                             uint32 file_id,
-                             const ReadDirectoryCallback& callback) override;
-  virtual void ReadFileChunk(const std::string& storage_handle,
-                             uint32 file_id,
-                             uint32 offset,
-                             uint32 count,
-                             const ReadFileCallback& callback) override;
-  virtual void GetFileInfo(const std::string& storage_handle,
-                           uint32 file_id,
-                           const GetFileInfoCallback& callback) override;
+  void OpenStorage(const std::string& storage_name,
+                   const std::string& mode,
+                   const OpenStorageCallback& callback) override;
+  void CloseStorage(const std::string& storage_handle,
+                    const CloseStorageCallback& callback) override;
+  void ReadDirectory(const std::string& storage_handle,
+                     uint32 file_id,
+                     const ReadDirectoryCallback& callback) override;
+  void ReadFileChunk(const std::string& storage_handle,
+                     uint32 file_id,
+                     uint32 offset,
+                     uint32 count,
+                     const ReadFileCallback& callback) override;
+  void GetFileInfo(const std::string& storage_handle,
+                   uint32 file_id,
+                   const GetFileInfoCallback& callback) override;
 
   DISALLOW_COPY_AND_ASSIGN(TestMediaTransferProtocolManagerLinux);
 };
diff --git a/components/storage_monitor/test_storage_monitor.h b/components/storage_monitor/test_storage_monitor.h
index a42949f..7eff7fb 100644
--- a/components/storage_monitor/test_storage_monitor.h
+++ b/components/storage_monitor/test_storage_monitor.h
@@ -45,8 +45,8 @@ class TestStorageMonitor : public StorageMonitor {
 #endif
 
 #if defined(OS_LINUX)
-  virtual device::MediaTransferProtocolManager*
-      media_transfer_protocol_manager() override;
+  device::MediaTransferProtocolManager* media_transfer_protocol_manager()
+      override;
 #endif
 
   Receiver* receiver() const override;
diff --git a/components/suggestions/blacklist_store_unittest.cc b/components/suggestions/blacklist_store_unittest.cc
index 16daaff..d7d1fa8 100644
--- a/components/suggestions/blacklist_store_unittest.cc
+++ b/components/suggestions/blacklist_store_unittest.cc
@@ -55,7 +55,7 @@ class BlacklistStoreTest : public testing::Test {
   BlacklistStoreTest()
     : pref_service_(new user_prefs::TestingPrefServiceSyncable) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     BlacklistStore::RegisterProfilePrefs(pref_service()->registry());
   }
 
diff --git a/components/suggestions/image_manager_unittest.cc b/components/suggestions/image_manager_unittest.cc
index 525160b..e9d16e3 100644
--- a/components/suggestions/image_manager_unittest.cc
+++ b/components/suggestions/image_manager_unittest.cc
@@ -54,12 +54,12 @@ class ImageManagerTest : public testing::Test {
         num_callback_null_called_(0),
         num_callback_valid_called_(0) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     fake_db_ = new FakeDB<ImageData>(&db_model_);
     image_manager_.reset(CreateImageManager(fake_db_));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     fake_db_ = NULL;
     db_model_.clear();
     image_manager_.reset();
diff --git a/components/suggestions/suggestions_service_unittest.cc b/components/suggestions/suggestions_service_unittest.cc
index 7c68373..21e11e5 100644
--- a/components/suggestions/suggestions_service_unittest.cc
+++ b/components/suggestions/suggestions_service_unittest.cc
@@ -163,9 +163,9 @@ class SuggestionsServiceTest : public testing::Test {
         mock_suggestions_store_(NULL),
         mock_thumbnail_manager_(NULL) {}
 
-  virtual ~SuggestionsServiceTest() {}
+  ~SuggestionsServiceTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     request_context_ = new net::TestURLRequestContextGetter(
         io_message_loop_.message_loop_proxy());
   }
diff --git a/components/suggestions/suggestions_store_unittest.cc b/components/suggestions/suggestions_store_unittest.cc
index d66f466..c50152f 100644
--- a/components/suggestions/suggestions_store_unittest.cc
+++ b/components/suggestions/suggestions_store_unittest.cc
@@ -74,7 +74,7 @@ class SuggestionsStoreTest : public testing::Test {
   SuggestionsStoreTest()
     : pref_service_(new user_prefs::TestingPrefServiceSyncable) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     SuggestionsStore::RegisterProfilePrefs(pref_service_->registry());
     suggestions_store_.reset(new SuggestionsStore(pref_service_.get()));
   }
diff --git a/components/sync_driver/data_type_manager_impl_unittest.cc b/components/sync_driver/data_type_manager_impl_unittest.cc
index 22aed72..337a2b8 100644
--- a/components/sync_driver/data_type_manager_impl_unittest.cc
+++ b/components/sync_driver/data_type_manager_impl_unittest.cc
@@ -257,11 +257,10 @@ class SyncDataTypeManagerImplTest : public testing::Test {
  public:
   SyncDataTypeManagerImplTest() {}
 
-  virtual ~SyncDataTypeManagerImplTest() {
-  }
+  ~SyncDataTypeManagerImplTest() override {}
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
    dtm_.reset(
        new TestDataTypeManager(
            syncer::WeakHandle<syncer::DataTypeDebugInfoListener>(),
diff --git a/components/sync_driver/device_info_data_type_controller_unittest.cc b/components/sync_driver/device_info_data_type_controller_unittest.cc
index c6535cb..aae8528 100644
--- a/components/sync_driver/device_info_data_type_controller_unittest.cc
+++ b/components/sync_driver/device_info_data_type_controller_unittest.cc
@@ -23,9 +23,9 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
       : load_finished_(false),
         weak_ptr_factory_(this),
         last_type_(syncer::UNSPECIFIED) {}
-  virtual ~DeviceInfoDataTypeControllerTest() {}
+  ~DeviceInfoDataTypeControllerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     local_device_.reset(new LocalDeviceInfoProviderMock(
         "cache_guid",
         "Wayne Gretzky's Hacking Box",
@@ -45,7 +45,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
     last_error_ = syncer::SyncError();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     controller_ = NULL;
     local_device_.reset();
   }
diff --git a/components/sync_driver/device_info_sync_service_unittest.cc b/components/sync_driver/device_info_sync_service_unittest.cc
index 9722aa4..b083e12 100644
--- a/components/sync_driver/device_info_sync_service_unittest.cc
+++ b/components/sync_driver/device_info_sync_service_unittest.cc
@@ -77,9 +77,9 @@ class DeviceInfoSyncServiceTest : public testing::Test,
                                   public DeviceInfoTracker::Observer {
  public:
   DeviceInfoSyncServiceTest() : num_device_info_changed_callbacks_(0) {}
-  virtual ~DeviceInfoSyncServiceTest() {}
+  ~DeviceInfoSyncServiceTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     local_device_.reset(new LocalDeviceInfoProviderMock(
         "guid_1",
         "client_1",
@@ -93,9 +93,7 @@ class DeviceInfoSyncServiceTest : public testing::Test,
     sync_service_->AddObserver(this);
   }
 
-  virtual void TearDown() override {
-    sync_service_->RemoveObserver(this);
-  }
+  void TearDown() override { sync_service_->RemoveObserver(this); }
 
   void OnDeviceInfoChange() override { num_device_info_changed_callbacks_++; }
 
diff --git a/components/sync_driver/generic_change_processor_unittest.cc b/components/sync_driver/generic_change_processor_unittest.cc
index 56c9534..1491687 100644
--- a/components/sync_driver/generic_change_processor_unittest.cc
+++ b/components/sync_driver/generic_change_processor_unittest.cc
@@ -111,14 +111,14 @@ class SyncGenericChangeProcessorTest : public testing::Test {
       : syncable_service_ptr_factory_(&fake_syncable_service_),
         mock_attachment_service_(NULL) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Use kType by default, but allow test cases to re-initialize with whatever
     // type they choose.  Therefore, it's important that all type dependent
     // initialization occurs in InitializeForType.
     InitializeForType(kType);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     mock_attachment_service_ = NULL;
     if (test_user_share_) {
       test_user_share_->TearDown();
diff --git a/components/sync_driver/non_blocking_data_type_controller_unittest.cc b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
index d11476f..427ff3d 100644
--- a/components/sync_driver/non_blocking_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
@@ -128,7 +128,7 @@ class NonBlockingDataTypeControllerTest : public testing::Test {
         mock_context_proxy_(&mock_sync_context_, model_thread_, sync_thread_),
         auto_run_tasks_(true) {}
 
-  virtual ~NonBlockingDataTypeControllerTest() {}
+  ~NonBlockingDataTypeControllerTest() override {}
 
   // Connects the sync type proxy to the NonBlockingDataTypeController.
   void InitTypeSyncProxy() {
diff --git a/components/sync_driver/non_ui_data_type_controller_unittest.cc b/components/sync_driver/non_ui_data_type_controller_unittest.cc
index 61f6304..3652407 100644
--- a/components/sync_driver/non_ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_ui_data_type_controller_unittest.cc
@@ -180,7 +180,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
   SyncNonUIDataTypeControllerTest()
       : backend_thread_("dbthread") {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     backend_thread_.Start();
     change_processor_ = new SharedChangeProcessorMock();
     // All of these are refcounted, so don't need to be released.
@@ -192,9 +192,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
                                         backend_thread_.message_loop_proxy());
   }
 
-  virtual void TearDown() override {
-    backend_thread_.Stop();
-  }
+  void TearDown() override { backend_thread_.Stop(); }
 
   void WaitForDTC() {
     WaitableEvent done(true, false);
diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync_driver/sync_prefs_unittest.cc
index ffd5f1c..f88e4c7 100644
--- a/components/sync_driver/sync_prefs_unittest.cc
+++ b/components/sync_driver/sync_prefs_unittest.cc
@@ -25,7 +25,7 @@ using ::testing::StrictMock;
 
 class SyncPrefsTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
   }
 
diff --git a/components/sync_driver/ui_data_type_controller_unittest.cc b/components/sync_driver/ui_data_type_controller_unittest.cc
index 23878a2..aad254e 100644
--- a/components/sync_driver/ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/ui_data_type_controller_unittest.cc
@@ -33,7 +33,7 @@ class SyncUIDataTypeControllerTest : public testing::Test,
       : type_(syncer::PREFERENCES),
         change_processor_(NULL) {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     preference_dtc_ =
         new UIDataTypeController(
             base::MessageLoopProxy::current(),
@@ -43,7 +43,7 @@ class SyncUIDataTypeControllerTest : public testing::Test,
     SetStartExpectations();
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     // Must be done before we pump the loop.
     syncable_service_.StopSyncing(type_);
     preference_dtc_ = NULL;
diff --git a/components/timers/alarm_timer.h b/components/timers/alarm_timer.h
index f43a4fb..29eebc8 100644
--- a/components/timers/alarm_timer.h
+++ b/components/timers/alarm_timer.h
@@ -59,7 +59,7 @@ class AlarmTimer : public base::Timer,
              const base::Closure& user_task,
              bool is_repeating);
 
-  virtual ~AlarmTimer();
+  ~AlarmTimer() override;
 
   // Timer overrides.
   void Stop() override;
diff --git a/components/translate/core/browser/translate_script_unittest.cc b/components/translate/core/browser/translate_script_unittest.cc
index 8fb99b6..a211b68 100644
--- a/components/translate/core/browser/translate_script_unittest.cc
+++ b/components/translate/core/browser/translate_script_unittest.cc
@@ -23,15 +23,13 @@ class TranslateScriptTest : public testing::Test {
   TranslateScriptTest() : testing::Test() {}
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     script_.reset(new TranslateScript);
     DCHECK(script_.get());
     TranslateDownloadManager::GetInstance()->set_application_locale("en");
   }
 
-  virtual void TearDown() {
-    script_.reset();
-  }
+  void TearDown() override { script_.reset(); }
 
   void Request() {
     script_->Request(
diff --git a/components/user_manager/empty_user_info.h b/components/user_manager/empty_user_info.h
index 01dcfbf..52d677c 100644
--- a/components/user_manager/empty_user_info.h
+++ b/components/user_manager/empty_user_info.h
@@ -19,14 +19,14 @@ namespace user_manager {
 class USER_MANAGER_EXPORT EmptyUserInfo : public UserInfo {
  public:
   EmptyUserInfo();
-  virtual ~EmptyUserInfo();
+  ~EmptyUserInfo() override;
 
   // UserInfo:
-  virtual base::string16 GetDisplayName() const override;
-  virtual base::string16 GetGivenName() const override;
-  virtual std::string GetEmail() const override;
-  virtual std::string GetUserID() const override;
-  virtual const gfx::ImageSkia& GetImage() const override;
+  base::string16 GetDisplayName() const override;
+  base::string16 GetGivenName() const override;
+  std::string GetEmail() const override;
+  std::string GetUserID() const override;
+  const gfx::ImageSkia& GetImage() const override;
 
  private:
   const gfx::ImageSkia null_image_;
diff --git a/components/user_manager/user_info_impl.h b/components/user_manager/user_info_impl.h
index ada257d..d23ca0c 100644
--- a/components/user_manager/user_info_impl.h
+++ b/components/user_manager/user_info_impl.h
@@ -18,14 +18,14 @@ namespace user_manager {
 class USER_MANAGER_EXPORT UserInfoImpl : public UserInfo {
  public:
   UserInfoImpl();
-  virtual ~UserInfoImpl();
+  ~UserInfoImpl() override;
 
   // UserInfo:
-  virtual base::string16 GetDisplayName() const override;
-  virtual base::string16 GetGivenName() const override;
-  virtual std::string GetEmail() const override;
-  virtual std::string GetUserID() const override;
-  virtual const gfx::ImageSkia& GetImage() const override;
+  base::string16 GetDisplayName() const override;
+  base::string16 GetGivenName() const override;
+  std::string GetEmail() const override;
+  std::string GetUserID() const override;
+  const gfx::ImageSkia& GetImage() const override;
 
  private:
   gfx::ImageSkia user_image_;
diff --git a/components/variations/net/variations_http_header_provider_unittest.cc b/components/variations/net/variations_http_header_provider_unittest.cc
index 6ed2ff4..2cb5c81 100644
--- a/components/variations/net/variations_http_header_provider_unittest.cc
+++ b/components/variations/net/variations_http_header_provider_unittest.cc
@@ -56,11 +56,9 @@ class VariationsHttpHeaderProviderTest : public ::testing::Test {
  public:
   VariationsHttpHeaderProviderTest() {}
 
-  virtual ~VariationsHttpHeaderProviderTest() {}
+  ~VariationsHttpHeaderProviderTest() override {}
 
-  virtual void TearDown() override {
-    testing::ClearAllVariationIDs();
-  }
+  void TearDown() override { testing::ClearAllVariationIDs(); }
 };
 
 TEST_F(VariationsHttpHeaderProviderTest, ShouldAppendHeaders) {
diff --git a/components/variations/variations_associated_data_unittest.cc b/components/variations/variations_associated_data_unittest.cc
index 8ca5f10..4878dcf 100644
--- a/components/variations/variations_associated_data_unittest.cc
+++ b/components/variations/variations_associated_data_unittest.cc
@@ -50,7 +50,7 @@ class VariationsAssociatedDataTest : public ::testing::Test {
   VariationsAssociatedDataTest() : field_trial_list_(NULL) {
   }
 
-  virtual ~VariationsAssociatedDataTest() {
+  ~VariationsAssociatedDataTest() override {
     // Ensure that the maps are cleared between tests, since they are stored as
     // process singletons.
     testing::ClearAllVariationIDs();
diff --git a/components/variations/variations_seed_processor_unittest.cc b/components/variations/variations_seed_processor_unittest.cc
index fe58842..4252ca9 100644
--- a/components/variations/variations_seed_processor_unittest.cc
+++ b/components/variations/variations_seed_processor_unittest.cc
@@ -111,7 +111,7 @@ class VariationsSeedProcessorTest : public ::testing::Test {
   VariationsSeedProcessorTest() {
   }
 
-  virtual ~VariationsSeedProcessorTest() {
+  ~VariationsSeedProcessorTest() override {
     // Ensure that the maps are cleared between tests, since they are stored as
     // process singletons.
     testing::ClearAllVariationIDs();
diff --git a/components/variations/variations_seed_simulator_unittest.cc b/components/variations/variations_seed_simulator_unittest.cc
index bf93fa5..965c6af 100644
--- a/components/variations/variations_seed_simulator_unittest.cc
+++ b/components/variations/variations_seed_simulator_unittest.cc
@@ -85,7 +85,7 @@ class VariationsSeedSimulatorTest : public ::testing::Test {
   VariationsSeedSimulatorTest() : field_trial_list_(NULL) {
   }
 
-  virtual ~VariationsSeedSimulatorTest() {
+  ~VariationsSeedSimulatorTest() override {
     // Ensure that the maps are cleared between tests, since they are stored as
     // process singletons.
     testing::ClearAllVariationIDs();
diff --git a/components/visitedlink/test/visitedlink_perftest.cc b/components/visitedlink/test/visitedlink_perftest.cc
index f3d3dca..fd598c1 100644
--- a/components/visitedlink/test/visitedlink_perftest.cc
+++ b/components/visitedlink/test/visitedlink_perftest.cc
@@ -64,12 +64,8 @@ void FillTable(VisitedLinkMaster& master, const char* prefix,
 class VisitedLink : public testing::Test {
  protected:
   base::FilePath db_path_;
-  virtual void SetUp() {
-    ASSERT_TRUE(base::CreateTemporaryFile(&db_path_));
-  }
-  virtual void TearDown() {
-    base::DeleteFile(db_path_, false);
-  }
+  void SetUp() override { ASSERT_TRUE(base::CreateTemporaryFile(&db_path_)); }
+  void TearDown() override { base::DeleteFile(db_path_, false); }
 };
 
 } // namespace
diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc
index d41759a..80f9222 100644
--- a/components/visitedlink/test/visitedlink_unittest.cc
+++ b/components/visitedlink/test/visitedlink_unittest.cc
@@ -205,7 +205,7 @@ class VisitedLinkTest : public testing::Test {
   }
 
   // testing::Test
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     history_dir_ = temp_dir_.path().AppendASCII("VisitedLinkTest");
@@ -214,9 +214,7 @@ class VisitedLinkTest : public testing::Test {
     visited_file_ = history_dir_.Append(FILE_PATH_LITERAL("VisitedLinks"));
   }
 
-  virtual void TearDown() {
-    ClearDB();
-  }
+  void TearDown() override { ClearDB(); }
 
   base::ScopedTempDir temp_dir_;
 
@@ -589,7 +587,7 @@ class VisitedLinkRenderProcessHostFactory
 
 class VisitedLinkEventsTest : public content::RenderViewHostTestHarness {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     SetRenderProcessHostFactory(&vc_rph_factory_);
     content::RenderViewHostTestHarness::SetUp();
   }
diff --git a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
index a22b1dd..a4f65ac 100644
--- a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
@@ -91,7 +91,7 @@ class WebContentsModalDialogManagerTest
         manager(NULL) {
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
 
     delegate.reset(new TestWebContentsModalDialogManagerDelegate);
@@ -101,7 +101,7 @@ class WebContentsModalDialogManagerTest
     test_api.reset(new WebContentsModalDialogManager::TestApi(manager));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     test_api.reset();
     content::RenderViewHostTestHarness::TearDown();
   }
diff --git a/components/webdata/common/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc
index 161d8ce..3174fc6 100644
--- a/components/webdata/common/web_database_migration_unittest.cc
+++ b/components/webdata/common/web_database_migration_unittest.cc
@@ -170,11 +170,9 @@ std::string RemoveQuotes(const std::string& has_quotes) {
 class WebDatabaseMigrationTest : public testing::Test {
  public:
   WebDatabaseMigrationTest() {}
-  virtual ~WebDatabaseMigrationTest() {}
+  ~WebDatabaseMigrationTest() override {}
 
-  virtual void SetUp() {
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-  }
+  void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
 
   // Load the database via the WebDatabase class and migrate the database to
   // the current version.