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

This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.

BUG=417463
TBR=zea@chromium.org

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

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

43 files changed, 219 insertions, 255 deletions

diff --git a/chrome/browser/sync/test/integration/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc
index 0c00dda..30634fb 100644
--- a/chrome/browser/sync/test/integration/apps_helper.cc
+++ b/chrome/browser/sync/test/integration/apps_helper.cc
@@ -146,46 +146,42 @@ class AppsMatchChecker : public StatusChangeChecker,
                          public content::NotificationObserver {
  public:
   explicit AppsMatchChecker(const std::vector<Profile*>& profiles);
-  virtual ~AppsMatchChecker();
+  ~AppsMatchChecker() override;
 
   // StatusChangeChecker implementation.
-  virtual std::string GetDebugMessage() const override;
-  virtual bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
 
   // extensions::ExtensionRegistryObserver implementation.
-  virtual void OnExtensionLoaded(
-      content::BrowserContext* context,
-      const extensions::Extension* extension) override;
-  virtual void OnExtensionUnloaded(
+  void OnExtensionLoaded(content::BrowserContext* context,
+                         const extensions::Extension* extension) override;
+  void OnExtensionUnloaded(
       content::BrowserContext* context,
       const extensions::Extension* extenion,
       extensions::UnloadedExtensionInfo::Reason reason) override;
-  virtual void OnExtensionInstalled(content::BrowserContext* browser_context,
-                                    const extensions::Extension* extension,
-                                    bool is_update) override;
-  virtual void OnExtensionUninstalled(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension,
-      extensions::UninstallReason reason) override;
+  void OnExtensionInstalled(content::BrowserContext* browser_context,
+                            const extensions::Extension* extension,
+                            bool is_update) override;
+  void OnExtensionUninstalled(content::BrowserContext* browser_context,
+                              const extensions::Extension* extension,
+                              extensions::UninstallReason reason) override;
 
   // extensions::ExtensionPrefsObserver implementation.
-  virtual void OnExtensionDisableReasonsChanged(const std::string& extension_id,
-                                                int disabled_reasons) override;
-  virtual void OnExtensionRegistered(const std::string& extension_id,
-                                     const base::Time& install_time,
-                                     bool is_enabled) override;
-  virtual void OnExtensionPrefsLoaded(
-      const std::string& extension_id,
-      const extensions::ExtensionPrefs* prefs) override;
-  virtual void OnExtensionPrefsDeleted(
-      const std::string& extension_id) override;
-  virtual void OnExtensionStateChanged(const std::string& extension_id,
-                                       bool state) override;
+  void OnExtensionDisableReasonsChanged(const std::string& extension_id,
+                                        int disabled_reasons) override;
+  void OnExtensionRegistered(const std::string& extension_id,
+                             const base::Time& install_time,
+                             bool is_enabled) override;
+  void OnExtensionPrefsLoaded(const std::string& extension_id,
+                              const extensions::ExtensionPrefs* prefs) override;
+  void OnExtensionPrefsDeleted(const std::string& extension_id) override;
+  void OnExtensionStateChanged(const std::string& extension_id,
+                               bool state) override;
 
   // Implementation of content::NotificationObserver.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   void Wait();
 
diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc
index 03e0720..7ca66e9 100644
--- a/chrome/browser/sync/test/integration/autofill_helper.cc
+++ b/chrome/browser/sync/test/integration/autofill_helper.cc
@@ -242,10 +242,10 @@ namespace {
 class KeysMatchStatusChecker : public MultiClientStatusChangeChecker {
  public:
   KeysMatchStatusChecker(int profile_a, int profile_b);
-  virtual ~KeysMatchStatusChecker();
+  ~KeysMatchStatusChecker() override;
 
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
  private:
   const int profile_a_;
@@ -419,14 +419,14 @@ class ProfilesMatchStatusChecker : public StatusChangeChecker,
                                    public PersonalDataManagerObserver {
  public:
   ProfilesMatchStatusChecker(int profile_a, int profile_b);
-  virtual ~ProfilesMatchStatusChecker();
+  ~ProfilesMatchStatusChecker() override;
 
   // StatusChangeChecker implementation.
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
   // PersonalDataManager implementation.
-  virtual void OnPersonalDataChanged() override;
+  void OnPersonalDataChanged() override;
 
   // Wait for conidtion to beome true.
   void Wait();
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 780040c..1874a49 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -49,17 +49,17 @@ class HistoryEmptyTask : public history::HistoryDBTask {
  public:
   explicit HistoryEmptyTask(base::WaitableEvent* done) : done_(done) {}
 
-  virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) override {
+  bool RunOnDBThread(history::HistoryBackend* backend,
+                     history::HistoryDatabase* db) override {
     content::RunAllPendingInMessageLoop();
     done_->Signal();
     return true;
   }
 
-  virtual void DoneRunOnMainThread() override {}
+  void DoneRunOnMainThread() override {}
 
  private:
-  virtual ~HistoryEmptyTask() {}
+  ~HistoryEmptyTask() override {}
 
   base::WaitableEvent* done_;
 };
@@ -74,9 +74,7 @@ class FaviconChangeObserver : public BookmarkModelObserver {
         wait_for_load_(false) {
     model->AddObserver(this);
   }
-  virtual ~FaviconChangeObserver() {
-    model_->RemoveObserver(this);
-  }
+  ~FaviconChangeObserver() override { model_->RemoveObserver(this); }
   void WaitForGetFavicon() {
     wait_for_load_ = true;
     content::RunMessageLoop();
@@ -87,37 +85,34 @@ class FaviconChangeObserver : public BookmarkModelObserver {
     wait_for_load_ = false;
     content::RunMessageLoop();
   }
-  virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) override {}
-  virtual void BookmarkNodeMoved(BookmarkModel* model,
-                                 const BookmarkNode* old_parent,
-                                 int old_index,
-                                 const BookmarkNode* new_parent,
-                                 int new_index) override {}
-  virtual void BookmarkNodeAdded(BookmarkModel* model,
-                                 const BookmarkNode* parent,
-                                 int index) override {}
-  virtual void BookmarkNodeRemoved(
-      BookmarkModel* model,
-      const BookmarkNode* parent,
-      int old_index,
-      const BookmarkNode* node,
-      const std::set<GURL>& removed_urls) override {}
-  virtual void BookmarkAllUserNodesRemoved(
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override {
+  }
+  void BookmarkNodeMoved(BookmarkModel* model,
+                         const BookmarkNode* old_parent,
+                         int old_index,
+                         const BookmarkNode* new_parent,
+                         int new_index) override {}
+  void BookmarkNodeAdded(BookmarkModel* model,
+                         const BookmarkNode* parent,
+                         int index) override {}
+  void BookmarkNodeRemoved(BookmarkModel* model,
+                           const BookmarkNode* parent,
+                           int old_index,
+                           const BookmarkNode* node,
+                           const std::set<GURL>& removed_urls) override {}
+  void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
       const std::set<GURL>& removed_urls) override {}
 
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) override {
+  void BookmarkNodeChanged(BookmarkModel* model,
+                           const BookmarkNode* node) override {
     if (model == model_ && node == node_)
       model->GetFavicon(node);
   }
-  virtual void BookmarkNodeChildrenReordered(
-      BookmarkModel* model,
-      const BookmarkNode* node) override {}
-  virtual void BookmarkNodeFaviconChanged(
-      BookmarkModel* model,
-      const BookmarkNode* node) override {
+  void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                     const BookmarkNode* node) override {}
+  void BookmarkNodeFaviconChanged(BookmarkModel* model,
+                                  const BookmarkNode* node) override {
     if (model == model_ && node == node_) {
       if (!wait_for_load_ || (wait_for_load_ && node->is_favicon_loaded()))
         base::MessageLoopForUI::current()->Quit();
@@ -709,10 +704,10 @@ namespace {
 class AllModelsMatchChecker : public MultiClientStatusChangeChecker {
  public:
   AllModelsMatchChecker();
-  virtual ~AllModelsMatchChecker();
+  ~AllModelsMatchChecker() override;
 
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 };
 
 AllModelsMatchChecker::AllModelsMatchChecker()
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index 00e79ee..ed9a364 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -20,7 +20,8 @@ class EnableDisableSingleClientTest : public SyncTest {
   virtual ~EnableDisableSingleClientTest() {}
 
   // Don't use self-notifications as they can trigger additional sync cycles.
-  virtual bool TestUsesSelfNotifications() override { return false; }
+  bool TestUsesSelfNotifications() override { return false; }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
 };
diff --git a/chrome/browser/sync/test/integration/extensions_helper.cc b/chrome/browser/sync/test/integration/extensions_helper.cc
index 90b33d2..a9663790 100644
--- a/chrome/browser/sync/test/integration/extensions_helper.cc
+++ b/chrome/browser/sync/test/integration/extensions_helper.cc
@@ -141,28 +141,25 @@ class ExtensionsMatchChecker : public StatusChangeChecker,
                                public extensions::ExtensionRegistryObserver {
  public:
   explicit ExtensionsMatchChecker(const std::vector<Profile*>& profiles);
-  virtual ~ExtensionsMatchChecker();
+  ~ExtensionsMatchChecker() override;
 
   // StatusChangeChecker implementation.
-  virtual std::string GetDebugMessage() const override;
-  virtual bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
 
   // extensions::ExtensionRegistryObserver implementation.
-  virtual void OnExtensionLoaded(
-      content::BrowserContext* context,
-      const extensions::Extension* extension) override;
-  virtual void OnExtensionUnloaded(
+  void OnExtensionLoaded(content::BrowserContext* context,
+                         const extensions::Extension* extension) override;
+  void OnExtensionUnloaded(
       content::BrowserContext* context,
       const extensions::Extension* extenion,
       extensions::UnloadedExtensionInfo::Reason reason) override;
-  virtual void OnExtensionInstalled(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension,
-      bool is_update) override;
-  virtual void OnExtensionUninstalled(
-      content::BrowserContext* browser_context,
-      const extensions::Extension* extension,
-      extensions::UninstallReason reason) override;
+  void OnExtensionInstalled(content::BrowserContext* browser_context,
+                            const extensions::Extension* extension,
+                            bool is_update) override;
+  void OnExtensionUninstalled(content::BrowserContext* browser_context,
+                              const extensions::Extension* extension,
+                              extensions::UninstallReason reason) override;
 
   void Wait();
 
diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
index 25b1d31..ebd344f 100644
--- a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
+++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
@@ -27,22 +27,21 @@ class FakeServerInvalidationService : public invalidation::InvalidationService,
                                       public FakeServer::Observer {
  public:
   FakeServerInvalidationService();
-  virtual ~FakeServerInvalidationService();
+  ~FakeServerInvalidationService() override;
 
-  virtual void RegisterInvalidationHandler(
+  void RegisterInvalidationHandler(
       syncer::InvalidationHandler* handler) override;
-  virtual void UpdateRegisteredInvalidationIds(
-      syncer::InvalidationHandler* handler,
-      const syncer::ObjectIdSet& ids) override;
-  virtual void UnregisterInvalidationHandler(
+  void UpdateRegisteredInvalidationIds(syncer::InvalidationHandler* handler,
+                                       const syncer::ObjectIdSet& ids) override;
+  void UnregisterInvalidationHandler(
       syncer::InvalidationHandler* handler) override;
 
-  virtual syncer::InvalidatorState GetInvalidatorState() const override;
-  virtual std::string GetInvalidatorClientId() const override;
-  virtual invalidation::InvalidationLogger* GetInvalidationLogger() override;
-  virtual void RequestDetailedStatus(
+  syncer::InvalidatorState GetInvalidatorState() const override;
+  std::string GetInvalidatorClientId() const override;
+  invalidation::InvalidationLogger* GetInvalidationLogger() override;
+  void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> caller) const override;
-  virtual IdentityProvider* GetIdentityProvider() override;
+  IdentityProvider* GetIdentityProvider() override;
 
   // Functions to enable or disable sending of self-notifications.  In the real
   // world, clients do not receive notifications of their own commits.
@@ -50,9 +49,8 @@ class FakeServerInvalidationService : public invalidation::InvalidationService,
   void DisableSelfNotifications();
 
   // FakeServer::Observer:
-  virtual void OnCommit(
-      const std::string& committer_id,
-      syncer::ModelTypeSet committed_model_types) override;
+  void OnCommit(const std::string& committer_id,
+                syncer::ModelTypeSet committed_model_types) override;
 
  private:
   std::string client_id_;
diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc
index 276a29c..ef2ac1e 100644
--- a/chrome/browser/sync/test/integration/migration_test.cc
+++ b/chrome/browser/sync/test/integration/migration_test.cc
@@ -77,7 +77,7 @@ class MigrationTest : public SyncTest  {
   // Set up sync for all profiles and initialize all MigrationWatchers. This
   // helps ensure that all migration events are captured, even if they were to
   // occur before a test calls AwaitMigration for a specific profile.
-  virtual bool SetupSync() override {
+  bool SetupSync() override {
     if (!SyncTest::SetupSync())
       return false;
 
@@ -421,7 +421,7 @@ class MigrationReconfigureTest : public MigrationTwoClientTest {
  public:
   MigrationReconfigureTest() {}
 
-  virtual void SetUpCommandLine(base::CommandLine* cl) override {
+  void SetUpCommandLine(base::CommandLine* cl) override {
     AddTestSwitches(cl);
     // Do not add optional datatypes.
   }
diff --git a/chrome/browser/sync/test/integration/migration_waiter.h b/chrome/browser/sync/test/integration/migration_waiter.h
index 836f7be..5261d8e 100644
--- a/chrome/browser/sync/test/integration/migration_waiter.h
+++ b/chrome/browser/sync/test/integration/migration_waiter.h
@@ -22,11 +22,11 @@ class MigrationWaiter : public StatusChangeChecker {
   MigrationWaiter(syncer::ModelTypeSet expected_types,
                   MigrationWatcher* watcher);
 
-  virtual ~MigrationWaiter();
+  ~MigrationWaiter() override;
 
   // Implementation of StatusChangeChecker.
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
   // Function to trigger the waiting.
   void Wait();
diff --git a/chrome/browser/sync/test/integration/migration_watcher.h b/chrome/browser/sync/test/integration/migration_watcher.h
index 00f42ca..31458b2 100644
--- a/chrome/browser/sync/test/integration/migration_watcher.h
+++ b/chrome/browser/sync/test/integration/migration_watcher.h
@@ -16,7 +16,7 @@ class MigrationWaiter;
 class MigrationWatcher : public browser_sync::MigrationObserver {
  public:
   explicit MigrationWatcher(ProfileSyncServiceHarness* harness);
-  virtual ~MigrationWatcher();
+  ~MigrationWatcher() override;
 
   // Returns true if the observed profile has a migration in progress.
   bool HasPendingBackendMigration() const;
@@ -25,7 +25,7 @@ class MigrationWatcher : public browser_sync::MigrationObserver {
   syncer::ModelTypeSet GetMigratedTypes() const;
 
   // Implementation of browser_sync::MigrationObserver.
-  virtual void OnMigrationStateChange() override;
+  void OnMigrationStateChange() override;
 
   // Registers the |waiter| to receive callbacks on migration state change.
   void set_migration_waiter(MigrationWaiter* waiter);
diff --git a/chrome/browser/sync/test/integration/multi_client_status_change_checker.h b/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
index c6efdcf..f167933 100644
--- a/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
+++ b/chrome/browser/sync/test/integration/multi_client_status_change_checker.h
@@ -23,7 +23,7 @@ class MultiClientStatusChangeChecker
  public:
   explicit MultiClientStatusChangeChecker(
       std::vector<ProfileSyncService*> services);
-  virtual ~MultiClientStatusChangeChecker();
+  ~MultiClientStatusChangeChecker() override;
 
   // Called when waiting times out.
   void OnTimeout();
@@ -32,7 +32,7 @@ class MultiClientStatusChangeChecker
   void Wait();
 
   // ProfileSyncServiceObserver implementation.
-  virtual void OnStateChanged() override;
+  void OnStateChanged() override;
 
   // StatusChangeChecker implementations and stubs.
   virtual bool IsExitConditionSatisfied() = 0;
diff --git a/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc
index 0275c57..34f77672 100644
--- a/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc
@@ -15,9 +15,7 @@ class MultipleClientBookmarksSyncTest : public SyncTest {
   MultipleClientBookmarksSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientBookmarksSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override {
-    return false;
-  }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MultipleClientBookmarksSyncTest);
diff --git a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
index 8b95a87..fe12e9b 100644
--- a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc
@@ -35,9 +35,7 @@ class MultipleClientPasswordsSyncTest : public SyncTest {
   MultipleClientPasswordsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientPasswordsSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override {
-    return false;
-  }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MultipleClientPasswordsSyncTest);
diff --git a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
index 7f2b0f1..74ebe3a 100644
--- a/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_preferences_sync_test.cc
@@ -16,9 +16,7 @@ class MultipleClientPreferencesSyncTest : public SyncTest {
   MultipleClientPreferencesSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientPreferencesSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override {
-    return false;
-  }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MultipleClientPreferencesSyncTest);
diff --git a/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc
index 0a5c6cd..fff823a 100644
--- a/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc
@@ -20,9 +20,7 @@ class MultipleClientTypedUrlsSyncTest : public SyncTest {
   MultipleClientTypedUrlsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
   virtual ~MultipleClientTypedUrlsSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override {
-    return false;
-  }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MultipleClientTypedUrlsSyncTest);
diff --git a/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h b/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h
index f447de9..be10c92 100644
--- a/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h
+++ b/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h
@@ -27,11 +27,11 @@ class P2PInvalidationForwarder : public ProfileSyncServiceObserver {
   P2PInvalidationForwarder(
       ProfileSyncService* sync_service,
       invalidation::P2PInvalidationService* invalidation_service);
-  virtual ~P2PInvalidationForwarder();
+  ~P2PInvalidationForwarder() override;
 
   // Implementation of ProfileSyncServiceObserver
-  virtual void OnStateChanged() override;
-  virtual void OnSyncCycleCompleted() override;
+  void OnStateChanged() override;
+  void OnSyncCycleCompleted() override;
 
  private:
   ProfileSyncService* sync_service_;
diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc
index c92ab67..331bc00 100644
--- a/chrome/browser/sync/test/integration/passwords_helper.cc
+++ b/chrome/browser/sync/test/integration/passwords_helper.cc
@@ -44,7 +44,7 @@ class PasswordStoreConsumerHelper
   explicit PasswordStoreConsumerHelper(std::vector<PasswordForm>* result)
       : password_manager::PasswordStoreConsumer(), result_(result) {}
 
-  virtual void OnGetPasswordStoreResults(
+  void OnGetPasswordStoreResults(
       const std::vector<PasswordForm*>& result) override {
     result_->clear();
     for (std::vector<PasswordForm*>::const_iterator it = result.begin();
@@ -217,10 +217,10 @@ namespace {
 class SamePasswordFormsChecker : public MultiClientStatusChangeChecker {
  public:
   SamePasswordFormsChecker();
-  virtual ~SamePasswordFormsChecker();
+  ~SamePasswordFormsChecker() override;
 
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
  private:
   bool in_progress_;
@@ -287,10 +287,10 @@ class SamePasswordFormsAsVerifierChecker
     : public SingleClientStatusChangeChecker {
  public:
   explicit SamePasswordFormsAsVerifierChecker(int index);
-  virtual ~SamePasswordFormsAsVerifierChecker();
+  ~SamePasswordFormsAsVerifierChecker() override;
 
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
  private:
   int index_;
diff --git a/chrome/browser/sync/test/integration/preferences_helper.cc b/chrome/browser/sync/test/integration/preferences_helper.cc
index e1afc6b..1f1fd06 100644
--- a/chrome/browser/sync/test/integration/preferences_helper.cc
+++ b/chrome/browser/sync/test/integration/preferences_helper.cc
@@ -216,11 +216,11 @@ namespace {
 class PrefMatchChecker : public StatusChangeChecker {
  public:
   explicit PrefMatchChecker(const char* path);
-  virtual ~PrefMatchChecker();
+  ~PrefMatchChecker() override;
 
   // StatusChangeChecker implementation.
   virtual bool IsExitConditionSatisfied() = 0;
-  virtual std::string GetDebugMessage() const override;
+  std::string GetDebugMessage() const override;
 
   // Wait for condition to become true.
   void Wait();
@@ -278,10 +278,10 @@ void PrefMatchChecker::RegisterPrefListener(PrefService* pref_service) {
 class ListPrefMatchChecker : public PrefMatchChecker {
  public:
   explicit ListPrefMatchChecker(const char* path);
-  virtual ~ListPrefMatchChecker();
+  ~ListPrefMatchChecker() override;
 
   // Implementation of PrefMatchChecker.
-  virtual bool IsExitConditionSatisfied() override;
+  bool IsExitConditionSatisfied() override;
 };
 
 ListPrefMatchChecker::ListPrefMatchChecker(const char* path)
@@ -299,10 +299,10 @@ bool ListPrefMatchChecker::IsExitConditionSatisfied() {
 class BooleanPrefMatchChecker : public PrefMatchChecker {
  public:
   explicit BooleanPrefMatchChecker(const char* path);
-  virtual ~BooleanPrefMatchChecker();
+  ~BooleanPrefMatchChecker() override;
 
   // Implementation of PrefMatchChecker.
-  virtual bool IsExitConditionSatisfied() override;
+  bool IsExitConditionSatisfied() override;
 };
 
 BooleanPrefMatchChecker::BooleanPrefMatchChecker(const char* path)
@@ -320,10 +320,10 @@ bool BooleanPrefMatchChecker::IsExitConditionSatisfied() {
 class IntegerPrefMatchChecker : public PrefMatchChecker {
  public:
   explicit IntegerPrefMatchChecker(const char* path);
-  virtual ~IntegerPrefMatchChecker();
+  ~IntegerPrefMatchChecker() override;
 
   // Implementation of PrefMatchChecker.
-  virtual bool IsExitConditionSatisfied() override;
+  bool IsExitConditionSatisfied() override;
 };
 
 IntegerPrefMatchChecker::IntegerPrefMatchChecker(const char* path)
@@ -341,10 +341,10 @@ bool IntegerPrefMatchChecker::IsExitConditionSatisfied() {
 class StringPrefMatchChecker : public PrefMatchChecker {
  public:
   explicit StringPrefMatchChecker(const char* path);
-  virtual ~StringPrefMatchChecker();
+  ~StringPrefMatchChecker() override;
 
   // Implementation of PrefMatchChecker.
-  virtual bool IsExitConditionSatisfied() override;
+  bool IsExitConditionSatisfied() override;
 };
 
 StringPrefMatchChecker::StringPrefMatchChecker(const char* path)
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
index 0338a19..aeb827b 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
@@ -50,7 +50,7 @@ class BackendInitializeChecker : public SingleClientStatusChangeChecker {
   explicit BackendInitializeChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     if (service()->backend_mode() != ProfileSyncService::SYNC)
       return false;
     if (service()->backend_initialized())
@@ -65,9 +65,7 @@ class BackendInitializeChecker : public SingleClientStatusChangeChecker {
     return false;
   }
 
-  virtual std::string GetDebugMessage() const override {
-    return "Backend Initialize";
-  }
+  std::string GetDebugMessage() const override { return "Backend Initialize"; }
 };
 
 class SyncSetupChecker : public SingleClientStatusChangeChecker {
@@ -75,7 +73,7 @@ class SyncSetupChecker : public SingleClientStatusChangeChecker {
   explicit SyncSetupChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     if (!service()->SyncActive())
       return false;
     if (service()->ConfigurationDone())
@@ -90,9 +88,7 @@ class SyncSetupChecker : public SingleClientStatusChangeChecker {
     return false;
   }
 
-  virtual std::string GetDebugMessage() const override {
-    return "Sync Setup";
-  }
+  std::string GetDebugMessage() const override { return "Sync Setup"; }
 };
 
 }  // namespace
diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
index 0fba2e1..9d2b316 100644
--- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
+++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
@@ -73,8 +73,8 @@ class ProgressMarkerWatcher : public ProfileSyncServiceObserver {
   ProgressMarkerWatcher(
       ProfileSyncService* service,
       QuiesceStatusChangeChecker* quiesce_checker);
-  virtual ~ProgressMarkerWatcher();
-  virtual void OnStateChanged() override;
+  ~ProgressMarkerWatcher() override;
+  void OnStateChanged() override;
 
   bool HasLatestProgressMarkers();
   bool IsSyncDisabled();
diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.h b/chrome/browser/sync/test/integration/quiesce_status_change_checker.h
index 246d3ba..e481227 100644
--- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.h
+++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.h
@@ -32,7 +32,7 @@ class QuiesceStatusChangeChecker : public StatusChangeChecker {
  public:
   explicit QuiesceStatusChangeChecker(
       std::vector<ProfileSyncService*> services);
-  virtual ~QuiesceStatusChangeChecker();
+  ~QuiesceStatusChangeChecker() override;
 
   // Blocks until all clients have quiesced or we time out.
   void Wait();
@@ -41,8 +41,8 @@ class QuiesceStatusChangeChecker : public StatusChangeChecker {
   void OnServiceStateChanged(ProfileSyncService* service);
 
   // Implementation of StatusChangeChecker.
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
  private:
   std::vector<ProfileSyncService*> services_;
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc
index 8f9b180..6ab0e67 100644
--- a/chrome/browser/sync/test/integration/sessions_helper.cc
+++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -136,7 +136,7 @@ class TabEventHandler : public browser_sync::LocalSessionEventHandler {
         TestTimeouts::action_max_timeout());
   }
 
-  virtual void OnLocalTabModified(
+  void OnLocalTabModified(
       browser_sync::SyncedTabDelegate* modified_tab) override {
     // Unwind to ensure SessionsSyncManager has processed the event.
     base::MessageLoop::current()->PostTask(
@@ -144,7 +144,7 @@ class TabEventHandler : public browser_sync::LocalSessionEventHandler {
         base::Bind(&TabEventHandler::QuitLoop, weak_factory_.GetWeakPtr()));
   }
 
-  virtual void OnFaviconPageUrlsUpdated(
+  void OnFaviconPageUrlsUpdated(
       const std::set<GURL>& updated_page_urls) override {
     // Unwind to ensure SessionsSyncManager has processed the event.
     base::MessageLoop::current()->PostTask(
@@ -367,10 +367,11 @@ class CheckForeignSessionsChecker : public MultiClientStatusChangeChecker {
  public:
   CheckForeignSessionsChecker(int index,
                               const std::vector<ScopedWindowMap>& windows);
-  virtual ~CheckForeignSessionsChecker();
+  ~CheckForeignSessionsChecker() override;
+
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
  private:
   int index_;
   const std::vector<ScopedWindowMap>& windows_;
diff --git a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
index fcaa9c0..7fe2b96 100644
--- a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
@@ -33,12 +33,12 @@ class SingleClientAppListSyncTest : public SyncTest {
   virtual ~SingleClientAppListSyncTest() {}
 
   // SyncTest
-  virtual void SetUpCommandLine(CommandLine* command_line) override {
+  void SetUpCommandLine(CommandLine* command_line) override {
     SyncTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(app_list::switches::kEnableSyncAppList);
   }
 
-  virtual bool SetupClients() override {
+  bool SetupClients() override {
     if (!SyncTest::SetupClients())
       return false;
 
diff --git a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
index b819a80..bf6b34c 100644
--- a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
@@ -82,7 +82,7 @@ class SyncBackendStoppedChecker : public ProfileSyncServiceBase::Observer {
         timeout_(TestTimeouts::action_max_timeout()),
         done_(false) {}
 
-  virtual void OnStateChanged() override {
+  void OnStateChanged() override {
     if (ProfileSyncService::IDLE == pss_->backend_mode()) {
       done_ = true;
       run_loop_.Quit();
@@ -121,7 +121,7 @@ class SyncRollbackChecker : public ProfileSyncServiceBase::Observer,
         clear_done_(false) {}
 
   // ProfileSyncServiceBase::Observer implementation.
-  virtual void OnStateChanged() override {
+  void OnStateChanged() override {
     if (ProfileSyncService::ROLLBACK == pss_->backend_mode()) {
       rollback_started_ = true;
       if (clear_done_)
@@ -130,7 +130,7 @@ class SyncRollbackChecker : public ProfileSyncServiceBase::Observer,
   }
 
   // BrowsingDataRemoverObserver::Observer implementation.
-  virtual void OnBrowsingDataRemoverDone() override {
+  void OnBrowsingDataRemoverDone() override {
     clear_done_ = true;
     if (rollback_started_) {
       run_loop_.Quit();
diff --git a/chrome/browser/sync/test/integration/single_client_status_change_checker.h b/chrome/browser/sync/test/integration/single_client_status_change_checker.h
index a7c4a80..d76e2ca 100644
--- a/chrome/browser/sync/test/integration/single_client_status_change_checker.h
+++ b/chrome/browser/sync/test/integration/single_client_status_change_checker.h
@@ -19,7 +19,7 @@ class SingleClientStatusChangeChecker
   : public MultiClientStatusChangeChecker {
  public:
   explicit SingleClientStatusChangeChecker(ProfileSyncService* service);
-  virtual ~SingleClientStatusChangeChecker();
+  ~SingleClientStatusChangeChecker() override;
 
   // StatusChangeChecker implementations and stubs.
   virtual bool IsExitConditionSatisfied() = 0;
diff --git a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc
index bab4a08..200c399 100644
--- a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc
@@ -25,7 +25,7 @@ class SingleClientSupervisedUserSettingsSyncTest : public SyncTest {
   virtual ~SingleClientSupervisedUserSettingsSyncTest() {}
 
   // SyncTest overrides:
-  virtual void SetUpCommandLine(CommandLine* command_line) override {
+  void SetUpCommandLine(CommandLine* command_line) override {
     SyncTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
   }
diff --git a/chrome/browser/sync/test/integration/sync_auth_test.cc b/chrome/browser/sync/test/integration/sync_auth_test.cc
index db1bc2e..0f958c2 100644
--- a/chrome/browser/sync/test/integration/sync_auth_test.cc
+++ b/chrome/browser/sync/test/integration/sync_auth_test.cc
@@ -50,9 +50,9 @@ const char kMalformedOAuth2Token[] = "{ \"foo\": ";
 class TestForAuthError : public SingleClientStatusChangeChecker {
  public:
   explicit TestForAuthError(ProfileSyncService* service);
-  virtual ~TestForAuthError();
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  ~TestForAuthError() override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 };
 
 TestForAuthError::TestForAuthError(ProfileSyncService* service)
diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index 3771f69..2493260 100644
--- a/chrome/browser/sync/test/integration/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
@@ -27,14 +27,12 @@ class SyncDisabledChecker : public SingleClientStatusChangeChecker {
   explicit SyncDisabledChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     return !service()->setup_in_progress() &&
            !service()->HasSyncSetupCompleted();
   }
 
-  virtual std::string GetDebugMessage() const override {
-    return "Sync Disabled";
-  }
+  std::string GetDebugMessage() const override { return "Sync Disabled"; }
 };
 
 class TypeDisabledChecker : public SingleClientStatusChangeChecker {
@@ -43,13 +41,11 @@ class TypeDisabledChecker : public SingleClientStatusChangeChecker {
                                syncer::ModelType type)
       : SingleClientStatusChangeChecker(service), type_(type) {}
 
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     return !service()->GetActiveDataTypes().Has(type_);
   }
 
-  virtual std::string GetDebugMessage() const override {
-    return "Type disabled";
-  }
+  std::string GetDebugMessage() const override { return "Type disabled"; }
  private:
    syncer::ModelType type_;
 };
@@ -82,18 +78,18 @@ class ActionableErrorChecker : public SingleClientStatusChangeChecker {
   explicit ActionableErrorChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
-  virtual ~ActionableErrorChecker() {}
+  ~ActionableErrorChecker() override {}
 
   // Checks if an actionable error has been hit. Called repeatedly each time PSS
   // notifies observers of a state change.
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     ProfileSyncService::Status status;
     service()->QueryDetailedSyncStatus(&status);
     return (status.sync_protocol_error.action != syncer::UNKNOWN_ACTION &&
             service()->HasUnrecoverableError());
   }
 
-  virtual std::string GetDebugMessage() const override {
+  std::string GetDebugMessage() const override {
     return "ActionableErrorChecker";
   }
 
diff --git a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc
index 52737fa..58ee9c3 100644
--- a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc
+++ b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc
@@ -37,17 +37,17 @@ class ExponentialBackoffChecker : public SingleClientStatusChangeChecker {
     retry_verifier_.Initialize(snap);
   }
 
-  virtual ~ExponentialBackoffChecker() {}
+  ~ExponentialBackoffChecker() override {}
 
   // Checks if backoff is complete. Called repeatedly each time PSS notifies
   // observers of a state change.
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     const SyncSessionSnapshot& snap = service()->GetLastSessionSnapshot();
     retry_verifier_.VerifyRetryInterval(snap);
     return (retry_verifier_.done() && retry_verifier_.Succeeded());
   }
 
-  virtual std::string GetDebugMessage() const override {
+  std::string GetDebugMessage() const override {
     return base::StringPrintf("Verifying backoff intervals (%d/%d)",
                               retry_verifier_.retry_count(),
                               RetryVerifier::kMaxRetry);
diff --git a/chrome/browser/sync/test/integration/sync_extension_installer.h b/chrome/browser/sync/test/integration/sync_extension_installer.h
index cd73ae4..5c91cb9 100644
--- a/chrome/browser/sync/test/integration/sync_extension_installer.h
+++ b/chrome/browser/sync/test/integration/sync_extension_installer.h
@@ -26,12 +26,12 @@ class Profile;
 class SyncedExtensionInstaller : public content::NotificationObserver {
  public:
   explicit SyncedExtensionInstaller(Profile* profile);
-  virtual ~SyncedExtensionInstaller();
+  ~SyncedExtensionInstaller() override;
 
   // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
  private:
   void DoInstallSyncedExtensions();
diff --git a/chrome/browser/sync/test/integration/sync_integration_test_util.cc b/chrome/browser/sync/test/integration/sync_integration_test_util.cc
index 4c4e8d3..248d051 100644
--- a/chrome/browser/sync/test/integration/sync_integration_test_util.cc
+++ b/chrome/browser/sync/test/integration/sync_integration_test_util.cc
@@ -15,13 +15,11 @@ class PassphraseRequiredChecker : public SingleClientStatusChangeChecker {
   explicit PassphraseRequiredChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     return service()->IsPassphraseRequired();
   }
 
-  virtual std::string GetDebugMessage() const override {
-    return "Passhrase Required";
-  }
+  std::string GetDebugMessage() const override { return "Passhrase Required"; }
 };
 
 class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker {
@@ -29,14 +27,12 @@ class PassphraseAcceptedChecker : public SingleClientStatusChangeChecker {
   explicit PassphraseAcceptedChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     return !service()->IsPassphraseRequired() &&
         service()->IsUsingSecondaryPassphrase();
   }
 
-  virtual std::string GetDebugMessage() const override {
-    return "Passhrase Accepted";
-  }
+  std::string GetDebugMessage() const override { return "Passhrase Accepted"; }
 };
 
 bool AwaitPassphraseRequired(ProfileSyncService* service) {
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index f3c5d9b..dc27dc4 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -98,7 +98,7 @@ class SyncServerStatusChecker : public net::URLFetcherDelegate {
  public:
   SyncServerStatusChecker() : running_(false) {}
 
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override {
+  void OnURLFetchComplete(const net::URLFetcher* source) override {
     std::string data;
     source->GetResponseAsString(&data);
     running_ =
@@ -123,13 +123,11 @@ class EncryptionChecker : public SingleClientStatusChangeChecker {
   explicit EncryptionChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
-  virtual bool IsExitConditionSatisfied() override {
+  bool IsExitConditionSatisfied() override {
     return IsEncryptionComplete(service());
   }
 
-  virtual std::string GetDebugMessage() const override {
-    return "Encryption";
-  }
+  std::string GetDebugMessage() const override { return "Encryption"; }
 };
 
 void SetupNetworkCallback(
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index db0e634..e67ea2e 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -107,7 +107,7 @@ class SyncTest : public InProcessBrowserTest {
   virtual void TearDown() override;
 
   // Sets up command line flags required for sync tests.
-  virtual void SetUpCommandLine(base::CommandLine* cl) override;
+  void SetUpCommandLine(base::CommandLine* cl) override;
 
   // Used to get the number of sync clients used by a test.
   int num_clients() WARN_UNUSED_RESULT { return num_clients_; }
@@ -227,15 +227,15 @@ class SyncTest : public InProcessBrowserTest {
 
   // BrowserTestBase override. Destroys all the sync clients and sync
   // profiles created by a test.
-  virtual void TearDownOnMainThread() override;
+  void TearDownOnMainThread() override;
 
   // InProcessBrowserTest override. Changes behavior of the default host
   // resolver to avoid DNS lookup errors.
-  virtual void SetUpInProcessBrowserTestFixture() override;
+  void SetUpInProcessBrowserTestFixture() override;
 
   // InProcessBrowserTest override. Resets the host resolver its default
   // behavior.
-  virtual void TearDownInProcessBrowserTestFixture() override;
+  void TearDownInProcessBrowserTestFixture() override;
 
   // Creates Profile, Browser and ProfileSyncServiceHarness instances for
   // |index|. Used by SetupClients().
diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc
index db6dc67..324745e 100644
--- a/chrome/browser/sync/test/integration/themes_helper.cc
+++ b/chrome/browser/sync/test/integration/themes_helper.cc
@@ -87,16 +87,16 @@ class ThemePendingInstallChecker : public StatusChangeChecker,
                                    public content::NotificationObserver {
  public:
   ThemePendingInstallChecker(Profile* profile, const std::string& theme);
-  virtual ~ThemePendingInstallChecker();
+  ~ThemePendingInstallChecker() override;
 
   // Implementation of StatusChangeChecker.
-  virtual std::string GetDebugMessage() const override;
-  virtual bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
 
   // Implementation of content::NotificationObserver.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // Waits until the condition to be met or a timeout occurs.
   void Wait();
@@ -167,16 +167,16 @@ class ThemeConditionChecker : public StatusChangeChecker,
   ThemeConditionChecker(Profile* profile,
                         const std::string& debug_message_,
                         base::Callback<bool(ThemeService*)> exit_condition);
-  virtual ~ThemeConditionChecker();
+  ~ThemeConditionChecker() override;
 
   // Implementation of StatusChangeChecker.
-  virtual std::string GetDebugMessage() const override;
-  virtual bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
 
   // Implementation of content::NotificationObserver.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // Waits until the condition to be met or a timeout occurs.
   void Wait();
diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
index fe5237a..8612fea 100644
--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
@@ -84,12 +84,12 @@ class TwoClientAppListSyncTest : public SyncTest {
   virtual ~TwoClientAppListSyncTest() {}
 
   // SyncTest
-  virtual void SetUpCommandLine(CommandLine* command_line) override {
+  void SetUpCommandLine(CommandLine* command_line) override {
     SyncTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(app_list::switches::kEnableSyncAppList);
   }
 
-  virtual bool SetupClients() override {
+  bool SetupClients() override {
     if (!SyncTest::SetupClients())
       return false;
 
@@ -99,7 +99,7 @@ class TwoClientAppListSyncTest : public SyncTest {
     return true;
   }
 
-  virtual bool SetupSync() override {
+  bool SetupSync() override {
     if (!SyncTest::SetupSync())
       return false;
     WaitForExtensionServicesToLoad();
diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
index 8480d76..dcd2d80 100644
--- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
@@ -59,7 +59,7 @@ class TwoClientAppsSyncTest : public SyncTest {
 
   virtual ~TwoClientAppsSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override { return false; }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientAppsSyncTest);
diff --git a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
index 2cba130..a5689e6 100644
--- a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc
@@ -49,7 +49,7 @@ class TwoClientAutofillSyncTest : public SyncTest {
   TwoClientAutofillSyncTest() : SyncTest(TWO_CLIENT) { count = 0; }
   virtual ~TwoClientAutofillSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override { return false; }
+  bool TestUsesSelfNotifications() override { return false; }
 
   // We do this so as to make a change that will trigger the autofill to sync.
   // By default autofill does not sync unless there is some other change.
diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
index 0bb840c..e549054 100644
--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
@@ -66,7 +66,7 @@ class TwoClientBookmarksSyncTest : public SyncTest {
   TwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientBookmarksSyncTest() {}
 
-  virtual void TearDownInProcessBrowserTestFixture() override {
+  void TearDownInProcessBrowserTestFixture() override {
     SyncTest::TearDownInProcessBrowserTestFixture();
     policy_provider_.Shutdown();
   }
diff --git a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
index 9f11612..43cdb13 100644
--- a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc
@@ -23,7 +23,7 @@ class TwoClientExtensionsSyncTest : public SyncTest {
   TwoClientExtensionsSyncTest() : SyncTest(TWO_CLIENT) {}
 
   virtual ~TwoClientExtensionsSyncTest() {}
-  virtual bool TestUsesSelfNotifications() override { return false; }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionsSyncTest);
diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
index 21c44dc..0385f79 100644
--- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc
@@ -37,7 +37,7 @@ class TwoClientPasswordsSyncTest : public SyncTest {
   TwoClientPasswordsSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientPasswordsSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override { return false; }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientPasswordsSyncTest);
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index a49d9e9..c19dfcb 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -25,7 +25,7 @@ class TwoClientPreferencesSyncTest : public SyncTest {
   TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientPreferencesSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override { return false; }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientPreferencesSyncTest);
diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
index 7ea37b1..a41f447 100644
--- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
@@ -25,9 +25,7 @@ class TwoClientThemesSyncTest : public SyncTest {
   TwoClientThemesSyncTest() : SyncTest(TWO_CLIENT) {}
   virtual ~TwoClientThemesSyncTest() {}
 
-  virtual bool TestUsesSelfNotifications() override {
-    return false;
-  }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientThemesSyncTest);
diff --git a/chrome/browser/sync/test/integration/typed_urls_helper.cc b/chrome/browser/sync/test/integration/typed_urls_helper.cc
index cd68534..43da2f3 100644
--- a/chrome/browser/sync/test/integration/typed_urls_helper.cc
+++ b/chrome/browser/sync/test/integration/typed_urls_helper.cc
@@ -27,16 +27,16 @@ class FlushHistoryDBQueueTask : public history::HistoryDBTask {
  public:
   explicit FlushHistoryDBQueueTask(base::WaitableEvent* event)
       : wait_event_(event) {}
-  virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) override {
+  bool RunOnDBThread(history::HistoryBackend* backend,
+                     history::HistoryDatabase* db) override {
     wait_event_->Signal();
     return true;
   }
 
-  virtual void DoneRunOnMainThread() override {}
+  void DoneRunOnMainThread() override {}
 
  private:
-  virtual ~FlushHistoryDBQueueTask() {}
+  ~FlushHistoryDBQueueTask() override {}
 
   base::WaitableEvent* wait_event_;
 };
@@ -46,18 +46,18 @@ class GetTypedUrlsTask : public history::HistoryDBTask {
   GetTypedUrlsTask(history::URLRows* rows, base::WaitableEvent* event)
       : rows_(rows), wait_event_(event) {}
 
-  virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) override {
+  bool RunOnDBThread(history::HistoryBackend* backend,
+                     history::HistoryDatabase* db) override {
     // Fetch the typed URLs.
     backend->GetAllTypedURLs(rows_);
     wait_event_->Signal();
     return true;
   }
 
-  virtual void DoneRunOnMainThread() override {}
+  void DoneRunOnMainThread() override {}
 
  private:
-  virtual ~GetTypedUrlsTask() {}
+  ~GetTypedUrlsTask() override {}
 
   history::URLRows* rows_;
   base::WaitableEvent* wait_event_;
@@ -71,18 +71,18 @@ class GetUrlTask : public history::HistoryDBTask {
              base::WaitableEvent* event)
       : url_(url), row_(row), wait_event_(event), found_(found) {}
 
-  virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) override {
+  bool RunOnDBThread(history::HistoryBackend* backend,
+                     history::HistoryDatabase* db) override {
     // Fetch the typed URLs.
     *found_ = backend->GetURL(url_, row_);
     wait_event_->Signal();
     return true;
   }
 
-  virtual void DoneRunOnMainThread() override {}
+  void DoneRunOnMainThread() override {}
 
  private:
-  virtual ~GetUrlTask() {}
+  ~GetUrlTask() override {}
 
   GURL url_;
   history::URLRow* row_;
@@ -97,18 +97,18 @@ class GetVisitsTask : public history::HistoryDBTask {
                 base::WaitableEvent* event)
       : id_(id), visits_(visits), wait_event_(event) {}
 
-  virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) override {
+  bool RunOnDBThread(history::HistoryBackend* backend,
+                     history::HistoryDatabase* db) override {
     // Fetch the visits.
     backend->GetVisitsForURL(id_, visits_);
     wait_event_->Signal();
     return true;
   }
 
-  virtual void DoneRunOnMainThread() override {}
+  void DoneRunOnMainThread() override {}
 
  private:
-  virtual ~GetVisitsTask() {}
+  ~GetVisitsTask() override {}
 
   history::URLID id_;
   history::VisitVector* visits_;
@@ -121,18 +121,18 @@ class RemoveVisitsTask : public history::HistoryDBTask {
                    base::WaitableEvent* event)
       : visits_(visits), wait_event_(event) {}
 
-  virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) override {
+  bool RunOnDBThread(history::HistoryBackend* backend,
+                     history::HistoryDatabase* db) override {
     // Fetch the visits.
     backend->RemoveVisits(visits_);
     wait_event_->Signal();
     return true;
   }
 
-  virtual void DoneRunOnMainThread() override {}
+  void DoneRunOnMainThread() override {}
 
  private:
-  virtual ~RemoveVisitsTask() {}
+  ~RemoveVisitsTask() override {}
 
   const history::VisitVector& visits_;
   base::WaitableEvent* wait_event_;
@@ -395,10 +395,10 @@ namespace {
 class ProfilesHaveSameURLsChecker : public MultiClientStatusChangeChecker {
  public:
   ProfilesHaveSameURLsChecker();
-  virtual ~ProfilesHaveSameURLsChecker();
+  ~ProfilesHaveSameURLsChecker() override;
 
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 };
 
 ProfilesHaveSameURLsChecker::ProfilesHaveSameURLsChecker()
diff --git a/chrome/browser/sync/test/integration/updated_progress_marker_checker.h b/chrome/browser/sync/test/integration/updated_progress_marker_checker.h
index 0cc55dd..8e9cfe3 100644
--- a/chrome/browser/sync/test/integration/updated_progress_marker_checker.h
+++ b/chrome/browser/sync/test/integration/updated_progress_marker_checker.h
@@ -21,10 +21,10 @@
 class UpdatedProgressMarkerChecker : public SingleClientStatusChangeChecker {
  public:
   explicit UpdatedProgressMarkerChecker(ProfileSyncService* service);
-  virtual ~UpdatedProgressMarkerChecker();
+  ~UpdatedProgressMarkerChecker() override;
 
-  virtual bool IsExitConditionSatisfied() override;
-  virtual std::string GetDebugMessage() const override;
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_UPDATED_PROGRESS_MARKER_CHECKER_H_