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

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

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

BUG=417463

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

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

49 files changed, 239 insertions, 255 deletions

diff --git a/components/autofill/content/browser/wallet/mock_wallet_client.h b/components/autofill/content/browser/wallet/mock_wallet_client.h
index a3a3153..25bdd21 100644
--- a/components/autofill/content/browser/wallet/mock_wallet_client.h
+++ b/components/autofill/content/browser/wallet/mock_wallet_client.h
@@ -24,7 +24,7 @@ class MockWalletClient : public WalletClient {
   MockWalletClient(net::URLRequestContextGetter* context,
                    WalletClientDelegate* delegate,
                    const GURL& source_url);
-  virtual ~MockWalletClient();
+  ~MockWalletClient() override;
 
   MOCK_METHOD2(GetWalletItems,
       void(const base::string16&, const base::string16&));
@@ -42,7 +42,7 @@ class MockWalletClient : public WalletClient {
 
   // Methods with scoped_ptrs can't be mocked but by using the implementation
   // below the same effect can be achieved.
-  virtual void SaveToWallet(
+  void SaveToWallet(
       scoped_ptr<Instrument> instrument,
       scoped_ptr<Address> address,
       const WalletItems::MaskedInstrument* reference_instrument,
diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
index 10c5051..230776f 100644
--- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
@@ -660,15 +660,15 @@ class MockWalletClientDelegate : public WalletClientDelegate {
         is_shipping_required_(true) {}
   ~MockWalletClientDelegate() {}
 
-  virtual std::string GetRiskData() const override {
+  std::string GetRiskData() const override {
     return "risky business";
   }
 
-  virtual std::string GetWalletCookieValue() const override {
+  std::string GetWalletCookieValue() const override {
     return "gdToken";
   }
 
-  virtual bool IsShippingAddressRequired() const override {
+  bool IsShippingAddressRequired() const override {
     return is_shipping_required_;
   }
 
@@ -685,12 +685,11 @@ class MockWalletClientDelegate : public WalletClientDelegate {
                     const std::vector<FormFieldError>& form_field_errors));
   MOCK_METHOD1(OnWalletError, void(WalletClient::ErrorType error_type));
 
-  virtual void OnDidGetFullWallet(scoped_ptr<FullWallet> full_wallet) override {
+  void OnDidGetFullWallet(scoped_ptr<FullWallet> full_wallet) override {
     EXPECT_TRUE(full_wallet);
     ++full_wallets_received_;
   }
-  virtual void OnDidGetWalletItems(scoped_ptr<WalletItems> wallet_items)
-      override {
+  void OnDidGetWalletItems(scoped_ptr<WalletItems> wallet_items) override {
     EXPECT_TRUE(wallet_items);
     ++wallet_items_received_;
   }
diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
index a2fab04..c8a3f5d 100644
--- a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
+++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
@@ -216,7 +216,7 @@ class AutofillImporter : public PersonalDataManagerObserver {
   }
 
   // PersonalDataManagerObserver:
-  virtual void OnPersonalDataChanged() override {
+  void OnPersonalDataChanged() override {
     for (std::vector<AutofillProfile>::const_iterator iter = profiles_.begin();
          iter != profiles_.end(); ++iter) {
       personal_data_manager_->AddProfile(*iter);
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 9b9afde..4c3fe3d 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
@@ -95,13 +95,14 @@ MATCHER_P(DataBundleCheck, n_bundle, "") {
 class MockSyncChangeProcessor : public syncer::SyncChangeProcessor {
  public:
   MockSyncChangeProcessor() {}
-  virtual ~MockSyncChangeProcessor() {}
+  ~MockSyncChangeProcessor() override {}
 
   MOCK_METHOD2(ProcessSyncChanges,
                syncer::SyncError(const tracked_objects::Location&,
                                  const syncer::SyncChangeList&));
-  virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type)
-      const override { return syncer::SyncDataList(); }
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override {
+    return syncer::SyncDataList();
+  }
 };
 
 class TestSyncChangeProcessor : public syncer::SyncChangeProcessor {
diff --git a/components/browser_watcher/exit_code_watcher_win_unittest.cc b/components/browser_watcher/exit_code_watcher_win_unittest.cc
index e739536..e89301b 100644
--- a/components/browser_watcher/exit_code_watcher_win_unittest.cc
+++ b/components/browser_watcher/exit_code_watcher_win_unittest.cc
@@ -79,7 +79,7 @@ class ExitCodeWatcherTest : public testing::Test {
 
   ExitCodeWatcherTest() : cmd_line_(base::CommandLine::NO_PROGRAM) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     Super::SetUp();
 
     override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
diff --git a/components/browser_watcher/exit_funnel_win_unittest.cc b/components/browser_watcher/exit_funnel_win_unittest.cc
index 66b9e76..b43b273 100644
--- a/components/browser_watcher/exit_funnel_win_unittest.cc
+++ b/components/browser_watcher/exit_funnel_win_unittest.cc
@@ -28,7 +28,7 @@ class ExitFunnelWinTest : public testing::Test {
   typedef testing::Test Super;
   typedef std::map<base::string16, int64> EventMap;
 
-  virtual void SetUp() override {
+  void SetUp() override {
     Super::SetUp();
 
     override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
diff --git a/components/browser_watcher/watcher_metrics_provider_win.h b/components/browser_watcher/watcher_metrics_provider_win.h
index 0004be3..e198c52 100644
--- a/components/browser_watcher/watcher_metrics_provider_win.h
+++ b/components/browser_watcher/watcher_metrics_provider_win.h
@@ -31,10 +31,10 @@ class WatcherMetricsProviderWin : public metrics::MetricsProvider {
   // will clear the registry data, but not report it.
   WatcherMetricsProviderWin(const base::char16* registry_path,
                             bool report_exit_funnels);
-  ~WatcherMetricsProviderWin();
+  ~WatcherMetricsProviderWin() override;
 
   // metrics::MetricsProvider implementation.
-  virtual void ProvideStabilityMetrics(
+  void ProvideStabilityMetrics(
       metrics::SystemProfileProto* system_profile_proto) override;
 
  private:
diff --git a/components/browser_watcher/watcher_metrics_provider_win_unittest.cc b/components/browser_watcher/watcher_metrics_provider_win_unittest.cc
index 820ad34..b4c3922 100644
--- a/components/browser_watcher/watcher_metrics_provider_win_unittest.cc
+++ b/components/browser_watcher/watcher_metrics_provider_win_unittest.cc
@@ -25,7 +25,7 @@ class WatcherMetricsProviderWinTest : public testing::Test {
  public:
   typedef testing::Test Super;
 
-  virtual void SetUp() override {
+  void SetUp() override {
     Super::SetUp();
 
     override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
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 dc5ec7f..12ef1f7 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
@@ -98,11 +98,11 @@ class ConcreteDataReductionProxySettingsTest
     : public DataReductionProxySettingsTestBase {
  public:
   typedef MockDataReductionProxySettings<C> MockSettings;
-  virtual void ResetSettings(bool allowed,
-                             bool fallback_allowed,
-                             bool alt_allowed,
-                             bool promo_allowed,
-                             bool holdback) override {
+  void ResetSettings(bool allowed,
+                     bool fallback_allowed,
+                     bool alt_allowed,
+                     bool promo_allowed,
+                     bool holdback) override {
     return DataReductionProxySettingsTestBase::ResetSettings<C>(
         allowed, fallback_allowed, alt_allowed, promo_allowed, holdback);
   }
diff --git a/components/dom_distiller/core/dom_distiller_test_util.h b/components/dom_distiller/core/dom_distiller_test_util.h
index 3b7ecd4..8d22a25 100644
--- a/components/dom_distiller/core/dom_distiller_test_util.h
+++ b/components/dom_distiller/core/dom_distiller_test_util.h
@@ -26,11 +26,11 @@ class ObserverUpdatesMatcher
       const std::vector<DomDistillerObserver::ArticleUpdate>&);
 
   // MatcherInterface overrides.
-  virtual bool MatchAndExplain(
+  bool MatchAndExplain(
       const std::vector<DomDistillerObserver::ArticleUpdate>& actual_updates,
       testing::MatchResultListener* listener) const override;
-  virtual void DescribeTo(std::ostream* os) const override;
-  virtual void DescribeNegationTo(std::ostream* os) const override;
+  void DescribeTo(std::ostream* os) const override;
+  void DescribeNegationTo(std::ostream* os) const override;
 
  private:
   void DescribeUpdates(std::ostream* os) const;
diff --git a/components/dom_distiller/core/fake_distiller.h b/components/dom_distiller/core/fake_distiller.h
index ac20a9b..87e3e6d 100644
--- a/components/dom_distiller/core/fake_distiller.h
+++ b/components/dom_distiller/core/fake_distiller.h
@@ -22,8 +22,7 @@ class MockDistillerFactory : public DistillerFactory {
   MockDistillerFactory();
   virtual ~MockDistillerFactory();
   MOCK_METHOD0(CreateDistillerImpl, Distiller*());
-  virtual scoped_ptr<Distiller> CreateDistillerForUrl(
-      const GURL& unused) override {
+  scoped_ptr<Distiller> CreateDistillerForUrl(const GURL& unused) override {
     return scoped_ptr<Distiller>(CreateDistillerImpl());
   }
 };
@@ -38,14 +37,13 @@ class FakeDistiller : public Distiller {
   // "auto-distilling" or calling the provided closure.
   explicit FakeDistiller(bool execute_callback,
                          const base::Closure& distillation_initiated_callback);
-  virtual ~FakeDistiller();
+  ~FakeDistiller() override;
   MOCK_METHOD0(Die, void());
 
-  virtual void DistillPage(
-      const GURL& url,
-      scoped_ptr<DistillerPage> distiller_page,
-      const DistillationFinishedCallback& article_callback,
-      const DistillationUpdateCallback& page_callback) override;
+  void DistillPage(const GURL& url,
+                   scoped_ptr<DistillerPage> distiller_page,
+                   const DistillationFinishedCallback& article_callback,
+                   const DistillationUpdateCallback& page_callback) override;
 
   void RunDistillerCallback(scoped_ptr<DistilledArticleProto> proto);
   void RunDistillerUpdateCallback(const ArticleDistillationUpdate& update);
diff --git a/components/dom_distiller/core/fake_distiller_page.h b/components/dom_distiller/core/fake_distiller_page.h
index a3511fa..f6a0a03 100644
--- a/components/dom_distiller/core/fake_distiller_page.h
+++ b/components/dom_distiller/core/fake_distiller_page.h
@@ -14,13 +14,13 @@ namespace test {
 class MockDistillerPageFactory : public DistillerPageFactory {
  public:
   MockDistillerPageFactory();
-  virtual ~MockDistillerPageFactory();
+  ~MockDistillerPageFactory() override;
   MOCK_CONST_METHOD0(CreateDistillerPageImpl, DistillerPage*());
-  virtual scoped_ptr<DistillerPage> CreateDistillerPage(
+  scoped_ptr<DistillerPage> CreateDistillerPage(
       const gfx::Size& render_view_size) const override {
     return scoped_ptr<DistillerPage>(CreateDistillerPageImpl());
   }
-  virtual scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
+  scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
       scoped_ptr<SourcePageHandle> handle) const override {
     return scoped_ptr<DistillerPage>(CreateDistillerPageImpl());
   }
@@ -29,7 +29,7 @@ class MockDistillerPageFactory : public DistillerPageFactory {
 class MockDistillerPage : public DistillerPage {
  public:
   MockDistillerPage();
-  virtual ~MockDistillerPage();
+  ~MockDistillerPage() override;
   bool StringifyOutput() override { return false; };
   bool CreateNewContext() override { return false; };
   MOCK_METHOD2(DistillPageImpl,
diff --git a/components/dom_distiller/core/viewer_unittest.cc b/components/dom_distiller/core/viewer_unittest.cc
index 35e242f..2e7478a 100644
--- a/components/dom_distiller/core/viewer_unittest.cc
+++ b/components/dom_distiller/core/viewer_unittest.cc
@@ -17,7 +17,7 @@ const char kTestScheme[] = "myscheme";
 
 class FakeViewRequestDelegate : public ViewRequestDelegate {
  public:
-  virtual ~FakeViewRequestDelegate() {}
+  ~FakeViewRequestDelegate() override {}
   MOCK_METHOD1(OnArticleReady, void(const DistilledArticleProto* proto));
   MOCK_METHOD1(OnArticleUpdated,
                void(ArticleDistillationUpdate article_update));
@@ -26,17 +26,17 @@ class FakeViewRequestDelegate : public ViewRequestDelegate {
 class TestDomDistillerService : public DomDistillerServiceInterface {
  public:
   TestDomDistillerService() {}
-  virtual ~TestDomDistillerService() {}
+  ~TestDomDistillerService() override {}
 
   MOCK_CONST_METHOD0(GetSyncableService, syncer::SyncableService*());
   MOCK_METHOD3(AddToList,
                const std::string(const GURL&,
                                  DistillerPage*,
                                  const ArticleAvailableCallback&));
-  virtual const std::string AddToList(
+  const std::string AddToList(
       const GURL& url,
       scoped_ptr<DistillerPage> distiller_page,
-      const ArticleAvailableCallback& article_cb) {
+      const ArticleAvailableCallback& article_cb) override {
     return AddToList(url, distiller_page.get(), article_cb);
   }
   MOCK_METHOD1(HasEntry, bool(const std::string&));
@@ -45,32 +45,32 @@ class TestDomDistillerService : public DomDistillerServiceInterface {
   MOCK_METHOD1(AddObserver, void(DomDistillerObserver*));
   MOCK_METHOD1(RemoveObserver, void(DomDistillerObserver*));
   MOCK_METHOD0(ViewUrlImpl, ViewerHandle*());
-  virtual scoped_ptr<ViewerHandle> ViewUrl(
+  scoped_ptr<ViewerHandle> ViewUrl(
       ViewRequestDelegate*,
       scoped_ptr<DistillerPage> distiller_page,
-      const GURL&) {
+      const GURL&) override {
     return scoped_ptr<ViewerHandle>(ViewUrlImpl());
   }
   MOCK_METHOD0(ViewEntryImpl, ViewerHandle*());
-  virtual scoped_ptr<ViewerHandle> ViewEntry(
+  scoped_ptr<ViewerHandle> ViewEntry(
       ViewRequestDelegate*,
       scoped_ptr<DistillerPage> distiller_page,
-      const std::string&) {
+      const std::string&) override {
     return scoped_ptr<ViewerHandle>(ViewEntryImpl());
   }
   MOCK_METHOD0(RemoveEntryImpl, ArticleEntry*());
-  virtual scoped_ptr<ArticleEntry> RemoveEntry(const std::string&) {
+  scoped_ptr<ArticleEntry> RemoveEntry(const std::string&) override {
     return scoped_ptr<ArticleEntry>(RemoveEntryImpl());
   }
-  virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPage(
-      const gfx::Size& render_view_size) {
+  scoped_ptr<DistillerPage> CreateDefaultDistillerPage(
+      const gfx::Size& render_view_size) override {
     return scoped_ptr<DistillerPage>();
   }
-  virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPageWithHandle(
-      scoped_ptr<SourcePageHandle> handle) {
+  scoped_ptr<DistillerPage> CreateDefaultDistillerPageWithHandle(
+      scoped_ptr<SourcePageHandle> handle) override {
     return scoped_ptr<DistillerPage>();
   }
-  virtual DistilledPagePrefs* GetDistilledPagePrefs() override;
+  DistilledPagePrefs* GetDistilledPagePrefs() override;
 };
 
 class DomDistillerViewerTest : public testing::Test {
diff --git a/components/enhanced_bookmarks/image_store_ios_unittest.mm b/components/enhanced_bookmarks/image_store_ios_unittest.mm
index a22a366..4927645 100644
--- a/components/enhanced_bookmarks/image_store_ios_unittest.mm
+++ b/components/enhanced_bookmarks/image_store_ios_unittest.mm
@@ -106,15 +106,15 @@ template <class T>
 class ImageStoreUnitTestIOS : public PlatformTest {
  protected:
   ImageStoreUnitTestIOS() {}
-  virtual ~ImageStoreUnitTestIOS() {}
+  ~ImageStoreUnitTestIOS() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     bool success = temp_dir_.CreateUniqueTempDir();
     ASSERT_TRUE(success);
     store_.reset(CreateStore<T>(temp_dir_));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (store_ && use_persistent_store())
       store_->ClearAll();
   }
diff --git a/components/enhanced_bookmarks/image_store_unittest.cc b/components/enhanced_bookmarks/image_store_unittest.cc
index 043c5f2..962b3fd 100644
--- a/components/enhanced_bookmarks/image_store_unittest.cc
+++ b/components/enhanced_bookmarks/image_store_unittest.cc
@@ -133,15 +133,15 @@ template <class T>
 class ImageStoreUnitTest : public PlatformTest {
  protected:
   ImageStoreUnitTest() {}
-  virtual ~ImageStoreUnitTest() {}
+  ~ImageStoreUnitTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     bool success = tempDir_.CreateUniqueTempDir();
     ASSERT_TRUE(success);
     store_.reset(CreateStore<T>(tempDir_));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (store_ && use_persistent_store())
       store_->ClearAll();
   }
diff --git a/components/invalidation/unacked_invalidation_set_test_util.cc b/components/invalidation/unacked_invalidation_set_test_util.cc
index 15bf7fd..165df6e 100644
--- a/components/invalidation/unacked_invalidation_set_test_util.cc
+++ b/components/invalidation/unacked_invalidation_set_test_util.cc
@@ -28,11 +28,11 @@ class UnackedInvalidationSetEqMatcher
   explicit UnackedInvalidationSetEqMatcher(
       const UnackedInvalidationSet& expected);
 
-  virtual bool MatchAndExplain(
+  bool MatchAndExplain(
       const UnackedInvalidationSet& actual,
       MatchResultListener* listener) const override;
-  virtual void DescribeTo(::std::ostream* os) const override;
-  virtual void DescribeNegationTo(::std::ostream* os) const override;
+  void DescribeTo(::std::ostream* os) const override;
+  void DescribeNegationTo(::std::ostream* os) const override;
 
  private:
   const UnackedInvalidationSet expected_;
diff --git a/components/leveldb_proto/proto_database_impl.h b/components/leveldb_proto/proto_database_impl.h
index cc56221..adf79bd 100644
--- a/components/leveldb_proto/proto_database_impl.h
+++ b/components/leveldb_proto/proto_database_impl.h
@@ -35,19 +35,18 @@ class ProtoDatabaseImpl : public ProtoDatabase<T> {
   explicit ProtoDatabaseImpl(
       scoped_refptr<base::SequencedTaskRunner> task_runner);
 
-  virtual ~ProtoDatabaseImpl();
+  ~ProtoDatabaseImpl() override;
 
   // ProtoDatabase implementation.
   // TODO(cjhopman): Perhaps Init() shouldn't be exposed to users and not just
   //     part of the constructor
-  virtual void Init(const base::FilePath& database_dir,
-                    typename ProtoDatabase<T>::InitCallback callback) override;
-  virtual void UpdateEntries(
+  void Init(const base::FilePath& database_dir,
+            typename ProtoDatabase<T>::InitCallback callback) override;
+  void UpdateEntries(
       scoped_ptr<typename ProtoDatabase<T>::KeyEntryVector> entries_to_save,
       scoped_ptr<KeyVector> keys_to_remove,
       typename ProtoDatabase<T>::UpdateCallback callback) override;
-  virtual void LoadEntries(
-      typename ProtoDatabase<T>::LoadCallback callback) override;
+  void LoadEntries(typename ProtoDatabase<T>::LoadCallback callback) override;
 
   // Allow callers to provide their own Database implementation.
   void InitWithDatabase(scoped_ptr<LevelDB> database,
diff --git a/components/leveldb_proto/testing/fake_db.h b/components/leveldb_proto/testing/fake_db.h
index 3bcc70e..2009e10 100644
--- a/components/leveldb_proto/testing/fake_db.h
+++ b/components/leveldb_proto/testing/fake_db.h
@@ -25,19 +25,17 @@ class FakeDB : public ProtoDatabase<T> {
   typedef typename base::hash_map<std::string, T> EntryMap;
 
   explicit FakeDB(EntryMap* db);
-  virtual ~FakeDB();
+  ~FakeDB() override;
 
-  virtual void Init(const base::FilePath& database_dir,
-                    typename ProtoDatabase<T>::InitCallback callback)
-      override;
+  void Init(const base::FilePath& database_dir,
+            typename ProtoDatabase<T>::InitCallback callback) override;
 
-  virtual void UpdateEntries(
+  void UpdateEntries(
       scoped_ptr<typename ProtoDatabase<T>::KeyEntryVector> entries_to_save,
       scoped_ptr<std::vector<std::string> > keys_to_remove,
       typename ProtoDatabase<T>::UpdateCallback callback) override;
 
-  virtual void LoadEntries(typename ProtoDatabase<T>::LoadCallback callback)
-      override;
+  void LoadEntries(typename ProtoDatabase<T>::LoadCallback callback) override;
   base::FilePath& GetDirectory();
 
   void InitCallback(bool success);
diff --git a/components/nacl/broker/nacl_broker_listener.h b/components/nacl/broker/nacl_broker_listener.h
index 46dc902..61d2651 100644
--- a/components/nacl/broker/nacl_broker_listener.h
+++ b/components/nacl/broker/nacl_broker_listener.h
@@ -21,18 +21,17 @@ class NaClBrokerListener : public content::SandboxedProcessLauncherDelegate,
                            public IPC::Listener {
  public:
   NaClBrokerListener();
-  ~NaClBrokerListener();
+  ~NaClBrokerListener() override;
 
   void Listen();
 
   // content::SandboxedProcessLauncherDelegate implementation:
-  virtual void PreSpawnTarget(sandbox::TargetPolicy* policy,
-                              bool* success) override;
+  void PreSpawnTarget(sandbox::TargetPolicy* policy, bool* success) override;
 
   // IPC::Listener implementation.
-  virtual void OnChannelConnected(int32 peer_pid) override;
-  virtual bool OnMessageReceived(const IPC::Message& msg) override;
-  virtual void OnChannelError() override;
+  void OnChannelConnected(int32 peer_pid) override;
+  bool OnMessageReceived(const IPC::Message& msg) override;
+  void OnChannelError() override;
 
  private:
   void OnLaunchLoaderThroughBroker(const std::string& loader_channel_id);
diff --git a/components/nacl/browser/nacl_broker_host_win.cc b/components/nacl/browser/nacl_broker_host_win.cc
index 0f63027..7c14f7c 100644
--- a/components/nacl/browser/nacl_broker_host_win.cc
+++ b/components/nacl/browser/nacl_broker_host_win.cc
@@ -25,9 +25,9 @@ class NaClBrokerSandboxedProcessLauncherDelegate
     : public content::SandboxedProcessLauncherDelegate {
  public:
   NaClBrokerSandboxedProcessLauncherDelegate() {}
-  virtual ~NaClBrokerSandboxedProcessLauncherDelegate() {}
+  ~NaClBrokerSandboxedProcessLauncherDelegate() override {}
 
-  virtual bool ShouldSandbox() override {
+  bool ShouldSandbox() override {
     return false;
   }
 
diff --git a/components/nacl/common/nacl_debug_exception_handler_win.cc b/components/nacl/common/nacl_debug_exception_handler_win.cc
index 68e3a66..d7c1bb8 100644
--- a/components/nacl/common/nacl_debug_exception_handler_win.cc
+++ b/components/nacl/common/nacl_debug_exception_handler_win.cc
@@ -23,7 +23,7 @@ class DebugExceptionHandler : public base::PlatformThread::Delegate {
         message_loop_(message_loop),
         on_connected_(on_connected) {}
 
-  virtual void ThreadMain() override {
+  void ThreadMain() override {
     // In the Windows API, the set of processes being debugged is
     // thread-local, so we have to attach to the process (using
     // DebugActiveProcess()) on the same thread on which
diff --git a/components/native_viewport/platform_viewport_android.h b/components/native_viewport/platform_viewport_android.h
index dce0035..ee8fa07 100644
--- a/components/native_viewport/platform_viewport_android.h
+++ b/components/native_viewport/platform_viewport_android.h
@@ -27,7 +27,7 @@ class PlatformViewportAndroid : public PlatformViewport {
   static bool Register(JNIEnv* env);
 
   explicit PlatformViewportAndroid(Delegate* delegate);
-  virtual ~PlatformViewportAndroid();
+  ~PlatformViewportAndroid() override;
 
   void Destroy(JNIEnv* env, jobject obj);
   void SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface);
@@ -58,12 +58,12 @@ class PlatformViewportAndroid : public PlatformViewport {
 
  private:
   // Overridden from PlatformViewport:
-  virtual void Init(const gfx::Rect& bounds) override;
-  virtual void Show() override;
-  virtual void Hide() override;
-  virtual void Close() override;
-  virtual gfx::Size GetSize() override;
-  virtual void SetBounds(const gfx::Rect& bounds) override;
+  void Init(const gfx::Rect& bounds) override;
+  void Show() override;
+  void Hide() override;
+  void Close() override;
+  gfx::Size GetSize() override;
+  void SetBounds(const gfx::Rect& bounds) override;
 
   void ReleaseWindow();
 
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc
index 749044c..20c0eba 100644
--- a/components/password_manager/core/browser/password_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -49,14 +49,13 @@ class MockPasswordManagerClient : public StubPasswordManagerClient {
   MOCK_METHOD0(GetDriver, PasswordManagerDriver*());
 
   // Workaround for scoped_ptr<> lacking a copy constructor.
-  virtual bool PromptUserToSavePassword(
+  bool PromptUserToSavePassword(
       scoped_ptr<PasswordFormManager> manager,
       password_manager::CredentialSourceType type) override {
     PromptUserToSavePasswordPtr(manager.release(), type);
     return false;
   }
-  virtual void AutomaticPasswordSave(
-      scoped_ptr<PasswordFormManager> manager) override {
+  void AutomaticPasswordSave(scoped_ptr<PasswordFormManager> manager) override {
     AutomaticPasswordSavePtr(manager.release());
   }
 };
diff --git a/components/password_manager/core/browser/password_syncable_service_unittest.cc b/components/password_manager/core/browser/password_syncable_service_unittest.cc
index ef18129..ac7b6ef 100644
--- a/components/password_manager/core/browser/password_syncable_service_unittest.cc
+++ b/components/password_manager/core/browser/password_syncable_service_unittest.cc
@@ -168,7 +168,7 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor {
   MOCK_METHOD2(ProcessSyncChanges,
                SyncError(const tracked_objects::Location&,
                          const SyncChangeList& list));
-  virtual SyncDataList GetAllSyncData(syncer::ModelType type) const override {
+  SyncDataList GetAllSyncData(syncer::ModelType type) const override {
     NOTREACHED();
     return SyncDataList();
   }
diff --git a/components/pdf/browser/pdf_web_contents_helper.h b/components/pdf/browser/pdf_web_contents_helper.h
index 7948768e..73f8453 100644
--- a/components/pdf/browser/pdf_web_contents_helper.h
+++ b/components/pdf/browser/pdf_web_contents_helper.h
@@ -40,11 +40,11 @@ class PDFWebContentsHelper
  private:
   PDFWebContentsHelper(content::WebContents* web_contents,
                        scoped_ptr<PDFWebContentsHelperClient> client);
-  virtual ~PDFWebContentsHelper();
+  ~PDFWebContentsHelper() override;
 
   // content::WebContentsObserver overrides:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void DidNavigateMainFrame(
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
 
diff --git a/components/pdf/renderer/pepper_pdf_host.h b/components/pdf/renderer/pepper_pdf_host.h
index 59be516..e858ee6 100644
--- a/components/pdf/renderer/pepper_pdf_host.h
+++ b/components/pdf/renderer/pepper_pdf_host.h
@@ -41,9 +41,9 @@ class PepperPDFHost : public ppapi::host::ResourceHost {
   PepperPDFHost(content::RendererPpapiHost* host,
                 PP_Instance instance,
                 PP_Resource resource);
-  virtual ~PepperPDFHost();
+  ~PepperPDFHost() override;
 
-  virtual int32_t OnResourceMessageReceived(
+  int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
       ppapi::host::HostMessageContext* context) override;
 
diff --git a/components/policy/core/common/async_policy_provider_unittest.cc b/components/policy/core/common/async_policy_provider_unittest.cc
index 6219346..9dc54f5 100644
--- a/components/policy/core/common/async_policy_provider_unittest.cc
+++ b/components/policy/core/common/async_policy_provider_unittest.cc
@@ -41,13 +41,13 @@ class MockPolicyLoader : public AsyncPolicyLoader {
  public:
   explicit MockPolicyLoader(
       scoped_refptr<base::SequencedTaskRunner> task_runner);
-  virtual ~MockPolicyLoader();
+  ~MockPolicyLoader() override;
 
   // Load() returns a scoped_ptr<PolicyBundle> but it can't be mocked because
   // scoped_ptr is moveable but not copyable. This override forwards the
   // call to MockLoad() which returns a PolicyBundle*, and returns a copy
   // wrapped in a passed scoped_ptr.
-  virtual scoped_ptr<PolicyBundle> Load() override;
+  scoped_ptr<PolicyBundle> Load() override;
 
   MOCK_METHOD0(MockLoad, const PolicyBundle*());
   MOCK_METHOD0(InitOnBackgroundThread, void());
diff --git a/components/policy/core/common/cloud/policy_builder.h b/components/policy/core/common/cloud/policy_builder.h
index c0dd099..cfc1076 100644
--- a/components/policy/core/common/cloud/policy_builder.h
+++ b/components/policy/core/common/cloud/policy_builder.h
@@ -121,7 +121,7 @@ template<typename PayloadProto>
 class TypedPolicyBuilder : public PolicyBuilder {
  public:
   TypedPolicyBuilder();
-  virtual ~TypedPolicyBuilder() {}
+  ~TypedPolicyBuilder() override {}
 
   // Returns a reference to the payload protobuf being built.
   PayloadProto& payload() {
@@ -134,7 +134,7 @@ class TypedPolicyBuilder : public PolicyBuilder {
   }
 
   // PolicyBuilder:
-  virtual void Build() override {
+  void Build() override {
     if (payload_.get())
       CHECK(payload_->SerializeToString(policy_data().mutable_policy_value()));
 
diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc
index 3be28f3..f223da5 100644
--- a/components/policy/core/common/policy_loader_win.cc
+++ b/components/policy/core/common/policy_loader_win.cc
@@ -285,19 +285,19 @@ class ScopedDisableWow64Redirection {
 // AppliedGPOListProvider implementation that calls actual Windows APIs.
 class WinGPOListProvider : public AppliedGPOListProvider {
  public:
-  virtual ~WinGPOListProvider() {}
+  ~WinGPOListProvider() override {}
 
   // AppliedGPOListProvider:
-  virtual DWORD GetAppliedGPOList(DWORD flags,
-                                  LPCTSTR machine_name,
-                                  PSID sid_user,
-                                  GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) override {
+  DWORD GetAppliedGPOList(DWORD flags,
+                          LPCTSTR machine_name,
+                          PSID sid_user,
+                          GUID* extension_guid,
+                          PGROUP_POLICY_OBJECT* gpo_list) override {
     return ::GetAppliedGPOList(flags, machine_name, sid_user, extension_guid,
                                gpo_list);
   }
 
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
+  BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
     return ::FreeGPOList(gpo_list);
   }
 };
diff --git a/components/policy/core/common/policy_loader_win.h b/components/policy/core/common/policy_loader_win.h
index bbcf5b0..93be1f5 100644
--- a/components/policy/core/common/policy_loader_win.h
+++ b/components/policy/core/common/policy_loader_win.h
@@ -57,7 +57,7 @@ class POLICY_EXPORT PolicyLoaderWin
   PolicyLoaderWin(scoped_refptr<base::SequencedTaskRunner> task_runner,
                   const base::string16& chrome_policy_key,
                   AppliedGPOListProvider* gpo_provider);
-  virtual ~PolicyLoaderWin();
+  ~PolicyLoaderWin() override;
 
   // Creates a policy loader that uses the Win API to access GPO.
   static scoped_ptr<PolicyLoaderWin> Create(
@@ -65,8 +65,8 @@ class POLICY_EXPORT PolicyLoaderWin
       const base::string16& chrome_policy_key);
 
   // AsyncPolicyLoader implementation.
-  virtual void InitOnBackgroundThread() override;
-  virtual scoped_ptr<PolicyBundle> Load() override;
+  void InitOnBackgroundThread() override;
+  scoped_ptr<PolicyBundle> Load() override;
 
  private:
   // Reads Chrome Policy from a PReg file at the given path and stores the
@@ -107,7 +107,7 @@ class POLICY_EXPORT PolicyLoaderWin
   void SetupWatches();
 
   // ObjectWatcher::Delegate overrides:
-  virtual void OnObjectSignaled(HANDLE object) override;
+  void OnObjectSignaled(HANDLE object) override;
 
   bool is_initialized_;
   const base::string16 chrome_policy_key_;
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index 9059128..76adc44 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -170,38 +170,36 @@ class RegistryTestHarness : public PolicyProviderTestHarness,
                             public AppliedGPOListProvider {
  public:
   RegistryTestHarness(HKEY hive, PolicyScope scope);
-  virtual ~RegistryTestHarness();
+  ~RegistryTestHarness() override;
 
   // PolicyProviderTestHarness:
-  virtual void SetUp() override;
+  void SetUp() override;
 
-  virtual ConfigurationPolicyProvider* CreateProvider(
+  ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
       scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() override;
-  virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) override;
-  virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) override;
-  virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) override;
-  virtual void InstallStringListPolicy(
-      const std::string& policy_name,
-      const base::ListValue* policy_value) override;
-  virtual void InstallDictionaryPolicy(
+  void InstallEmptyPolicy() override;
+  void InstallStringPolicy(const std::string& policy_name,
+                           const std::string& policy_value) override;
+  void InstallIntegerPolicy(const std::string& policy_name,
+                            int policy_value) override;
+  void InstallBooleanPolicy(const std::string& policy_name,
+                            bool policy_value) override;
+  void InstallStringListPolicy(const std::string& policy_name,
+                               const base::ListValue* policy_value) override;
+  void InstallDictionaryPolicy(
       const std::string& policy_name,
       const base::DictionaryValue* policy_value) override;
-  virtual void Install3rdPartyPolicy(
-      const base::DictionaryValue* policies) override;
+  void Install3rdPartyPolicy(const base::DictionaryValue* policies) override;
 
   // AppliedGPOListProvider:
-  virtual DWORD GetAppliedGPOList(DWORD flags,
-                                  LPCTSTR machine_name,
-                                  PSID sid_user,
-                                  GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) override;
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override;
+  DWORD GetAppliedGPOList(DWORD flags,
+                          LPCTSTR machine_name,
+                          PSID sid_user,
+                          GUID* extension_guid,
+                          PGROUP_POLICY_OBJECT* gpo_list) override;
+  BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override;
 
   // Creates a harness instance that will install policy in HKCU or HKLM,
   // respectively.
@@ -221,38 +219,36 @@ class PRegTestHarness : public PolicyProviderTestHarness,
                         public AppliedGPOListProvider {
  public:
   PRegTestHarness();
-  virtual ~PRegTestHarness();
+  ~PRegTestHarness() override;
 
   // PolicyProviderTestHarness:
-  virtual void SetUp() override;
+  void SetUp() override;
 
-  virtual ConfigurationPolicyProvider* CreateProvider(
+  ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
       scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() override;
-  virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) override;
-  virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) override;
-  virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) override;
-  virtual void InstallStringListPolicy(
-      const std::string& policy_name,
-      const base::ListValue* policy_value) override;
-  virtual void InstallDictionaryPolicy(
+  void InstallEmptyPolicy() override;
+  void InstallStringPolicy(const std::string& policy_name,
+                           const std::string& policy_value) override;
+  void InstallIntegerPolicy(const std::string& policy_name,
+                            int policy_value) override;
+  void InstallBooleanPolicy(const std::string& policy_name,
+                            bool policy_value) override;
+  void InstallStringListPolicy(const std::string& policy_name,
+                               const base::ListValue* policy_value) override;
+  void InstallDictionaryPolicy(
       const std::string& policy_name,
       const base::DictionaryValue* policy_value) override;
-  virtual void Install3rdPartyPolicy(
-      const base::DictionaryValue* policies) override;
+  void Install3rdPartyPolicy(const base::DictionaryValue* policies) override;
 
   // AppliedGPOListProvider:
-  virtual DWORD GetAppliedGPOList(DWORD flags,
-                                  LPCTSTR machine_name,
-                                  PSID sid_user,
-                                  GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) override;
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override;
+  DWORD GetAppliedGPOList(DWORD flags,
+                          LPCTSTR machine_name,
+                          PSID sid_user,
+                          GUID* extension_guid,
+                          PGROUP_POLICY_OBJECT* gpo_list) override;
+  BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override;
 
   // Creates a harness instance.
   static PolicyProviderTestHarness* Create();
@@ -700,9 +696,9 @@ class PolicyLoaderWinTest : public PolicyTestBase,
   PolicyLoaderWinTest()
       : gpo_list_(NULL),
         gpo_list_status_(ERROR_ACCESS_DENIED) {}
-  virtual ~PolicyLoaderWinTest() {}
+  ~PolicyLoaderWinTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     base::win::SetDomainStateForTesting(false);
     PolicyTestBase::SetUp();
 
@@ -717,15 +713,15 @@ class PolicyLoaderWinTest : public PolicyTestBase,
   }
 
   // AppliedGPOListProvider:
-  virtual DWORD GetAppliedGPOList(DWORD flags,
-                                  LPCTSTR machine_name,
-                                  PSID sid_user,
-                                  GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) override {
+  DWORD GetAppliedGPOList(DWORD flags,
+                          LPCTSTR machine_name,
+                          PSID sid_user,
+                          GUID* extension_guid,
+                          PGROUP_POLICY_OBJECT* gpo_list) override {
     *gpo_list = gpo_list_;
     return gpo_list_status_;
   }
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
+  BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
     return TRUE;
   }
 
diff --git a/components/policy/core/common/policy_service_impl_unittest.cc b/components/policy/core/common/policy_service_impl_unittest.cc
index 109aeb4..ae51237 100644
--- a/components/policy/core/common/policy_service_impl_unittest.cc
+++ b/components/policy/core/common/policy_service_impl_unittest.cc
@@ -100,7 +100,7 @@ class ChangePolicyObserver : public PolicyService::Observer {
 class PolicyServiceTest : public testing::Test {
  public:
   PolicyServiceTest() {}
-  virtual void SetUp() override {
+  void SetUp() override {
     EXPECT_CALL(provider0_, IsInitializationComplete(_))
         .WillRepeatedly(Return(true));
     EXPECT_CALL(provider1_, IsInitializationComplete(_))
@@ -126,7 +126,7 @@ class PolicyServiceTest : public testing::Test {
     policy_service_.reset(new PolicyServiceImpl(providers));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     provider0_.Shutdown();
     provider1_.Shutdown();
     provider2_.Shutdown();
diff --git a/components/proximity_auth/bluetooth_connection_finder_unittest.cc b/components/proximity_auth/bluetooth_connection_finder_unittest.cc
index fc0804e..29561e8 100644
--- a/components/proximity_auth/bluetooth_connection_finder_unittest.cc
+++ b/components/proximity_auth/bluetooth_connection_finder_unittest.cc
@@ -35,15 +35,15 @@ const char kUuid[] = "DEADBEEF-CAFE-FEED-FOOD-D15EA5EBEEF";
 class MockConnection : public Connection {
  public:
   MockConnection() : Connection(kRemoteDevice) {}
-  virtual ~MockConnection() {}
+  ~MockConnection() override {}
 
   MOCK_METHOD0(Connect, void());
 
   using Connection::SetStatus;
 
  private:
-  void Disconnect() {}
-  void SendMessageImpl(scoped_ptr<WireMessage> message) {}
+  void Disconnect() override {}
+  void SendMessageImpl(scoped_ptr<WireMessage> message) override {}
 
   DISALLOW_COPY_AND_ASSIGN(MockConnection);
 };
@@ -54,7 +54,7 @@ class MockBluetoothConnectionFinder : public BluetoothConnectionFinder {
       : BluetoothConnectionFinder(kRemoteDevice,
                                   device::BluetoothUUID(kUuid),
                                   base::TimeDelta()) {}
-  virtual ~MockBluetoothConnectionFinder() {}
+  ~MockBluetoothConnectionFinder() override {}
 
   MOCK_METHOD0(CreateConnectionProxy, Connection*());
 
@@ -75,7 +75,7 @@ class MockBluetoothConnectionFinder : public BluetoothConnectionFinder {
   using BluetoothConnectionFinder::AdapterPoweredChanged;
 
  protected:
-  virtual scoped_ptr<Connection> CreateConnection() override {
+  scoped_ptr<Connection> CreateConnection() override {
     return make_scoped_ptr(CreateConnectionProxy());
   }
 
diff --git a/components/proximity_auth/bluetooth_connection_unittest.cc b/components/proximity_auth/bluetooth_connection_unittest.cc
index a30d08c..129d439 100644
--- a/components/proximity_auth/bluetooth_connection_unittest.cc
+++ b/components/proximity_auth/bluetooth_connection_unittest.cc
@@ -63,7 +63,7 @@ class MockBluetoothConnection : public BluetoothConnection {
   MOCK_METHOD2(OnDidSendMessage,
                void(const WireMessage& message, bool success));
 
-  virtual void SetStatus(Status status) override {
+  void SetStatus(Status status) override {
     SetStatusProxy(status);
     BluetoothConnection::SetStatus(status);
   }
diff --git a/components/proximity_auth/client_unittest.cc b/components/proximity_auth/client_unittest.cc
index 49c0b1a..8085a58 100644
--- a/components/proximity_auth/client_unittest.cc
+++ b/components/proximity_auth/client_unittest.cc
@@ -39,16 +39,16 @@ class MockSecureContext : public SecureContext {
     ON_CALL(*this, GetProtocolVersion())
         .WillByDefault(Return(SecureContext::PROTOCOL_VERSION_THREE_ONE));
   }
-  virtual ~MockSecureContext() {}
+  ~MockSecureContext() override {}
 
   MOCK_CONST_METHOD0(GetReceivedAuthMessage, std::string());
   MOCK_CONST_METHOD0(GetProtocolVersion, ProtocolVersion());
 
-  virtual std::string Encode(const std::string& message) override {
+  std::string Encode(const std::string& message) override {
     return message + kFakeEncodingSuffix;
   }
 
-  virtual std::string Decode(const std::string& encoded_message) override {
+  std::string Decode(const std::string& encoded_message) override {
     EXPECT_THAT(encoded_message, EndsWith(kFakeEncodingSuffix));
     std::string decoded_message = encoded_message;
     decoded_message.erase(decoded_message.rfind(kFakeEncodingSuffix));
diff --git a/components/proximity_auth/connection_unittest.cc b/components/proximity_auth/connection_unittest.cc
index 3fb5f50..1e298cf 100644
--- a/components/proximity_auth/connection_unittest.cc
+++ b/components/proximity_auth/connection_unittest.cc
@@ -35,11 +35,11 @@ class MockConnection : public Connection {
 
   // Gmock only supports copyable types, so create simple wrapper methods for
   // ease of mocking.
-  virtual void SendMessageImpl(scoped_ptr<WireMessage> message) override {
+  void SendMessageImpl(scoped_ptr<WireMessage> message) override {
     SendMessageImplProxy(message.get());
   }
 
-  virtual scoped_ptr<WireMessage> DeserializeWireMessage(
+  scoped_ptr<WireMessage> DeserializeWireMessage(
       bool* is_incomplete_message) override {
     return make_scoped_ptr(DeserializeWireMessageProxy(is_incomplete_message));
   }
diff --git a/components/renderer_context_menu/render_view_context_menu_observer.h b/components/renderer_context_menu/render_view_context_menu_observer.h
index 3ae47d9..586f978 100644
--- a/components/renderer_context_menu/render_view_context_menu_observer.h
+++ b/components/renderer_context_menu/render_view_context_menu_observer.h
@@ -30,12 +30,12 @@ struct ContextMenuParams;
 //  class MyMenuObserver : public RenderViewContextMenuObserver {
 //   public:
 //    MyMenuObserver(RenderViewContextMenuProxy* p);
-//    ~MyMenuObserver();
+//    ~MyMenuObserver() override;
 //
-//    virtual void InitMenu(const content::ContextMenuParams& params) override;
-//    virtual bool IsCommandIdSupported(int command_id) override;
-//    virtual bool IsCommandIdEnabled(int command_id) override;
-//    virtual void ExecuteCommand(int command_id) override;
+//    void InitMenu(const content::ContextMenuParams& params) override;
+//    bool IsCommandIdSupported(int command_id) override;
+//    bool IsCommandIdEnabled(int command_id) override;
+//    void ExecuteCommand(int command_id) override;
 //
 //   private:
 //    RenderViewContextMenuProxy* proxy_;
diff --git a/components/search_provider_logos/logo_tracker_unittest.cc b/components/search_provider_logos/logo_tracker_unittest.cc
index cc7c0c4..590985a 100644
--- a/components/search_provider_logos/logo_tracker_unittest.cc
+++ b/components/search_provider_logos/logo_tracker_unittest.cc
@@ -237,7 +237,7 @@ class MockLogoCache : public LogoCache {
     metadata_.reset(logo ? new LogoMetadata(logo->metadata) : NULL);
   }
 
-  virtual scoped_ptr<EncodedLogo> GetCachedLogo() override {
+  scoped_ptr<EncodedLogo> GetCachedLogo() override {
     OnGetCachedLogo();
     return make_scoped_ptr(logo_ ? new EncodedLogo(*logo_) : NULL);
   }
diff --git a/components/storage_monitor/storage_monitor_win.h b/components/storage_monitor/storage_monitor_win.h
index 6b51cab..2a99f12 100644
--- a/components/storage_monitor/storage_monitor_win.h
+++ b/components/storage_monitor/storage_monitor_win.h
@@ -29,20 +29,20 @@ class StorageMonitorWin : public StorageMonitor {
   // unit tests or in StorageMonitorWin CreateInternal() function.
   StorageMonitorWin(VolumeMountWatcherWin* volume_mount_watcher,
                     PortableDeviceWatcherWin* portable_device_watcher);
-  virtual ~StorageMonitorWin();
+  ~StorageMonitorWin() override;
 
   // Must be called after the file thread is created.
-  virtual void Init() override;
+  void Init() override;
 
   // StorageMonitor:
-  virtual bool GetStorageInfoForPath(const base::FilePath& path,
-                                     StorageInfo* device_info) const override;
-  virtual bool GetMTPStorageInfoFromDeviceId(
+  bool GetStorageInfoForPath(const base::FilePath& path,
+                             StorageInfo* device_info) const override;
+  bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
       base::string16* storage_object_id) const override;
 
-  virtual void EjectDevice(
+  void EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback) override;
 
diff --git a/components/storage_monitor/storage_monitor_win_unittest.cc b/components/storage_monitor/storage_monitor_win_unittest.cc
index fd7ee58..1db435f 100644
--- a/components/storage_monitor/storage_monitor_win_unittest.cc
+++ b/components/storage_monitor/storage_monitor_win_unittest.cc
@@ -39,12 +39,12 @@ namespace storage_monitor {
 class StorageMonitorWinTest : public testing::Test {
  public:
   StorageMonitorWinTest();
-  virtual ~StorageMonitorWinTest();
+  ~StorageMonitorWinTest() override;
 
  protected:
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   void PreAttachDevices();
 
diff --git a/components/storage_monitor/test_portable_device_watcher_win.h b/components/storage_monitor/test_portable_device_watcher_win.h
index bc108b1..53275da 100644
--- a/components/storage_monitor/test_portable_device_watcher_win.h
+++ b/components/storage_monitor/test_portable_device_watcher_win.h
@@ -26,7 +26,7 @@ class TestPortableDeviceWatcherWin : public PortableDeviceWatcherWin {
   static const char kStorageUniqueIdA[];
 
   TestPortableDeviceWatcherWin();
-  virtual ~TestPortableDeviceWatcherWin();
+  ~TestPortableDeviceWatcherWin() override;
 
   // Returns the persistent storage unique id of the device specified by the
   // |pnp_device_id|. |storage_object_id| specifies the string ID that uniquely
@@ -60,10 +60,9 @@ class TestPortableDeviceWatcherWin : public PortableDeviceWatcherWin {
 
  private:
   // PortableDeviceWatcherWin:
-  virtual void EnumerateAttachedDevices() override;
-  virtual void HandleDeviceAttachEvent(
-      const base::string16& pnp_device_id) override;
-  virtual bool GetMTPStorageInfoFromDeviceId(
+  void EnumerateAttachedDevices() override;
+  void HandleDeviceAttachEvent(const base::string16& pnp_device_id) override;
+  bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
       base::string16* storage_object_id) const override;
diff --git a/components/storage_monitor/test_storage_monitor.h b/components/storage_monitor/test_storage_monitor.h
index 7eff7fb..7726e57 100644
--- a/components/storage_monitor/test_storage_monitor.h
+++ b/components/storage_monitor/test_storage_monitor.h
@@ -38,7 +38,7 @@ class TestStorageMonitor : public StorageMonitor {
                              StorageInfo* device_info) const override;
 
 #if defined(OS_WIN)
-  virtual bool GetMTPStorageInfoFromDeviceId(
+  bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
       base::string16* storage_object_id) const override;
diff --git a/components/storage_monitor/test_storage_monitor_win.h b/components/storage_monitor/test_storage_monitor_win.h
index 60660ae..2ffd070 100644
--- a/components/storage_monitor/test_storage_monitor_win.h
+++ b/components/storage_monitor/test_storage_monitor_win.h
@@ -24,13 +24,13 @@ class TestStorageMonitorWin: public StorageMonitorWin {
       TestVolumeMountWatcherWin* volume_mount_watcher,
       TestPortableDeviceWatcherWin* portable_device_watcher);
 
-  virtual ~TestStorageMonitorWin();
+  ~TestStorageMonitorWin() override;
 
   void InjectDeviceChange(UINT event_type, DWORD data);
 
   VolumeMountWatcherWin* volume_mount_watcher();
 
-  virtual Receiver* receiver() const override;
+  Receiver* receiver() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestStorageMonitorWin);
diff --git a/components/storage_monitor/test_volume_mount_watcher_win.h b/components/storage_monitor/test_volume_mount_watcher_win.h
index 5191997..ca0a9b4 100644
--- a/components/storage_monitor/test_volume_mount_watcher_win.h
+++ b/components/storage_monitor/test_volume_mount_watcher_win.h
@@ -24,7 +24,7 @@ namespace storage_monitor {
 class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
  public:
   TestVolumeMountWatcherWin();
-  virtual ~TestVolumeMountWatcherWin();
+  ~TestVolumeMountWatcherWin() override;
 
   static bool GetDeviceRemovable(const base::FilePath& device_path,
                                  bool* removable);
@@ -47,11 +47,9 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
   void ReleaseDeviceCheck();
 
   // VolumeMountWatcherWin:
-  virtual void DeviceCheckComplete(const base::FilePath& device_path) override;
-  virtual GetAttachedDevicesCallbackType
-      GetAttachedDevicesCallback() const override;
-  virtual GetDeviceDetailsCallbackType
-      GetDeviceDetailsCallback() const override;
+  void DeviceCheckComplete(const base::FilePath& device_path) override;
+  GetAttachedDevicesCallbackType GetAttachedDevicesCallback() const override;
+  GetDeviceDetailsCallbackType GetDeviceDetailsCallback() const override;
 
  private:
   std::vector<base::FilePath> devices_checked_;
diff --git a/components/sync_driver/shared_change_processor_unittest.cc b/components/sync_driver/shared_change_processor_unittest.cc
index d65fb54..a67c298 100644
--- a/components/sync_driver/shared_change_processor_unittest.cc
+++ b/components/sync_driver/shared_change_processor_unittest.cc
@@ -41,16 +41,16 @@ class SyncSharedChangeProcessorTest :
         did_connect_(false),
         has_attachment_service_(false) {}
 
-  virtual ~SyncSharedChangeProcessorTest() {
+  ~SyncSharedChangeProcessorTest() override {
     EXPECT_FALSE(db_syncable_service_.get());
   }
 
-  virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
+  base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
       syncer::ModelType type) override {
     return db_syncable_service_->AsWeakPtr();
   }
 
-  virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
+  scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
       const syncer::UserShare& user_share,
       const std::string& store_birthday,
@@ -60,7 +60,7 @@ class SyncSharedChangeProcessorTest :
   }
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     test_user_share_.SetUp();
     shared_change_processor_ = new SharedChangeProcessor();
     ASSERT_TRUE(backend_thread_.Start());
@@ -70,7 +70,7 @@ class SyncSharedChangeProcessorTest :
                    base::Unretained(this))));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     EXPECT_TRUE(backend_thread_.message_loop_proxy()->PostTask(
         FROM_HERE,
         base::Bind(&SyncSharedChangeProcessorTest::TearDownDBSyncableService,
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index 6476e59..5cd4102 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -88,13 +88,13 @@ class ComponentsTestSuite : public base::TestSuite {
 class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener {
  public:
   ComponentsUnitTestEventListener() {}
-  virtual ~ComponentsUnitTestEventListener() {}
+  ~ComponentsUnitTestEventListener() override {}
 
-  virtual void OnTestStart(const testing::TestInfo& test_info) override {
+  void OnTestStart(const testing::TestInfo& test_info) override {
     content_initializer_.reset(new content::TestContentClientInitializer());
   }
 
-  virtual void OnTestEnd(const testing::TestInfo& test_info) override {
+  void OnTestEnd(const testing::TestInfo& test_info) override {
     content_initializer_.reset();
   }
 
diff --git a/components/update_client/background_downloader_win.h b/components/update_client/background_downloader_win.h
index 48ce6dd..8d7d40c 100644
--- a/components/update_client/background_downloader_win.h
+++ b/components/update_client/background_downloader_win.h
@@ -38,11 +38,11 @@ class BackgroundDownloader : public CrxDownloader {
   BackgroundDownloader(scoped_ptr<CrxDownloader> successor,
                        net::URLRequestContextGetter* context_getter,
                        scoped_refptr<base::SingleThreadTaskRunner> task_runner);
-  virtual ~BackgroundDownloader();
+  ~BackgroundDownloader() override;
 
  private:
   // Overrides for CrxDownloader.
-  virtual void DoStartDownload(const GURL& url) override;
+  void DoStartDownload(const GURL& url) override;
 
   // Called asynchronously on the |task_runner_| at different stages during
   // the download. |OnDownloading| can be called multiple times.
diff --git a/components/webdata/common/web_data_results.h b/components/webdata/common/web_data_results.h
index 6353db1..d6d07fd 100644
--- a/components/webdata/common/web_data_results.h
+++ b/components/webdata/common/web_data_results.h
@@ -67,7 +67,7 @@ template <class T> class WDResult : public WDTypedResult {
       : WDTypedResult(type), value_(v) {
   }
 
-  virtual ~WDResult() {
+  ~WDResult() override {
   }
 
   // Return a single value result.
@@ -91,11 +91,10 @@ template <class T> class WDDestroyableResult : public WDResult<T> {
         callback_(callback) {
   }
 
-  virtual ~WDDestroyableResult() {
+  ~WDDestroyableResult() override {
   }
 
-
-  virtual void Destroy()  override {
+  void Destroy() override {
     if (!callback_.is_null()) {
       callback_.Run(this);
     }
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index 50fb21f..7c6a88a 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -174,60 +174,59 @@ namespace wifi {
 class WiFiServiceImpl : public WiFiService {
  public:
   WiFiServiceImpl();
-  virtual ~WiFiServiceImpl();
+  ~WiFiServiceImpl() override;
 
   // WiFiService interface implementation.
-  virtual void Initialize(
+  void Initialize(
       scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void UnInitialize() override;
+  void UnInitialize() override;
 
-  virtual void GetProperties(const std::string& network_guid,
-                             base::DictionaryValue* properties,
-                             std::string* error) override;
+  void GetProperties(const std::string& network_guid,
+                     base::DictionaryValue* properties,
+                     std::string* error) override;
 
-  virtual void GetManagedProperties(const std::string& network_guid,
-                                    base::DictionaryValue* managed_properties,
-                                    std::string* error) override;
+  void GetManagedProperties(const std::string& network_guid,
+                            base::DictionaryValue* managed_properties,
+                            std::string* error) override;
 
-  virtual void GetState(const std::string& network_guid,
-                        base::DictionaryValue* properties,
-                        std::string* error) override;
+  void GetState(const std::string& network_guid,
+                base::DictionaryValue* properties,
+                std::string* error) override;
 
-  virtual void SetProperties(const std::string& network_guid,
-                             scoped_ptr<base::DictionaryValue> properties,
-                             std::string* error) override;
+  void SetProperties(const std::string& network_guid,
+                     scoped_ptr<base::DictionaryValue> properties,
+                     std::string* error) override;
 
-  virtual void CreateNetwork(bool shared,
-                             scoped_ptr<base::DictionaryValue> properties,
-                             std::string* network_guid,
-                             std::string* error) override;
+  void CreateNetwork(bool shared,
+                     scoped_ptr<base::DictionaryValue> properties,
+                     std::string* network_guid,
+                     std::string* error) override;
 
-  virtual void GetVisibleNetworks(const std::string& network_type,
-                                  base::ListValue* network_list,
-                                  bool include_details) override;
+  void GetVisibleNetworks(const std::string& network_type,
+                          base::ListValue* network_list,
+                          bool include_details) override;
 
-  virtual void RequestNetworkScan() override;
+  void RequestNetworkScan() override;
 
-  virtual void StartConnect(const std::string& network_guid,
-                            std::string* error) override;
+  void StartConnect(const std::string& network_guid,
+                    std::string* error) override;
 
-  virtual void StartDisconnect(const std::string& network_guid,
-                               std::string* error) override;
+  void StartDisconnect(const std::string& network_guid,
+                       std::string* error) override;
 
-  virtual void GetKeyFromSystem(const std::string& network_guid,
-                                std::string* key_data,
-                                std::string* error) override;
+  void GetKeyFromSystem(const std::string& network_guid,
+                        std::string* key_data,
+                        std::string* error) override;
 
-  virtual void SetEventObservers(
+  void SetEventObservers(
       scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
       const NetworkGuidListCallback& networks_changed_observer,
       const NetworkGuidListCallback& network_list_changed_observer) override;
 
-  virtual void RequestConnectedNetworkUpdate() override {}
+  void RequestConnectedNetworkUpdate() override {}
 
-  virtual void GetConnectedNetworkSSID(std::string* ssid,
-                                       std::string* error) override;
+  void GetConnectedNetworkSSID(std::string* ssid, std::string* error) override;
 
  private:
   typedef int32 EncryptionType;