Standardize usage of virtual/override/final in components/

BUG=417463
TBR=blundell@chromium.org

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

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

418 files changed, 2766 insertions, 3091 deletions

diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h
index 5081593..8247c1d 100644
--- a/components/autofill/content/browser/content_autofill_driver.h
+++ b/components/autofill/content/browser/content_autofill_driver.h
@@ -42,23 +42,22 @@ class ContentAutofillDriver : public AutofillDriver,
   static ContentAutofillDriver* FromWebContents(content::WebContents* contents);
 
   // AutofillDriver:
-  virtual bool IsOffTheRecord() const override;
-  virtual net::URLRequestContextGetter* GetURLRequestContext() override;
-  virtual base::SequencedWorkerPool* GetBlockingPool() override;
-  virtual bool RendererIsAvailable() override;
-  virtual void SendFormDataToRenderer(int query_id,
-                                      RendererFormDataAction action,
-                                      const FormData& data) override;
-  virtual void PingRenderer() override;
-  virtual void SendAutofillTypePredictionsToRenderer(
+  bool IsOffTheRecord() const override;
+  net::URLRequestContextGetter* GetURLRequestContext() override;
+  base::SequencedWorkerPool* GetBlockingPool() override;
+  bool RendererIsAvailable() override;
+  void SendFormDataToRenderer(int query_id,
+                              RendererFormDataAction action,
+                              const FormData& data) override;
+  void PingRenderer() override;
+  void SendAutofillTypePredictionsToRenderer(
       const std::vector<FormStructure*>& forms) override;
-  virtual void RendererShouldAcceptDataListSuggestion(
+  void RendererShouldAcceptDataListSuggestion(
       const base::string16& value) override;
-  virtual void RendererShouldClearFilledForm() override;
-  virtual void RendererShouldClearPreviewedForm() override;
-  virtual void RendererShouldFillFieldWithValue(
-      const base::string16& value) override;
-  virtual void RendererShouldPreviewFieldWithValue(
+  void RendererShouldClearFilledForm() override;
+  void RendererShouldClearPreviewedForm() override;
+  void RendererShouldFillFieldWithValue(const base::string16& value) override;
+  void RendererShouldPreviewFieldWithValue(
       const base::string16& value) override;
 
   AutofillExternalDelegate* autofill_external_delegate() {
@@ -73,16 +72,16 @@ class ContentAutofillDriver : public AutofillDriver,
       AutofillClient* client,
       const std::string& app_locale,
       AutofillManager::AutofillDownloadManagerState enable_download_manager);
-  virtual ~ContentAutofillDriver();
+  ~ContentAutofillDriver() override;
 
   // content::WebContentsObserver:
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
-  virtual void NavigationEntryCommitted(
+  void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override;
-  virtual void WasHidden() override;
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  void WasHidden() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // Sets the manager to |manager| and sets |manager|'s external delegate
   // to |autofill_external_delegate_|. Takes ownership of |manager|.
diff --git a/components/autofill/content/browser/content_autofill_driver_unittest.cc b/components/autofill/content/browser/content_autofill_driver_unittest.cc
index 1509385..3b87c4d 100644
--- a/components/autofill/content/browser/content_autofill_driver_unittest.cc
+++ b/components/autofill/content/browser/content_autofill_driver_unittest.cc
@@ -54,7 +54,7 @@ class TestContentAutofillDriver : public ContentAutofillDriver {
         new MockAutofillManager(this, client));
     SetAutofillManager(autofill_manager.Pass());
   }
-  virtual ~TestContentAutofillDriver() {}
+  ~TestContentAutofillDriver() override {}
 
   virtual MockAutofillManager* mock_autofill_manager() {
     return static_cast<MockAutofillManager*>(autofill_manager());
diff --git a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
index f4a6c8e..2b72143 100644
--- a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
+++ b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
@@ -23,9 +23,9 @@ class TestAutofillManager : public AutofillManager {
   TestAutofillManager(AutofillDriver* driver, AutofillClient* client)
       : AutofillManager(driver, client, kAppLocale, kDownloadState),
         autofill_enabled_(true) {}
-  virtual ~TestAutofillManager() {}
+  ~TestAutofillManager() override {}
 
-  virtual bool IsAutofillEnabled() const override { return autofill_enabled_; }
+  bool IsAutofillEnabled() const override { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -41,12 +41,11 @@ class CustomTestAutofillClient : public TestAutofillClient {
  public:
   CustomTestAutofillClient() : should_simulate_success_(true) {}
 
-  virtual ~CustomTestAutofillClient() {}
+  ~CustomTestAutofillClient() override {}
 
-  virtual void ShowRequestAutocompleteDialog(
-      const FormData& form,
-      const GURL& source_url,
-      const ResultCallback& callback) override {
+  void ShowRequestAutocompleteDialog(const FormData& form,
+                                     const GURL& source_url,
+                                     const ResultCallback& callback) override {
     if (should_simulate_success_) {
       FormStructure form_structure(form);
       callback.Run(
@@ -78,7 +77,7 @@ class TestContentAutofillDriver : public ContentAutofillDriver {
     SetAutofillManager(make_scoped_ptr<AutofillManager>(
         new TestAutofillManager(this, client)));
   }
-  virtual ~TestContentAutofillDriver() {}
+  ~TestContentAutofillDriver() override {}
 
   TestAutofillManager* mock_autofill_manager() {
     return static_cast<TestAutofillManager*>(autofill_manager());
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
index c92c02b..3135f7e 100644
--- a/components/autofill/content/browser/risk/fingerprint.cc
+++ b/components/autofill/content/browser/risk/fingerprint.cc
@@ -199,10 +199,10 @@ class FingerprintDataLoader : public content::GpuDataManagerObserver {
       const base::Callback<void(scoped_ptr<Fingerprint>)>& callback);
 
  private:
-  virtual ~FingerprintDataLoader() {}
+  ~FingerprintDataLoader() override {}
 
   // content::GpuDataManagerObserver:
-  virtual void OnGpuInfoUpdate() override;
+  void OnGpuInfoUpdate() override;
 
   // Callbacks for asynchronously loaded data.
   void OnGotFonts(scoped_ptr<base::ListValue> fonts);
diff --git a/components/autofill/content/browser/wallet/wallet_client.h b/components/autofill/content/browser/wallet/wallet_client.h
index 1115f6d..e786e99 100644
--- a/components/autofill/content/browser/wallet/wallet_client.h
+++ b/components/autofill/content/browser/wallet/wallet_client.h
@@ -142,7 +142,7 @@ class WalletClient : public net::URLFetcherDelegate {
                WalletClientDelegate* delegate,
                const GURL& source_url);
 
-  virtual ~WalletClient();
+  ~WalletClient() override;
 
   // GetWalletItems retrieves the user's online wallet. The WalletItems
   // returned may require additional action such as presenting legal documents
@@ -223,7 +223,7 @@ class WalletClient : public net::URLFetcherDelegate {
   void HandleWalletError(ErrorType error_type);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Logs an UMA metric for each of the |required_actions|.
   void LogRequiredActions(
diff --git a/components/autofill/content/browser/wallet/wallet_signin_helper.h b/components/autofill/content/browser/wallet/wallet_signin_helper.h
index 2bc5a55..9e7ab02 100644
--- a/components/autofill/content/browser/wallet/wallet_signin_helper.h
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper.h
@@ -35,7 +35,7 @@ class WalletSigninHelper : public net::URLFetcherDelegate {
   WalletSigninHelper(WalletSigninHelperDelegate* delegate,
                      net::URLRequestContextGetter* getter);
 
-  virtual ~WalletSigninHelper();
+  ~WalletSigninHelper() override;
 
   // Initiates an attempt to passively sign the user into the Online Wallet.
   // A passive sign-in is a non-interactive refresh of content area cookies,
@@ -57,7 +57,7 @@ class WalletSigninHelper : public net::URLFetcherDelegate {
   void OnOtherError();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* fetcher) override;
+  void OnURLFetchComplete(const net::URLFetcher* fetcher) override;
 
   // Callback for when the Google Wallet cookie has been retrieved.
   void ReturnWalletCookieValue(const std::string& cookie_value);
diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
index 22c70bb..8ed72c1 100644
--- a/components/autofill/content/renderer/autofill_agent.h
+++ b/components/autofill/content/renderer/autofill_agent.h
@@ -56,23 +56,22 @@ class AutofillAgent : public content::RenderViewObserver,
 
  private:
   // content::RenderViewObserver:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
-  virtual void DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
-                                        bool is_new_navigation) override;
-  virtual void FrameDetached(blink::WebFrame* frame) override;
-  virtual void FrameWillClose(blink::WebFrame* frame) override;
-  virtual void WillSubmitForm(blink::WebLocalFrame* frame,
-                              const blink::WebFormElement& form) override;
-  virtual void DidChangeScrollOffset(blink::WebLocalFrame* frame) override;
-  virtual void FocusedNodeChanged(const blink::WebNode& node) override;
-  virtual void OrientationChangeEvent() override;
-  virtual void Resized() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
+  void DidCommitProvisionalLoad(blink::WebLocalFrame* frame,
+                                bool is_new_navigation) override;
+  void FrameDetached(blink::WebFrame* frame) override;
+  void FrameWillClose(blink::WebFrame* frame) override;
+  void WillSubmitForm(blink::WebLocalFrame* frame,
+                      const blink::WebFormElement& form) override;
+  void DidChangeScrollOffset(blink::WebLocalFrame* frame) override;
+  void FocusedNodeChanged(const blink::WebNode& node) override;
+  void OrientationChangeEvent() override;
+  void Resized() override;
 
   // PageClickListener:
-  virtual void FormControlElementClicked(
-      const blink::WebFormControlElement& element,
-      bool was_focused) override;
+  void FormControlElementClicked(const blink::WebFormControlElement& element,
+                                 bool was_focused) override;
 
   // blink::WebAutofillClient:
   virtual void textFieldDidEndEditing(
diff --git a/components/autofill/content/renderer/page_click_tracker.h b/components/autofill/content/renderer/page_click_tracker.h
index 894c05c..7849b90 100644
--- a/components/autofill/content/renderer/page_click_tracker.h
+++ b/components/autofill/content/renderer/page_click_tracker.h
@@ -30,14 +30,13 @@ class PageClickTracker : public content::RenderViewObserver {
   // outlive this class.
   PageClickTracker(content::RenderView* render_view,
                    PageClickListener* listener);
-  virtual ~PageClickTracker();
+  ~PageClickTracker() override;
 
  private:
   // RenderView::Observer implementation.
-  virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) override;
-  virtual void DidHandleGestureEvent(
-      const blink::WebGestureEvent& event) override;
-  virtual void FocusedNodeChanged(const blink::WebNode& node) override;
+  void DidHandleMouseEvent(const blink::WebMouseEvent& event) override;
+  void DidHandleGestureEvent(const blink::WebGestureEvent& event) override;
+  void FocusedNodeChanged(const blink::WebNode& node) override;
 
   // Called there is a tap or click at |x|, |y|.
   void PotentialActivationAt(int x, int y);
diff --git a/components/autofill/content/renderer/password_autofill_agent.h b/components/autofill/content/renderer/password_autofill_agent.h
index fb557f6..df43c3d 100644
--- a/components/autofill/content/renderer/password_autofill_agent.h
+++ b/components/autofill/content/renderer/password_autofill_agent.h
@@ -28,7 +28,7 @@ namespace autofill {
 class PasswordAutofillAgent : public content::RenderViewObserver {
  public:
   explicit PasswordAutofillAgent(content::RenderView* render_view);
-  virtual ~PasswordAutofillAgent();
+  ~PasswordAutofillAgent() override;
 
   // WebViewClient editor related calls forwarded by the RenderView.
   // If they return true, it indicates the event was consumed and should not
@@ -132,18 +132,18 @@ class PasswordAutofillAgent : public content::RenderViewObserver {
   };
 
   // RenderViewObserver:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void DidStartProvisionalLoad(blink::WebLocalFrame* frame) override;
-  virtual void DidStartLoading() override;
-  virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
-  virtual void DidFinishLoad(blink::WebLocalFrame* frame) override;
-  virtual void DidStopLoading() override;
-  virtual void FrameDetached(blink::WebFrame* frame) override;
-  virtual void FrameWillClose(blink::WebFrame* frame) override;
-  virtual void WillSendSubmitEvent(blink::WebLocalFrame* frame,
-                                   const blink::WebFormElement& form) override;
-  virtual void WillSubmitForm(blink::WebLocalFrame* frame,
-                              const blink::WebFormElement& form) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void DidStartProvisionalLoad(blink::WebLocalFrame* frame) override;
+  void DidStartLoading() override;
+  void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
+  void DidFinishLoad(blink::WebLocalFrame* frame) override;
+  void DidStopLoading() override;
+  void FrameDetached(blink::WebFrame* frame) override;
+  void FrameWillClose(blink::WebFrame* frame) override;
+  void WillSendSubmitEvent(blink::WebLocalFrame* frame,
+                           const blink::WebFormElement& form) override;
+  void WillSubmitForm(blink::WebLocalFrame* frame,
+                      const blink::WebFormElement& form) override;
 
   // RenderView IPC handlers:
   void OnFillPasswordForm(const PasswordFormFillData& form_data);
diff --git a/components/autofill/content/renderer/password_generation_agent.h b/components/autofill/content/renderer/password_generation_agent.h
index 4d38b5b..97c5527 100644
--- a/components/autofill/content/renderer/password_generation_agent.h
+++ b/components/autofill/content/renderer/password_generation_agent.h
@@ -29,7 +29,7 @@ struct PasswordForm;
 class PasswordGenerationAgent : public content::RenderViewObserver {
  public:
   explicit PasswordGenerationAgent(content::RenderView* render_view);
-  virtual ~PasswordGenerationAgent();
+  ~PasswordGenerationAgent() override;
 
   // Returns true if the field being changed is one where a generated password
   // is being offered. Updates the state of the popup if necessary.
@@ -50,15 +50,15 @@ class PasswordGenerationAgent : public content::RenderViewObserver {
   virtual bool ShouldAnalyzeDocument(const blink::WebDocument& document) const;
 
   // RenderViewObserver:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // Use to force enable during testing.
   void set_enabled(bool enabled) { enabled_ = enabled; }
 
  private:
   // RenderViewObserver:
-  virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
-  virtual void DidFinishLoad(blink::WebLocalFrame* frame) override;
+  void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
+  void DidFinishLoad(blink::WebLocalFrame* frame) override;
 
   // Message handlers.
   void OnFormNotBlacklisted(const PasswordForm& form);
diff --git a/components/autofill/content/renderer/renderer_save_password_progress_logger.h b/components/autofill/content/renderer/renderer_save_password_progress_logger.h
index 2cc9e70..a636371 100644
--- a/components/autofill/content/renderer/renderer_save_password_progress_logger.h
+++ b/components/autofill/content/renderer/renderer_save_password_progress_logger.h
@@ -25,11 +25,11 @@ class RendererSavePasswordProgressLogger : public SavePasswordProgressLogger {
   // AutofillHostMsg_RecordSavePasswordProgress message with the logs to the
   // browser. The |sender| needs to outlive the constructed logger.
   RendererSavePasswordProgressLogger(IPC::Sender* sender, int routing_id);
-  virtual ~RendererSavePasswordProgressLogger();
+  ~RendererSavePasswordProgressLogger() override;
 
  protected:
   // SavePasswordProgressLogger:
-  virtual void SendLog(const std::string& log) override;
+  void SendLog(const std::string& log) override;
 
  private:
   // Used by SendLog to send the IPC message with logs. |sender_| needs to
diff --git a/components/autofill/content/renderer/test_password_autofill_agent.h b/components/autofill/content/renderer/test_password_autofill_agent.h
index 1c39f63..ee0196b 100644
--- a/components/autofill/content/renderer/test_password_autofill_agent.h
+++ b/components/autofill/content/renderer/test_password_autofill_agent.h
@@ -12,13 +12,13 @@ namespace autofill {
 class TestPasswordAutofillAgent : public PasswordAutofillAgent {
  public:
   explicit TestPasswordAutofillAgent(content::RenderView* render_view);
-  virtual ~TestPasswordAutofillAgent();
+  ~TestPasswordAutofillAgent() override;
 
  private:
   // Always returns true. This allows browser tests with "data: " URL scheme to
   // work with the password manager.
   // PasswordAutofillAgent:
-  virtual bool OriginCanAccessPasswordManager(
+  bool OriginCanAccessPasswordManager(
       const blink::WebSecurityOrigin& origin) override;
 };
 
diff --git a/components/autofill/content/renderer/test_password_generation_agent.h b/components/autofill/content/renderer/test_password_generation_agent.h
index ffdaefd..633acf9 100644
--- a/components/autofill/content/renderer/test_password_generation_agent.h
+++ b/components/autofill/content/renderer/test_password_generation_agent.h
@@ -16,11 +16,11 @@ namespace autofill {
 class TestPasswordGenerationAgent : public PasswordGenerationAgent {
  public:
   explicit TestPasswordGenerationAgent(content::RenderView* render_view);
-  virtual ~TestPasswordGenerationAgent();
+  ~TestPasswordGenerationAgent() override;
 
   // content::RenderViewObserver implementation:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual bool Send(IPC::Message* message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  bool Send(IPC::Message* message) override;
 
   // Access messages that would have been sent to the browser.
   const std::vector<IPC::Message*>& messages() const { return messages_.get(); }
@@ -30,8 +30,7 @@ class TestPasswordGenerationAgent : public PasswordGenerationAgent {
 
   // PasswordGenreationAgent implementation:
   // Always return true to allow loading of data URLs.
-  virtual bool ShouldAnalyzeDocument(
-      const blink::WebDocument& document) const override;
+  bool ShouldAnalyzeDocument(const blink::WebDocument& document) const override;
 
  private:
   ScopedVector<IPC::Message> messages_;
diff --git a/components/autofill/core/browser/address.h b/components/autofill/core/browser/address.h
index f1d726c..4f07f05 100644
--- a/components/autofill/core/browser/address.h
+++ b/components/autofill/core/browser/address.h
@@ -19,28 +19,25 @@ class Address : public FormGroup {
  public:
   Address();
   Address(const Address& address);
-  virtual ~Address();
+  ~Address() override;
 
   Address& operator=(const Address& address);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override;
-  virtual base::string16 GetInfo(const AutofillType& type,
-                           const std::string& app_locale) const override;
-  virtual bool SetInfo(const AutofillType& type,
-                       const base::string16& value,
-                       const std::string& app_locale) override;
-  virtual void GetMatchingTypes(
-      const base::string16& text,
-      const std::string& app_locale,
-      ServerFieldTypeSet* matching_types) const override;
+  base::string16 GetRawInfo(ServerFieldType type) const override;
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override;
+  base::string16 GetInfo(const AutofillType& type,
+                         const std::string& app_locale) const override;
+  bool SetInfo(const AutofillType& type,
+               const base::string16& value,
+               const std::string& app_locale) override;
+  void GetMatchingTypes(const base::string16& text,
+                        const std::string& app_locale,
+                        ServerFieldTypeSet* matching_types) const override;
 
  private:
   // FormGroup:
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override;
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   // Trims any trailing newlines from |street_address_|.
   void TrimStreetAddress();
diff --git a/components/autofill/core/browser/address_field.h b/components/autofill/core/browser/address_field.h
index 1543aaa..b332719 100644
--- a/components/autofill/core/browser/address_field.h
+++ b/components/autofill/core/browser/address_field.h
@@ -25,7 +25,7 @@ class AddressField : public FormField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
+  bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(AddressFieldTest, ParseOneLineAddress);
diff --git a/components/autofill/core/browser/autocomplete_history_manager.h b/components/autofill/core/browser/autocomplete_history_manager.h
index 5c04088..254676b 100644
--- a/components/autofill/core/browser/autocomplete_history_manager.h
+++ b/components/autofill/core/browser/autocomplete_history_manager.h
@@ -26,12 +26,11 @@ class AutocompleteHistoryManager : public WebDataServiceConsumer {
  public:
   AutocompleteHistoryManager(AutofillDriver* driver,
                              AutofillClient* autofill_client);
-  virtual ~AutocompleteHistoryManager();
+  ~AutocompleteHistoryManager() override;
 
   // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(
-      WebDataServiceBase::Handle h,
-      const WDTypedResult* result) override;
+  void OnWebDataServiceRequestDone(WebDataServiceBase::Handle h,
+                                   const WDTypedResult* result) override;
 
   // Pass-through functions that are called by AutofillManager, after it has
   // dispatched a message.
diff --git a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
index 64da46b1..55807f6 100644
--- a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
@@ -48,10 +48,11 @@ class MockAutofillClient : public TestAutofillClient {
   MockAutofillClient(scoped_refptr<MockWebDataService> web_data_service)
       : web_data_service_(web_data_service),
         prefs_(test::PrefServiceForTesting()) {}
-  virtual ~MockAutofillClient() {}
-  virtual scoped_refptr<AutofillWebDataService>
-      GetDatabase() override { return web_data_service_; }
-  virtual PrefService* GetPrefs() override { return prefs_.get(); }
+  ~MockAutofillClient() override {}
+  scoped_refptr<AutofillWebDataService> GetDatabase() override {
+    return web_data_service_;
+  }
+  PrefService* GetPrefs() override { return prefs_.get(); }
 
  private:
   scoped_refptr<MockWebDataService> web_data_service_;
diff --git a/components/autofill/core/browser/autofill_data_model.h b/components/autofill/core/browser/autofill_data_model.h
index 04499f3..c4b7751 100644
--- a/components/autofill/core/browser/autofill_data_model.h
+++ b/components/autofill/core/browser/autofill_data_model.h
@@ -20,7 +20,7 @@ class AutofillType;
 class AutofillDataModel : public FormGroup {
  public:
   AutofillDataModel(const std::string& guid, const std::string& origin);
-  virtual ~AutofillDataModel();
+  ~AutofillDataModel() override;
 
   // Returns the string that should be auto-filled into a text field given the
   // |type| of that field, localized to the given |app_locale| if appropriate.
diff --git a/components/autofill/core/browser/autofill_data_model_unittest.cc b/components/autofill/core/browser/autofill_data_model_unittest.cc
index dc861a7..dec2027 100644
--- a/components/autofill/core/browser/autofill_data_model_unittest.cc
+++ b/components/autofill/core/browser/autofill_data_model_unittest.cc
@@ -16,16 +16,14 @@ class TestAutofillDataModel : public AutofillDataModel {
  public:
   TestAutofillDataModel(const std::string& guid, const std::string& origin)
       : AutofillDataModel(guid, origin) {}
-  virtual ~TestAutofillDataModel() {}
+  ~TestAutofillDataModel() override {}
 
  private:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override {
+  base::string16 GetRawInfo(ServerFieldType type) const override {
     return base::string16();
   }
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override {}
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override {}
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override {}
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override {}
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDataModel);
 };
diff --git a/components/autofill/core/browser/autofill_download_manager.h b/components/autofill/core/browser/autofill_download_manager.h
index 2963e41..4f0e2a3 100644
--- a/components/autofill/core/browser/autofill_download_manager.h
+++ b/components/autofill/core/browser/autofill_download_manager.h
@@ -63,7 +63,7 @@ class AutofillDownloadManager : public net::URLFetcherDelegate {
   AutofillDownloadManager(AutofillDriver* driver,
                           PrefService* pref_service,
                           Observer* observer);
-  virtual ~AutofillDownloadManager();
+  ~AutofillDownloadManager() override;
 
   // Starts a query request to Autofill servers. The observer is called with the
   // list of the fields of all requested forms.
@@ -118,7 +118,7 @@ class AutofillDownloadManager : public net::URLFetcherDelegate {
       const std::vector<std::string>& forms_in_query) const;
 
   // net::URLFetcherDelegate implementation:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Probability of the form upload. Between 0 (no upload) and 1 (upload all).
   // GetPositiveUploadRate() is for matched forms,
diff --git a/components/autofill/core/browser/autofill_download_manager_unittest.cc b/components/autofill/core/browser/autofill_download_manager_unittest.cc
index be1fd62..5c6268f 100644
--- a/components/autofill/core/browser/autofill_download_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_download_manager_unittest.cc
@@ -78,24 +78,22 @@ class AutofillDownloadTest : public AutofillDownloadManager::Observer,
   }
 
   // AutofillDownloadManager::Observer implementation.
-  virtual void OnLoadedServerPredictions(
-      const std::string& response_xml) override {
+  void OnLoadedServerPredictions(const std::string& response_xml) override {
     ResponseData response;
     response.response = response_xml;
     response.type_of_response = QUERY_SUCCESSFULL;
     responses_.push_back(response);
   }
 
-  virtual void OnUploadedPossibleFieldTypes() override {
+  void OnUploadedPossibleFieldTypes() override {
     ResponseData response;
     response.type_of_response = UPLOAD_SUCCESSFULL;
     responses_.push_back(response);
   }
 
-  virtual void OnServerRequestError(
-      const std::string& form_signature,
-      AutofillDownloadManager::RequestType request_type,
-      int http_error) override {
+  void OnServerRequestError(const std::string& form_signature,
+                            AutofillDownloadManager::RequestType request_type,
+                            int http_error) override {
     ResponseData response;
     response.signature = form_signature;
     response.error = http_error;
diff --git a/components/autofill/core/browser/autofill_external_delegate.h b/components/autofill/core/browser/autofill_external_delegate.h
index 81435fe..971af23 100644
--- a/components/autofill/core/browser/autofill_external_delegate.h
+++ b/components/autofill/core/browser/autofill_external_delegate.h
@@ -35,15 +35,14 @@ class AutofillExternalDelegate
   virtual ~AutofillExternalDelegate();
 
   // AutofillPopupDelegate implementation.
-  virtual void OnPopupShown() override;
-  virtual void OnPopupHidden() override;
-  virtual void DidSelectSuggestion(const base::string16& value,
-                                   int identifier) override;
-  virtual void DidAcceptSuggestion(const base::string16& value,
-                                   int identifier) override;
-  virtual void RemoveSuggestion(const base::string16& value,
-                                int identifier) override;
-  virtual void ClearPreviewedForm() override;
+  void OnPopupShown() override;
+  void OnPopupHidden() override;
+  void DidSelectSuggestion(const base::string16& value,
+                           int identifier) override;
+  void DidAcceptSuggestion(const base::string16& value,
+                           int identifier) override;
+  void RemoveSuggestion(const base::string16& value, int identifier) override;
+  void ClearPreviewedForm() override;
 
   // Records and associates a query_id with web form data.  Called
   // when the renderer posts an Autofill query to the browser. |bounds|
diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index 22b3983..cdbb625 100644
--- a/components/autofill/core/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -73,7 +73,7 @@ class AutofillManager : public AutofillDownloadManager::Observer {
                   AutofillClient* client,
                   const std::string& app_locale,
                   AutofillDownloadManagerState enable_download_manager);
-  virtual ~AutofillManager();
+  ~AutofillManager() override;
 
   // Sets an external delegate.
   void SetExternalDelegate(AutofillExternalDelegate* delegate);
@@ -214,8 +214,7 @@ class AutofillManager : public AutofillDownloadManager::Observer {
 
  private:
   // AutofillDownloadManager::Observer:
-  virtual void OnLoadedServerPredictions(
-      const std::string& response_xml) override;
+  void OnLoadedServerPredictions(const std::string& response_xml) override;
 
   // Returns false if Autofill is disabled or if no Autofill data is available.
   bool RefreshDataModels() const;
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc
index 06cbd80..b027511 100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -385,9 +385,9 @@ class TestAutofillManager : public AutofillManager {
       : AutofillManager(driver, client, personal_data),
         personal_data_(personal_data),
         autofill_enabled_(true) {}
-  virtual ~TestAutofillManager() {}
+  ~TestAutofillManager() override {}
 
-  virtual bool IsAutofillEnabled() const override { return autofill_enabled_; }
+  bool IsAutofillEnabled() const override { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -398,7 +398,7 @@ class TestAutofillManager : public AutofillManager {
     expected_submitted_field_types_ = expected_types;
   }
 
-  virtual void UploadFormDataAsyncCallback(
+  void UploadFormDataAsyncCallback(
       const FormStructure* submitted_form,
       const base::TimeTicks& load_time,
       const base::TimeTicks& interaction_time,
@@ -440,7 +440,7 @@ class TestAutofillManager : public AutofillManager {
   // Wait for the asynchronous OnFormSubmitted() call to complete.
   void WaitForAsyncFormSubmit() { run_loop_->Run(); }
 
-  virtual void UploadFormData(const FormStructure& submitted_form) override {
+  void UploadFormData(const FormStructure& submitted_form) override {
     submitted_form_signature_ = submitted_form.FormSignature();
   }
 
@@ -500,18 +500,18 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
       : AutofillExternalDelegate(autofill_manager, autofill_driver),
         on_query_seen_(false),
         on_suggestions_returned_seen_(false) {}
-  virtual ~TestAutofillExternalDelegate() {}
+  ~TestAutofillExternalDelegate() override {}
 
-  virtual void OnQuery(int query_id,
-                       const FormData& form,
-                       const FormFieldData& field,
-                       const gfx::RectF& bounds,
-                       bool display_warning) override {
+  void OnQuery(int query_id,
+               const FormData& form,
+               const FormFieldData& field,
+               const gfx::RectF& bounds,
+               bool display_warning) override {
     on_query_seen_ = true;
     on_suggestions_returned_seen_ = false;
   }
 
-  virtual void OnSuggestionsReturned(
+  void OnSuggestionsReturned(
       int query_id,
       const std::vector<base::string16>& autofill_values,
       const std::vector<base::string16>& autofill_labels,
@@ -680,7 +680,7 @@ class TestFormStructure : public FormStructure {
  public:
   explicit TestFormStructure(const FormData& form)
       : FormStructure(form) {}
-  virtual ~TestFormStructure() {}
+  ~TestFormStructure() override {}
 
   void SetFieldTypes(const std::vector<ServerFieldType>& heuristic_types,
                      const std::vector<ServerFieldType>& server_types) {
@@ -2883,12 +2883,11 @@ class MockAutofillClient : public TestAutofillClient {
  public:
   MockAutofillClient() {}
 
-  virtual ~MockAutofillClient() {}
+  ~MockAutofillClient() override {}
 
-  virtual void ShowRequestAutocompleteDialog(
-      const FormData& form,
-      const GURL& source_url,
-      const ResultCallback& callback) override {
+  void ShowRequestAutocompleteDialog(const FormData& form,
+                                     const GURL& source_url,
+                                     const ResultCallback& callback) override {
     callback.Run(user_supplied_data_ ? AutocompleteResultSuccess :
                                        AutocompleteResultErrorDisabled,
                  base::string16(),
diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
index 08fbd22..5ab2057 100644
--- a/components/autofill/core/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -81,15 +81,14 @@ std::string SerializeProfiles(const std::vector<AutofillProfile*>& profiles) {
 class PersonalDataManagerMock : public PersonalDataManager {
  public:
   PersonalDataManagerMock();
-  virtual ~PersonalDataManagerMock();
+  ~PersonalDataManagerMock() override;
 
   // Reset the saved profiles.
   void Reset();
 
   // PersonalDataManager:
-  virtual std::string SaveImportedProfile(
-      const AutofillProfile& profile) override;
-  virtual const std::vector<AutofillProfile*>& web_profiles() const override;
+  std::string SaveImportedProfile(const AutofillProfile& profile) override;
+  const std::vector<AutofillProfile*>& web_profiles() const override;
 
  private:
   ScopedVector<AutofillProfile> profiles_;
@@ -140,8 +139,7 @@ class AutofillMergeTest : public testing::Test,
   virtual void SetUp();
 
   // DataDrivenTest:
-  virtual void GenerateResults(const std::string& input,
-                               std::string* output) override;
+  void GenerateResults(const std::string& input, std::string* output) override;
 
   // Deserializes a set of Autofill profiles from |profiles|, imports each
   // sequentially, and fills |merged_profiles| with the serialized result.
diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc
index 3982886..b02a518 100644
--- a/components/autofill/core/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -141,7 +141,7 @@ class TestPersonalDataManager : public PersonalDataManager {
 class TestFormStructure : public FormStructure {
  public:
   explicit TestFormStructure(const FormData& form) : FormStructure(form) {}
-  virtual ~TestFormStructure() {}
+  ~TestFormStructure() override {}
 
   void SetFieldTypes(const std::vector<ServerFieldType>& heuristic_types,
                      const std::vector<ServerFieldType>& server_types) {
@@ -171,9 +171,9 @@ class TestAutofillManager : public AutofillManager {
         autofill_enabled_(true) {
     set_metric_logger(new testing::NiceMock<MockAutofillMetrics>);
   }
-  virtual ~TestAutofillManager() {}
+  ~TestAutofillManager() override {}
 
-  virtual bool IsAutofillEnabled() const override { return autofill_enabled_; }
+  bool IsAutofillEnabled() const override { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -207,7 +207,7 @@ class TestAutofillManager : public AutofillManager {
     run_loop_->Run();
   }
 
-  virtual void UploadFormDataAsyncCallback(
+  void UploadFormDataAsyncCallback(
       const FormStructure* submitted_form,
       const base::TimeTicks& load_time,
       const base::TimeTicks& interaction_time,
diff --git a/components/autofill/core/browser/autofill_profile.h b/components/autofill/core/browser/autofill_profile.h
index d7bd629..f0b8a78 100644
--- a/components/autofill/core/browser/autofill_profile.h
+++ b/components/autofill/core/browser/autofill_profile.h
@@ -33,26 +33,24 @@ class AutofillProfile : public AutofillDataModel {
   // For use in STL containers.
   AutofillProfile();
   AutofillProfile(const AutofillProfile& profile);
-  virtual ~AutofillProfile();
+  ~AutofillProfile() override;
 
   AutofillProfile& operator=(const AutofillProfile& profile);
 
   // FormGroup:
-  virtual void GetMatchingTypes(
-      const base::string16& text,
-      const std::string& app_locale,
-      ServerFieldTypeSet* matching_types) const override;
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override;
-  virtual base::string16 GetInfo(const AutofillType& type,
-                                 const std::string& app_locale) const override;
-  virtual bool SetInfo(const AutofillType& type,
-                       const base::string16& value,
-                       const std::string& app_locale) override;
+  void GetMatchingTypes(const base::string16& text,
+                        const std::string& app_locale,
+                        ServerFieldTypeSet* matching_types) const override;
+  base::string16 GetRawInfo(ServerFieldType type) const override;
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override;
+  base::string16 GetInfo(const AutofillType& type,
+                         const std::string& app_locale) const override;
+  bool SetInfo(const AutofillType& type,
+               const base::string16& value,
+               const std::string& app_locale) override;
 
   // AutofillDataModel:
-  virtual base::string16 GetInfoForVariant(
+  base::string16 GetInfoForVariant(
       const AutofillType& type,
       size_t variant,
       const std::string& app_locale) const override;
@@ -151,8 +149,7 @@ class AutofillProfile : public AutofillDataModel {
   typedef std::vector<const FormGroup*> FormGroupList;
 
   // FormGroup:
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override;
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   // Shared implementation for GetRawMultiInfo() and GetMultiInfo().  Pass an
   // empty |app_locale| to get the raw info; otherwise, the returned info is
diff --git a/components/autofill/core/browser/autofill_xml_parser.h b/components/autofill/core/browser/autofill_xml_parser.h
index 45722a8..d071a5c 100644
--- a/components/autofill/core/browser/autofill_xml_parser.h
+++ b/components/autofill/core/browser/autofill_xml_parser.h
@@ -23,7 +23,7 @@ namespace autofill {
 class AutofillXmlParser : public buzz::XmlParseHandler {
  public:
   AutofillXmlParser();
-  virtual ~AutofillXmlParser();
+  ~AutofillXmlParser() override;
 
   // Returns true if no parsing errors were encountered.
   bool succeeded() const { return succeeded_; }
@@ -32,23 +32,21 @@ class AutofillXmlParser : public buzz::XmlParseHandler {
   // A callback for the end of an </element>, called by Expat.
   // |context| is a parsing context used to resolve element/attribute names.
   // |name| is the name of the element.
-  virtual void EndElement(buzz::XmlParseContext* context,
-                          const char* name) override;
+  void EndElement(buzz::XmlParseContext* context, const char* name) override;
 
   // The callback for character data between tags (<element>text...</element>).
   // |context| is a parsing context used to resolve element/attribute names.
   // |text| is a pointer to the beginning of character data (not null
   // terminated).
   // |len| is the length of the string pointed to by text.
-  virtual void CharacterData(buzz::XmlParseContext* context,
-                             const char* text,
-                             int len) override;
+  void CharacterData(buzz::XmlParseContext* context,
+                     const char* text,
+                     int len) override;
 
   // The callback for parsing errors.
   // |context| is a parsing context used to resolve names.
   // |error_code| is a code representing the parsing error.
-  virtual void Error(buzz::XmlParseContext* context,
-                     XML_Error error_code) override;
+  void Error(buzz::XmlParseContext* context, XML_Error error_code) override;
 
   // True if parsing succeeded.
   bool succeeded_;
@@ -75,16 +73,16 @@ class AutofillQueryXmlParser : public AutofillXmlParser {
  public:
   AutofillQueryXmlParser(std::vector<AutofillServerFieldInfo>* field_infos,
                          UploadRequired* upload_required);
-  virtual ~AutofillQueryXmlParser();
+  ~AutofillQueryXmlParser() override;
 
  private:
   // A callback for the beginning of a new <element>, called by Expat.
   // |context| is a parsing context used to resolve element/attribute names.
   // |name| is the name of the element.
   // |attrs| is the list of attributes (names and values) for the element.
-  virtual void StartElement(buzz::XmlParseContext* context,
-                            const char* name,
-                            const char** attrs) override;
+  void StartElement(buzz::XmlParseContext* context,
+                    const char* name,
+                    const char** attrs) override;
 
   // A helper function to parse a |WebElementDescriptor|.
   // |context| is the current parsing context.
@@ -131,9 +129,9 @@ class AutofillUploadXmlParser : public AutofillXmlParser {
   // |context| is a parsing context used to resolve element/attribute names.
   // |name| is the name of the element.
   // |attrs| is the list of attributes (names and values) for the element.
-  virtual void StartElement(buzz::XmlParseContext* context,
-                            const char* name,
-                            const char** attrs) override;
+  void StartElement(buzz::XmlParseContext* context,
+                    const char* name,
+                    const char** attrs) override;
 
   // A helper function to retrieve double values from strings.  Raises an XML
   // parse error if it fails.
diff --git a/components/autofill/core/browser/contact_info.h b/components/autofill/core/browser/contact_info.h
index cfb56ec..1e3adc3 100644
--- a/components/autofill/core/browser/contact_info.h
+++ b/components/autofill/core/browser/contact_info.h
@@ -19,7 +19,7 @@ class NameInfo : public FormGroup {
  public:
   NameInfo();
   NameInfo(const NameInfo& info);
-  virtual ~NameInfo();
+  ~NameInfo() override;
 
   NameInfo& operator=(const NameInfo& info);
 
@@ -28,19 +28,17 @@ class NameInfo : public FormGroup {
   bool ParsedNamesAreEqual(const NameInfo& info);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override;
-  virtual base::string16 GetInfo(const AutofillType& type,
-                                 const std::string& app_locale) const override;
-  virtual bool SetInfo(const AutofillType& type,
-                       const base::string16& value,
-                       const std::string& app_locale) override;
+  base::string16 GetRawInfo(ServerFieldType type) const override;
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override;
+  base::string16 GetInfo(const AutofillType& type,
+                         const std::string& app_locale) const override;
+  bool SetInfo(const AutofillType& type,
+               const base::string16& value,
+               const std::string& app_locale) override;
 
  private:
   // FormGroup:
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override;
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   // Returns the full name, which is either |full_|, or if |full_| is empty,
   // is composed of given, middle and family.
@@ -63,19 +61,17 @@ class EmailInfo : public FormGroup {
  public:
   EmailInfo();
   EmailInfo(const EmailInfo& info);
-  virtual ~EmailInfo();
+  ~EmailInfo() override;
 
   EmailInfo& operator=(const EmailInfo& info);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override;
+  base::string16 GetRawInfo(ServerFieldType type) const override;
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override;
 
  private:
   // FormGroup:
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override;
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   base::string16 email_;
 };
@@ -84,19 +80,17 @@ class CompanyInfo : public FormGroup {
  public:
   CompanyInfo();
   CompanyInfo(const CompanyInfo& info);
-  virtual ~CompanyInfo();
+  ~CompanyInfo() override;
 
   CompanyInfo& operator=(const CompanyInfo& info);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override;
+  base::string16 GetRawInfo(ServerFieldType type) const override;
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override;
 
  private:
   // FormGroup:
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override;
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   base::string16 company_name_;
 };
diff --git a/components/autofill/core/browser/credit_card.h b/components/autofill/core/browser/credit_card.h
index 5e59aad..1651d3e 100644
--- a/components/autofill/core/browser/credit_card.h
+++ b/components/autofill/core/browser/credit_card.h
@@ -23,7 +23,7 @@ class CreditCard : public AutofillDataModel {
   // For use in STL containers.
   CreditCard();
   CreditCard(const CreditCard& credit_card);
-  virtual ~CreditCard();
+  ~CreditCard() override;
 
   // Returns a version of |number| that has any separator characters removed.
   static const base::string16 StripSeparators(const base::string16& number);
@@ -44,18 +44,16 @@ class CreditCard : public AutofillDataModel {
   static const char* GetCreditCardType(const base::string16& number);
 
   // FormGroup:
-  virtual void GetMatchingTypes(
-      const base::string16& text,
-      const std::string& app_locale,
-      ServerFieldTypeSet* matching_types) const override;
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override;
-  virtual base::string16 GetInfo(const AutofillType& type,
-                                 const std::string& app_locale) const override;
-  virtual bool SetInfo(const AutofillType& type,
-                       const base::string16& value,
-                       const std::string& app_locale) override;
+  void GetMatchingTypes(const base::string16& text,
+                        const std::string& app_locale,
+                        ServerFieldTypeSet* matching_types) const override;
+  base::string16 GetRawInfo(ServerFieldType type) const override;
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override;
+  base::string16 GetInfo(const AutofillType& type,
+                         const std::string& app_locale) const override;
+  bool SetInfo(const AutofillType& type,
+               const base::string16& value,
+               const std::string& app_locale) override;
 
   // Credit card preview summary, for example: ******1234, Exp: 01/2020
   const base::string16 Label() const;
@@ -114,8 +112,7 @@ class CreditCard : public AutofillDataModel {
 
  private:
   // FormGroup:
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override;
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   // The month and year are zero if not present.
   int Expiration4DigitYear() const { return expiration_year_; }
diff --git a/components/autofill/core/browser/credit_card_field.h b/components/autofill/core/browser/credit_card_field.h
index ec67b52..2b4dcbf 100644
--- a/components/autofill/core/browser/credit_card_field.h
+++ b/components/autofill/core/browser/credit_card_field.h
@@ -20,12 +20,12 @@ class AutofillScanner;
 
 class CreditCardField : public FormField {
  public:
-  virtual ~CreditCardField();
+  ~CreditCardField() override;
   static FormField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
+  bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   friend class CreditCardFieldTest;
diff --git a/components/autofill/core/browser/email_field.h b/components/autofill/core/browser/email_field.h
index fcfdf63..6a1d8f7 100644
--- a/components/autofill/core/browser/email_field.h
+++ b/components/autofill/core/browser/email_field.h
@@ -17,7 +17,7 @@ class EmailField : public FormField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
+  bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   explicit EmailField(const AutofillField* field);
diff --git a/components/autofill/core/browser/form_structure_unittest.cc b/components/autofill/core/browser/form_structure_unittest.cc
index 6a872f1..9d2ccc4 100644
--- a/components/autofill/core/browser/form_structure_unittest.cc
+++ b/components/autofill/core/browser/form_structure_unittest.cc
@@ -24,7 +24,7 @@ namespace {
 class TestAutofillMetrics : public AutofillMetrics {
  public:
   TestAutofillMetrics() {}
-  virtual ~TestAutofillMetrics() {}
+  ~TestAutofillMetrics() override {}
 };
 
 }  // anonymous namespace
diff --git a/components/autofill/core/browser/name_field.cc b/components/autofill/core/browser/name_field.cc
index 480b1b6..acada73 100644
--- a/components/autofill/core/browser/name_field.cc
+++ b/components/autofill/core/browser/name_field.cc
@@ -24,7 +24,7 @@ class FullNameField : public NameField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
+  bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   explicit FullNameField(AutofillField* field);
@@ -43,7 +43,7 @@ class FirstLastNameField : public NameField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
+  bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   FirstLastNameField();
diff --git a/components/autofill/core/browser/name_field.h b/components/autofill/core/browser/name_field.h
index ecc89e5..2f26e34 100644
--- a/components/autofill/core/browser/name_field.h
+++ b/components/autofill/core/browser/name_field.h
@@ -25,7 +25,7 @@ class NameField : public FormField {
   NameField() {}
 
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
+  bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(NameFieldTest, FirstMiddleLast);
diff --git a/components/autofill/core/browser/personal_data_manager.h b/components/autofill/core/browser/personal_data_manager.h
index 9794e8e..49ef30a 100644
--- a/components/autofill/core/browser/personal_data_manager.h
+++ b/components/autofill/core/browser/personal_data_manager.h
@@ -53,7 +53,7 @@ class PersonalDataManager : public KeyedService,
   typedef std::pair<std::string, size_t> GUIDPair;
 
   explicit PersonalDataManager(const std::string& app_locale);
-  virtual ~PersonalDataManager();
+  ~PersonalDataManager() override;
 
   // Kicks off asynchronous loading of profiles and credit cards.
   // |pref_service| must outlive this instance.  |is_off_the_record| informs
@@ -64,12 +64,11 @@ class PersonalDataManager : public KeyedService,
             bool is_off_the_record);
 
   // WebDataServiceConsumer:
-  virtual void OnWebDataServiceRequestDone(
-      WebDataServiceBase::Handle h,
-      const WDTypedResult* result) override;
+  void OnWebDataServiceRequestDone(WebDataServiceBase::Handle h,
+                                   const WDTypedResult* result) override;
 
   // AutofillWebDataServiceObserverOnUIThread:
-  virtual void AutofillMultipleChanged() override;
+  void AutofillMultipleChanged() override;
 
   // Adds a listener to be notified of PersonalDataManager events.
   virtual void AddObserver(PersonalDataManagerObserver* observer);
diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc
index 9670c6c..1c425c1 100644
--- a/components/autofill/core/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -54,7 +54,7 @@ class PersonalDataLoadedObserverMock : public PersonalDataManagerObserver {
 class TestAutofillMetrics : public AutofillMetrics {
  public:
   TestAutofillMetrics() {}
-  virtual ~TestAutofillMetrics() {}
+  ~TestAutofillMetrics() override {}
 };
 
 template <typename T>
diff --git a/components/autofill/core/browser/phone_field.h b/components/autofill/core/browser/phone_field.h
index 2672650..6091113 100644
--- a/components/autofill/core/browser/phone_field.h
+++ b/components/autofill/core/browser/phone_field.h
@@ -23,13 +23,13 @@ class AutofillScanner;
 // - number
 class PhoneField : public FormField {
  public:
-  virtual ~PhoneField();
+  ~PhoneField() override;
 
   static FormField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
+  bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(PhoneFieldTest, ParseOneLinePhone);
diff --git a/components/autofill/core/browser/phone_number.h b/components/autofill/core/browser/phone_number.h
index 17a0a24..0b69b19 100644
--- a/components/autofill/core/browser/phone_number.h
+++ b/components/autofill/core/browser/phone_number.h
@@ -22,25 +22,23 @@ class PhoneNumber : public FormGroup {
  public:
   explicit PhoneNumber(AutofillProfile* profile);
   PhoneNumber(const PhoneNumber& number);
-  virtual ~PhoneNumber();
+  ~PhoneNumber() override;
 
   PhoneNumber& operator=(const PhoneNumber& number);
 
   void set_profile(AutofillProfile* profile) { profile_ = profile; }
 
   // FormGroup implementation:
-  virtual void GetMatchingTypes(
-      const base::string16& text,
-      const std::string& app_locale,
-      ServerFieldTypeSet* matching_types) const override;
-  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
-  virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) override;
-  virtual base::string16 GetInfo(const AutofillType& type,
-                           const std::string& app_locale) const override;
-  virtual bool SetInfo(const AutofillType& type,
-                       const base::string16& value,
-                       const std::string& app_locale) override;
+  void GetMatchingTypes(const base::string16& text,
+                        const std::string& app_locale,
+                        ServerFieldTypeSet* matching_types) const override;
+  base::string16 GetRawInfo(ServerFieldType type) const override;
+  void SetRawInfo(ServerFieldType type, const base::string16& value) override;
+  base::string16 GetInfo(const AutofillType& type,
+                         const std::string& app_locale) const override;
+  bool SetInfo(const AutofillType& type,
+               const base::string16& value,
+               const std::string& app_locale) override;
 
   // Size and offset of the prefix and suffix portions of phone numbers.
   static const size_t kPrefixOffset = 0;
@@ -78,8 +76,7 @@ class PhoneNumber : public FormGroup {
 
  private:
   // FormGroup:
-  virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const override;
+  void GetSupportedTypes(ServerFieldTypeSet* supported_types) const override;
 
   // Updates the cached parsed number if the profile's region has changed
   // since the last time the cache was updated.
diff --git a/components/autofill/core/browser/test_autofill_client.h b/components/autofill/core/browser/test_autofill_client.h
index 617d706..6fc8153 100644
--- a/components/autofill/core/browser/test_autofill_client.h
+++ b/components/autofill/core/browser/test_autofill_client.h
@@ -17,22 +17,20 @@ namespace autofill {
 class TestAutofillClient : public AutofillClient {
  public:
   TestAutofillClient();
-  virtual ~TestAutofillClient();
+  ~TestAutofillClient() override;
 
   // AutofillClient implementation.
-  virtual PersonalDataManager* GetPersonalDataManager() override;
-  virtual scoped_refptr<AutofillWebDataService> GetDatabase() override;
-  virtual PrefService* GetPrefs() override;
-  virtual void HideRequestAutocompleteDialog() override;
-  virtual void ShowAutofillSettings() override;
-  virtual void ConfirmSaveCreditCard(
-      const AutofillMetrics& metric_logger,
-      const base::Closure& save_card_callback) override;
-  virtual void ShowRequestAutocompleteDialog(
-      const FormData& form,
-      const GURL& source_url,
-      const ResultCallback& callback) override;
-  virtual void ShowAutofillPopup(
+  PersonalDataManager* GetPersonalDataManager() override;
+  scoped_refptr<AutofillWebDataService> GetDatabase() override;
+  PrefService* GetPrefs() override;
+  void HideRequestAutocompleteDialog() override;
+  void ShowAutofillSettings() override;
+  void ConfirmSaveCreditCard(const AutofillMetrics& metric_logger,
+                             const base::Closure& save_card_callback) override;
+  void ShowRequestAutocompleteDialog(const FormData& form,
+                                     const GURL& source_url,
+                                     const ResultCallback& callback) override;
+  void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
       const std::vector<base::string16>& values,
@@ -40,18 +38,17 @@ class TestAutofillClient : public AutofillClient {
       const std::vector<base::string16>& icons,
       const std::vector<int>& identifiers,
       base::WeakPtr<AutofillPopupDelegate> delegate) override;
-  virtual void UpdateAutofillPopupDataListValues(
+  void UpdateAutofillPopupDataListValues(
       const std::vector<base::string16>& values,
       const std::vector<base::string16>& labels) override;
-  virtual void HideAutofillPopup() override;
-  virtual bool IsAutocompleteEnabled() override;
+  void HideAutofillPopup() override;
+  bool IsAutocompleteEnabled() override;
 
-  virtual void DetectAccountCreationForms(
+  void DetectAccountCreationForms(
       const std::vector<autofill::FormStructure*>& forms) override;
 
-  virtual void DidFillOrPreviewField(
-      const base::string16& autofilled_value,
-      const base::string16& profile_full_name) override;
+  void DidFillOrPreviewField(const base::string16& autofilled_value,
+                             const base::string16& profile_full_name) override;
 
   void SetPrefs(scoped_ptr<PrefService> prefs) { prefs_ = prefs.Pass(); }
 
diff --git a/components/autofill/core/browser/test_autofill_driver.h b/components/autofill/core/browser/test_autofill_driver.h
index d226a27..b1d2cca 100644
--- a/components/autofill/core/browser/test_autofill_driver.h
+++ b/components/autofill/core/browser/test_autofill_driver.h
@@ -20,28 +20,27 @@ namespace autofill {
 class TestAutofillDriver : public AutofillDriver {
  public:
   TestAutofillDriver();
-  virtual ~TestAutofillDriver();
+  ~TestAutofillDriver() override;
 
   // AutofillDriver implementation.
-  virtual bool IsOffTheRecord() const override;
+  bool IsOffTheRecord() const override;
   // Returns the value passed in to the last call to |SetURLRequestContext()|
   // or NULL if that method has never been called.
-  virtual net::URLRequestContextGetter* GetURLRequestContext() override;
-  virtual base::SequencedWorkerPool* GetBlockingPool() override;
-  virtual bool RendererIsAvailable() override;
-  virtual void SendFormDataToRenderer(int query_id,
-                                      RendererFormDataAction action,
-                                      const FormData& data) override;
-  virtual void PingRenderer() override;
-  virtual void SendAutofillTypePredictionsToRenderer(
+  net::URLRequestContextGetter* GetURLRequestContext() override;
+  base::SequencedWorkerPool* GetBlockingPool() override;
+  bool RendererIsAvailable() override;
+  void SendFormDataToRenderer(int query_id,
+                              RendererFormDataAction action,
+                              const FormData& data) override;
+  void PingRenderer() override;
+  void SendAutofillTypePredictionsToRenderer(
       const std::vector<FormStructure*>& forms) override;
-  virtual void RendererShouldAcceptDataListSuggestion(
+  void RendererShouldAcceptDataListSuggestion(
       const base::string16& value) override;
-  virtual void RendererShouldClearFilledForm() override;
-  virtual void RendererShouldClearPreviewedForm() override;
-  virtual void RendererShouldFillFieldWithValue(
-      const base::string16& value) override;
-  virtual void RendererShouldPreviewFieldWithValue(
+  void RendererShouldClearFilledForm() override;
+  void RendererShouldClearPreviewedForm() override;
+  void RendererShouldFillFieldWithValue(const base::string16& value) override;
+  void RendererShouldPreviewFieldWithValue(
       const base::string16& value) override;
 
   // Methods that tests can use to specialize functionality.
diff --git a/components/autofill/core/browser/test_personal_data_manager.h b/components/autofill/core/browser/test_personal_data_manager.h
index ede08aa..ac17657 100644
--- a/components/autofill/core/browser/test_personal_data_manager.h
+++ b/components/autofill/core/browser/test_personal_data_manager.h
@@ -17,7 +17,7 @@ namespace autofill {
 class TestPersonalDataManager : public PersonalDataManager {
  public:
   TestPersonalDataManager();
-  virtual ~TestPersonalDataManager();
+  ~TestPersonalDataManager() override;
 
   // Adds |profile| to |profiles_|. This does not take ownership of |profile|.
   void AddTestingProfile(AutofillProfile* profile);
@@ -26,18 +26,17 @@ class TestPersonalDataManager : public PersonalDataManager {
   // |credit_card|.
   void AddTestingCreditCard(CreditCard* credit_card);
 
-  virtual const std::vector<AutofillProfile*>& GetProfiles() const override;
-  virtual const std::vector<AutofillProfile*>& web_profiles() const override;
-  virtual const std::vector<CreditCard*>& GetCreditCards() const override;
+  const std::vector<AutofillProfile*>& GetProfiles() const override;
+  const std::vector<AutofillProfile*>& web_profiles() const override;
+  const std::vector<CreditCard*>& GetCreditCards() const override;
 
-  virtual std::string SaveImportedProfile(
+  std::string SaveImportedProfile(
       const AutofillProfile& imported_profile) override;
-  virtual std::string SaveImportedCreditCard(
+  std::string SaveImportedCreditCard(
       const CreditCard& imported_credit_card) override;
 
-  virtual std::string CountryCodeForCurrentTimezone() const override;
-  virtual const std::string& GetDefaultCountryCodeForNewAddress() const
-      override;
+  std::string CountryCodeForCurrentTimezone() const override;
+  const std::string& GetDefaultCountryCodeForNewAddress() const override;
 
   void set_timezone_country_code(const std::string& timezone_country_code) {
     timezone_country_code_ = timezone_country_code;
diff --git a/components/autofill/core/browser/webdata/autofill_change.h b/components/autofill/core/browser/webdata/autofill_change.h
index fe42161..0e85657 100644
--- a/components/autofill/core/browser/webdata/autofill_change.h
+++ b/components/autofill/core/browser/webdata/autofill_change.h
@@ -41,7 +41,7 @@ class GenericAutofillChange {
 class AutofillChange : public GenericAutofillChange<AutofillKey> {
  public:
   AutofillChange(Type type, const AutofillKey& key);
-  virtual ~AutofillChange();
+  ~AutofillChange() override;
   bool operator==(const AutofillChange& change) const {
     return type() == change.type() && key() == change.key();
   }
@@ -60,7 +60,7 @@ class AutofillProfileChange : public GenericAutofillChange<std::string> {
   AutofillProfileChange(Type type,
                         const std::string& key,
                         const AutofillProfile* profile);
-  virtual ~AutofillProfileChange();
+  ~AutofillProfileChange() override;
 
   const AutofillProfile* profile() const { return profile_; }
   bool operator==(const AutofillProfileChange& change) const;
diff --git a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
index 7127a84..6dba5f2 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
+++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
@@ -50,7 +50,7 @@ class AutofillProfileSyncableService
       public AutofillWebDataServiceObserverOnDBThread,
       public base::NonThreadSafe {
  public:
-  virtual ~AutofillProfileSyncableService();
+  ~AutofillProfileSyncableService() override;
 
   // Creates a new AutofillProfileSyncableService and hangs it off of
   // |web_data_service|, which takes ownership. This method should only be
@@ -67,21 +67,19 @@ class AutofillProfileSyncableService
   static syncer::ModelType model_type() { return syncer::AUTOFILL_PROFILE; }
 
   // syncer::SyncableService implementation.
-  virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+  syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override;
-  virtual void StopSyncing(syncer::ModelType type) override;
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const override;
-  virtual syncer::SyncError ProcessSyncChanges(
+  void StopSyncing(syncer::ModelType type) override;
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
 
   // AutofillWebDataServiceObserverOnDBThread implementation.
-  virtual void AutofillProfileChanged(
-      const AutofillProfileChange& change) override;
+  void AutofillProfileChanged(const AutofillProfileChange& change) override;
 
   // Provides a StartSyncFlare to the SyncableService. See
   // sync_start_util for more.
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 690d9de..be8bb73 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
@@ -107,17 +107,16 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor {
 class TestSyncChangeProcessor : public syncer::SyncChangeProcessor {
  public:
   TestSyncChangeProcessor() {}
-  virtual ~TestSyncChangeProcessor() {}
+  ~TestSyncChangeProcessor() override {}
 
-  virtual syncer::SyncError ProcessSyncChanges(
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& location,
       const syncer::SyncChangeList& changes) override {
     changes_ = changes;
     return syncer::SyncError();
   }
 
-  virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
-      override {
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override {
     return syncer::SyncDataList();
   }
 
diff --git a/components/autofill/core/browser/webdata/autofill_table.h b/components/autofill/core/browser/webdata/autofill_table.h
index abc6400..7caa4ee 100644
--- a/components/autofill/core/browser/webdata/autofill_table.h
+++ b/components/autofill/core/browser/webdata/autofill_table.h
@@ -128,16 +128,15 @@ struct FormFieldData;
 class AutofillTable : public WebDatabaseTable {
  public:
   explicit AutofillTable(const std::string& app_locale);
-  virtual ~AutofillTable();
+  ~AutofillTable() override;
 
   // Retrieves the AutofillTable* owned by |database|.
   static AutofillTable* FromWebDatabase(WebDatabase* db);
 
-  virtual WebDatabaseTable::TypeKey GetTypeKey() const override;
-  virtual bool CreateTablesIfNecessary() override;
-  virtual bool IsSyncable() override;
-  virtual bool MigrateToVersion(int version,
-                                bool* update_compatible_version) override;
+  WebDatabaseTable::TypeKey GetTypeKey() const override;
+  bool CreateTablesIfNecessary() override;
+  bool IsSyncable() override;
+  bool MigrateToVersion(int version, bool* update_compatible_version) override;
 
   // Records the form elements in |elements| in the database in the
   // autofill table.  A list of all added and updated autofill entries
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
index a12a35f..a097e31 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
@@ -53,13 +53,12 @@ class AutofillWebDataBackendImpl
       const base::Closure& on_changed_callback);
 
   // AutofillWebDataBackend implementation.
-  virtual void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer)
-      override;
-  virtual void RemoveObserver(
+  void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer) override;
+  void RemoveObserver(
       AutofillWebDataServiceObserverOnDBThread* observer) override;
-  virtual WebDatabase* GetDatabase() override;
-  virtual void RemoveExpiredFormElements() override;
-  virtual void NotifyOfMultipleAutofillChanges() override;
+  WebDatabase* GetDatabase() override;
+  void RemoveExpiredFormElements() override;
+  void NotifyOfMultipleAutofillChanges() override;
 
   // Returns a SupportsUserData objects that may be used to store data
   // owned by the DB thread on this object. Should be called only from
@@ -146,7 +145,7 @@ class AutofillWebDataBackendImpl
       WebDatabase* db);
 
  protected:
-  virtual ~AutofillWebDataBackendImpl();
+  ~AutofillWebDataBackendImpl() override;
 
  private:
   friend class base::RefCountedDeleteOnMessageLoop<AutofillWebDataBackendImpl>;
@@ -159,7 +158,8 @@ class AutofillWebDataBackendImpl
   class SupportsUserDataAggregatable : public base::SupportsUserData {
    public:
     SupportsUserDataAggregatable() {}
-    virtual ~SupportsUserDataAggregatable() {}
+    ~SupportsUserDataAggregatable() override {}
+
    private:
     DISALLOW_COPY_AND_ASSIGN(SupportsUserDataAggregatable);
   };
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_service.h b/components/autofill/core/browser/webdata/autofill_webdata_service.h
index 0c39173..7efe920 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_service.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_service.h
@@ -47,40 +47,38 @@ class AutofillWebDataService : public AutofillWebData,
                          const ProfileErrorCallback& callback);
 
   // WebDataServiceBase implementation.
-  virtual void ShutdownOnUIThread() override;
+  void ShutdownOnUIThread() override;
 
   // AutofillWebData implementation.
-  virtual void AddFormFields(
-      const std::vector<FormFieldData>& fields) override;
-  virtual WebDataServiceBase::Handle GetFormValuesForElementName(
+  void AddFormFields(const std::vector<FormFieldData>& fields) override;
+  WebDataServiceBase::Handle GetFormValuesForElementName(
       const base::string16& name,
       const base::string16& prefix,
       int limit,
       WebDataServiceConsumer* consumer) override;
 
-  virtual WebDataServiceBase::Handle HasFormElements(
+  WebDataServiceBase::Handle HasFormElements(
       WebDataServiceConsumer* consumer) override;
-  virtual void RemoveFormElementsAddedBetween(
-      const base::Time& delete_begin, const base::Time& delete_end) override;
-  virtual void RemoveFormValueForElementName(
-      const base::string16& name,
-      const base::string16& value) override;
-  virtual void AddAutofillProfile(const AutofillProfile& profile) override;
-  virtual void UpdateAutofillProfile(const AutofillProfile& profile) override;
-  virtual void RemoveAutofillProfile(const std::string& guid) override;
-  virtual WebDataServiceBase::Handle GetAutofillProfiles(
+  void RemoveFormElementsAddedBetween(const base::Time& delete_begin,
+                                      const base::Time& delete_end) override;
+  void RemoveFormValueForElementName(const base::string16& name,
+                                     const base::string16& value) override;
+  void AddAutofillProfile(const AutofillProfile& profile) override;
+  void UpdateAutofillProfile(const AutofillProfile& profile) override;
+  void RemoveAutofillProfile(const std::string& guid) override;
+  WebDataServiceBase::Handle GetAutofillProfiles(
       WebDataServiceConsumer* consumer) override;
-  virtual void UpdateAutofillEntries(
+  void UpdateAutofillEntries(
       const std::vector<AutofillEntry>& autofill_entries) override;
-  virtual void AddCreditCard(const CreditCard& credit_card) override;
-  virtual void UpdateCreditCard(const CreditCard& credit_card) override;
-  virtual void RemoveCreditCard(const std::string& guid) override;
-  virtual WebDataServiceBase::Handle GetCreditCards(
+  void AddCreditCard(const CreditCard& credit_card) override;
+  void UpdateCreditCard(const CreditCard& credit_card) override;
+  void RemoveCreditCard(const std::string& guid) override;
+  WebDataServiceBase::Handle GetCreditCards(
       WebDataServiceConsumer* consumer) override;
-  virtual void RemoveAutofillDataModifiedBetween(
-      const base::Time& delete_begin, const base::Time& delete_end) override;
-  virtual void RemoveOriginURLsModifiedBetween(
-      const base::Time& delete_begin, const base::Time& delete_end) override;
+  void RemoveAutofillDataModifiedBetween(const base::Time& delete_begin,
+                                         const base::Time& delete_end) override;
+  void RemoveOriginURLsModifiedBetween(const base::Time& delete_begin,
+                                       const base::Time& delete_end) override;
 
   void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer);
   void RemoveObserver(AutofillWebDataServiceObserverOnDBThread* observer);
@@ -101,7 +99,7 @@ class AutofillWebDataService : public AutofillWebData,
       const base::Callback<void(AutofillWebDataBackend*)>& callback);
 
  protected:
-  virtual ~AutofillWebDataService();
+  ~AutofillWebDataService() override;
 
   virtual void NotifyAutofillMultipleChangedOnUIThread();
 
diff --git a/components/autofill/core/common/save_password_progress_logger_unittest.cc b/components/autofill/core/common/save_password_progress_logger_unittest.cc
index 55da159..782ea92 100644
--- a/components/autofill/core/common/save_password_progress_logger_unittest.cc
+++ b/components/autofill/core/common/save_password_progress_logger_unittest.cc
@@ -32,7 +32,7 @@ class TestLogger : public SavePasswordProgressLogger {
   std::string accumulated_log() { return accumulated_log_; }
 
  private:
-  virtual void SendLog(const std::string& log) override {
+  void SendLog(const std::string& log) override {
     accumulated_log_.append(log);
   }
 
diff --git a/components/bookmarks/browser/base_bookmark_model_observer.h b/components/bookmarks/browser/base_bookmark_model_observer.h
index 5f29509..ae1c6b9 100644
--- a/components/bookmarks/browser/base_bookmark_model_observer.h
+++ b/components/bookmarks/browser/base_bookmark_model_observer.h
@@ -18,34 +18,32 @@ class BaseBookmarkModelObserver : public BookmarkModelObserver {
   virtual void BookmarkModelChanged() = 0;
 
   // BookmarkModelObserver:
-  virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) override;
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) 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,
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
+  void BookmarkModelBeingDeleted(BookmarkModel* model) 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 BookmarkAllUserNodesRemoved(
-      BookmarkModel* model,
-      const std::set<GURL>& removed_urls) override;
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) override;
-  virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) override;
-  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) override;
+  void BookmarkNodeChanged(BookmarkModel* model,
+                           const BookmarkNode* node) override;
+  void BookmarkNodeFaviconChanged(BookmarkModel* model,
+                                  const BookmarkNode* node) override;
+  void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                     const BookmarkNode* node) override;
 
  protected:
-  virtual ~BaseBookmarkModelObserver() {}
+  ~BaseBookmarkModelObserver() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BaseBookmarkModelObserver);
diff --git a/components/bookmarks/browser/bookmark_client.h b/components/bookmarks/browser/bookmark_client.h
index d4142b1..b620b7b 100644
--- a/components/bookmarks/browser/bookmark_client.h
+++ b/components/bookmarks/browser/bookmark_client.h
@@ -88,7 +88,7 @@ class BookmarkClient : public KeyedService {
   virtual bool CanBeEditedByUser(const BookmarkNode* node) = 0;
 
  protected:
-  virtual ~BookmarkClient() {}
+  ~BookmarkClient() override {}
 };
 
 }  // namespace bookmarks
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.h b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
index 581330d..c960b23 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.h
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
@@ -24,7 +24,7 @@ class BookmarkExpandedStateTracker : public BaseBookmarkModelObserver {
 
   BookmarkExpandedStateTracker(BookmarkModel* bookmark_model,
                                PrefService* pref_service);
-  virtual ~BookmarkExpandedStateTracker();
+  ~BookmarkExpandedStateTracker() override;
 
   // The set of expanded nodes.
   void SetExpandedNodes(const Nodes& nodes);
@@ -32,18 +32,16 @@ class BookmarkExpandedStateTracker : public BaseBookmarkModelObserver {
 
  private:
   // BaseBookmarkModelObserver:
-  virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) override;
-  virtual void BookmarkModelChanged() override;
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
-  virtual void BookmarkNodeRemoved(BookmarkModel* model,
-                                   const BookmarkNode* parent,
-                                   int old_index,
-                                   const BookmarkNode* node,
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
+  void BookmarkModelChanged() override;
+  void BookmarkModelBeingDeleted(BookmarkModel* model) 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 BookmarkAllUserNodesRemoved(
-      BookmarkModel* model,
-      const std::set<GURL>& removed_urls) override;
 
   // Updates the value for |prefs::kBookmarkEditorExpandedNodes| from
   // GetExpandedNodes().
diff --git a/components/bookmarks/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc
index fa7e46a..90168ff 100644
--- a/components/bookmarks/browser/bookmark_index_unittest.cc
+++ b/components/bookmarks/browser/bookmark_index_unittest.cc
@@ -31,9 +31,9 @@ class BookmarkClientMock : public TestBookmarkClient {
   BookmarkClientMock(const std::map<GURL, int>& typed_count_map)
       : typed_count_map_(typed_count_map) {}
 
-  virtual bool SupportsTypedCountForNodes() override { return true; }
+  bool SupportsTypedCountForNodes() override { return true; }
 
-  virtual void GetTypedCountForNodes(
+  void GetTypedCountForNodes(
       const NodeSet& nodes,
       NodeTypedCountPairs* node_typed_count_pairs) override {
     for (NodeSet::const_iterator it = nodes.begin(); it != nodes.end(); ++it) {
diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
index 05d21e9..bf0ded9 100644
--- a/components/bookmarks/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
@@ -64,10 +64,10 @@ class BookmarkModel : public KeyedService {
   };
 
   explicit BookmarkModel(bookmarks::BookmarkClient* client);
-  virtual ~BookmarkModel();
+  ~BookmarkModel() override;
 
   // KeyedService:
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Loads the bookmarks. This is called upon creation of the
   // BookmarkModel. You need not invoke this directly.
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc
index d9c55c9..6e1c79f 100644
--- a/components/bookmarks/browser/bookmark_model_unittest.cc
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -144,89 +144,85 @@ class BookmarkModelTest : public testing::Test,
     ClearCounts();
   }
 
-  virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) override {
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override {
     // We never load from the db, so that this should never get invoked.
     NOTREACHED();
   }
 
-  virtual void BookmarkNodeMoved(BookmarkModel* model,
-                                 const BookmarkNode* old_parent,
-                                 int old_index,
-                                 const BookmarkNode* new_parent,
-                                 int new_index) override {
+  void BookmarkNodeMoved(BookmarkModel* model,
+                         const BookmarkNode* old_parent,
+                         int old_index,
+                         const BookmarkNode* new_parent,
+                         int new_index) override {
     ++moved_count_;
     observer_details_.Set(old_parent, new_parent, old_index, new_index);
   }
 
-  virtual void BookmarkNodeAdded(BookmarkModel* model,
-                                 const BookmarkNode* parent,
-                                 int index) override {
+  void BookmarkNodeAdded(BookmarkModel* model,
+                         const BookmarkNode* parent,
+                         int index) override {
     ++added_count_;
     observer_details_.Set(parent, NULL, index, -1);
   }
 
-  virtual void OnWillRemoveBookmarks(BookmarkModel* model,
-                                     const BookmarkNode* parent,
-                                     int old_index,
-                                     const BookmarkNode* node) override {
+  void OnWillRemoveBookmarks(BookmarkModel* model,
+                             const BookmarkNode* parent,
+                             int old_index,
+                             const BookmarkNode* node) override {
     ++before_remove_count_;
   }
 
-  virtual void BookmarkNodeRemoved(
-      BookmarkModel* model,
-      const BookmarkNode* parent,
-      int old_index,
-      const BookmarkNode* node,
-      const std::set<GURL>& removed_urls) override {
+  void BookmarkNodeRemoved(BookmarkModel* model,
+                           const BookmarkNode* parent,
+                           int old_index,
+                           const BookmarkNode* node,
+                           const std::set<GURL>& removed_urls) override {
     ++removed_count_;
     observer_details_.Set(parent, NULL, old_index, -1);
   }
 
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) override {
+  void BookmarkNodeChanged(BookmarkModel* model,
+                           const BookmarkNode* node) override {
     ++changed_count_;
     observer_details_.Set(node, NULL, -1, -1);
   }
 
-  virtual void OnWillChangeBookmarkNode(BookmarkModel* model,
-                                        const BookmarkNode* node) override {
+  void OnWillChangeBookmarkNode(BookmarkModel* model,
+                                const BookmarkNode* node) override {
     ++before_change_count_;
   }
 
-  virtual void BookmarkNodeChildrenReordered(
-      BookmarkModel* model,
-      const BookmarkNode* node) override {
+  void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                     const BookmarkNode* node) override {
     ++reordered_count_;
   }
 
-  virtual void OnWillReorderBookmarkNode(BookmarkModel* model,
-                                         const BookmarkNode* node) override {
+  void OnWillReorderBookmarkNode(BookmarkModel* model,
+                                 const BookmarkNode* node) override {
     ++before_reorder_count_;
   }
 
-  virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) override {
+  void BookmarkNodeFaviconChanged(BookmarkModel* model,
+                                  const BookmarkNode* node) override {
     // We never attempt to load favicons, so that this method never
     // gets invoked.
   }
 
-  virtual void ExtensiveBookmarkChangesBeginning(
-      BookmarkModel* model) override {
+  void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override {
     ++extensive_changes_beginning_count_;
   }
 
-  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {
+  void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {
     ++extensive_changes_ended_count_;
   }
 
-  virtual void BookmarkAllUserNodesRemoved(
+  void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
       const std::set<GURL>& removed_urls) override {
     ++all_bookmarks_removed_;
   }
 
-  virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) override {
+  void OnWillRemoveAllUserBookmarks(BookmarkModel* model) override {
     ++before_remove_all_count_;
   }
 
diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks/browser/bookmark_node.h
index a51c8ef..ef59ae6 100644
--- a/components/bookmarks/browser/bookmark_node.h
+++ b/components/bookmarks/browser/bookmark_node.h
@@ -44,12 +44,12 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {
   // Creates a new node with |id| and |url|.
   BookmarkNode(int64 id, const GURL& url);
 
-  virtual ~BookmarkNode();
+  ~BookmarkNode() override;
 
   // Set the node's internal title. Note that this neither invokes observers
   // nor updates any bookmark model this node may be in. For that functionality,
   // BookmarkModel::SetTitle(..) should be used instead.
-  virtual void SetTitle(const base::string16& title) override;
+  void SetTitle(const base::string16& title) override;
 
   // Returns an unique id for this node.
   // For bookmark nodes that are managed by the bookmark model, the IDs are
@@ -195,13 +195,13 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {
 class BookmarkPermanentNode : public BookmarkNode {
  public:
   explicit BookmarkPermanentNode(int64 id);
-  virtual ~BookmarkPermanentNode();
+  ~BookmarkPermanentNode() override;
 
   // WARNING: this code is used for other projects. Contact noyau@ for details.
   void set_visible(bool value) { visible_ = value; }
 
   // BookmarkNode overrides:
-  virtual bool IsVisible() const override;
+  bool IsVisible() const override;
 
  private:
   bool visible_;
diff --git a/components/bookmarks/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h
index 262c6ab..9fa8646 100644
--- a/components/bookmarks/browser/bookmark_storage.h
+++ b/components/bookmarks/browser/bookmark_storage.h
@@ -142,7 +142,7 @@ class BookmarkStorage : public base::ImportantFileWriter::DataSerializer {
   BookmarkStorage(BookmarkModel* model,
                   const base::FilePath& profile_path,
                   base::SequencedTaskRunner* sequenced_task_runner);
-  virtual ~BookmarkStorage();
+  ~BookmarkStorage() override;
 
   // Loads the bookmarks into the model, notifying the model when done. This
   // takes ownership of |details| and send the |OnLoadFinished| callback from
@@ -162,7 +162,7 @@ class BookmarkStorage : public base::ImportantFileWriter::DataSerializer {
   void OnLoadFinished(scoped_ptr<BookmarkLoadDetails> details);
 
   // ImportantFileWriter::DataSerializer implementation.
-  virtual bool SerializeData(std::string* output) override;
+  bool SerializeData(std::string* output) override;
 
  private:
   // Serializes the data and schedules save using ImportantFileWriter.
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index cc8c9f9..8c194bf 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -54,13 +54,13 @@ class BookmarkUtilsTest : public testing::Test,
 
  private:
   // BaseBookmarkModelObserver:
-  virtual void BookmarkModelChanged() override {}
+  void BookmarkModelChanged() override {}
 
-  virtual void GroupedBookmarkChangesBeginning(BookmarkModel* model) override {
+  void GroupedBookmarkChangesBeginning(BookmarkModel* model) override {
     ++grouped_changes_beginning_count_;
   }
 
-  virtual void GroupedBookmarkChangesEnded(BookmarkModel* model) override {
+  void GroupedBookmarkChangesEnded(BookmarkModel* model) override {
     ++grouped_changes_ended_count_;
   }
 
diff --git a/components/bookmarks/test/bookmark_test_helpers.cc b/components/bookmarks/test/bookmark_test_helpers.cc
index c4f29b9..de4a899 100644
--- a/components/bookmarks/test/bookmark_test_helpers.cc
+++ b/components/bookmarks/test/bookmark_test_helpers.cc
@@ -22,13 +22,12 @@ namespace {
 class BookmarkLoadObserver : public BaseBookmarkModelObserver {
  public:
   explicit BookmarkLoadObserver(const base::Closure& quit_task);
-  virtual ~BookmarkLoadObserver();
+  ~BookmarkLoadObserver() override;
 
  private:
   // BaseBookmarkModelObserver:
-  virtual void BookmarkModelChanged() override;
-  virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) override;
+  void BookmarkModelChanged() override;
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
 
   base::Closure quit_task_;
 
diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h
index ca19156..188832d 100644
--- a/components/bookmarks/test/test_bookmark_client.h
+++ b/components/bookmarks/test/test_bookmark_client.h
@@ -15,7 +15,7 @@ namespace bookmarks {
 class TestBookmarkClient : public BookmarkClient {
  public:
   TestBookmarkClient();
-  virtual ~TestBookmarkClient();
+  ~TestBookmarkClient() override;
 
   // Create a BookmarkModel using this object as its client. The returned
   // BookmarkModel* is owned by the caller.
@@ -38,14 +38,12 @@ class TestBookmarkClient : public BookmarkClient {
 
  private:
   // BookmarkClient:
-  virtual bool IsPermanentNodeVisible(
-      const BookmarkPermanentNode* node) override;
-  virtual void RecordAction(const base::UserMetricsAction& action) override;
-  virtual LoadExtraCallback GetLoadExtraNodesCallback() override;
-  virtual bool CanSetPermanentNodeTitle(
-      const BookmarkNode* permanent_node) override;
-  virtual bool CanSyncNode(const BookmarkNode* node) override;
-  virtual bool CanBeEditedByUser(const BookmarkNode* node) override;
+  bool IsPermanentNodeVisible(const BookmarkPermanentNode* node) override;
+  void RecordAction(const base::UserMetricsAction& action) override;
+  LoadExtraCallback GetLoadExtraNodesCallback() override;
+  bool CanSetPermanentNodeTitle(const BookmarkNode* permanent_node) override;
+  bool CanSyncNode(const BookmarkNode* node) override;
+  bool CanBeEditedByUser(const BookmarkNode* node) override;
 
   // Helpers for GetLoadExtraNodesCallback().
   static BookmarkPermanentNodeList LoadExtraNodes(
diff --git a/components/captive_portal/captive_portal_detector.h b/components/captive_portal/captive_portal_detector.h
index 1e155b7..fdbb784 100644
--- a/components/captive_portal/captive_portal_detector.h
+++ b/components/captive_portal/captive_portal_detector.h
@@ -49,7 +49,7 @@ class CAPTIVE_PORTAL_EXPORT CaptivePortalDetector
 
   explicit CaptivePortalDetector(
       const scoped_refptr<net::URLRequestContextGetter>& request_context);
-  virtual ~CaptivePortalDetector();
+  ~CaptivePortalDetector() override;
 
   // Triggers a check for a captive portal. After completion, runs the
   // |callback|.
@@ -62,7 +62,7 @@ class CAPTIVE_PORTAL_EXPORT CaptivePortalDetector
   friend class CaptivePortalDetectorTestBase;
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Takes a net::URLFetcher that has finished trying to retrieve the
   // test URL, and fills a Results struct based on its result.  If the
diff --git a/components/cdm/browser/cdm_message_filter_android.h b/components/cdm/browser/cdm_message_filter_android.h
index b32fca5..47b45c5 100644
--- a/components/cdm/browser/cdm_message_filter_android.h
+++ b/components/cdm/browser/cdm_message_filter_android.h
@@ -21,13 +21,12 @@ class CdmMessageFilterAndroid
   CdmMessageFilterAndroid();
 
  private:
-  virtual ~CdmMessageFilterAndroid();
+  ~CdmMessageFilterAndroid() override;
 
   // BrowserMessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OverrideThreadForMessage(
-      const IPC::Message& message,
-      content::BrowserThread::ID* thread) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OverrideThreadForMessage(const IPC::Message& message,
+                                content::BrowserThread::ID* thread) override;
 
   // Query the key system information.
   void OnQueryKeySystemSupport(const SupportedKeySystemRequest& request,
diff --git a/components/component_updater/component_patcher_operation.h b/components/component_updater/component_patcher_operation.h
index 02ca26d..2bf1ab6 100644
--- a/components/component_updater/component_patcher_operation.h
+++ b/components/component_updater/component_patcher_operation.h
@@ -86,15 +86,15 @@ class DeltaUpdateOpCopy : public DeltaUpdateOp {
   DeltaUpdateOpCopy();
 
  private:
-  virtual ~DeltaUpdateOpCopy();
+  ~DeltaUpdateOpCopy() override;
 
   // Overrides of DeltaUpdateOp.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
+  void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   base::FilePath input_abs_path_;
 
@@ -110,15 +110,15 @@ class DeltaUpdateOpCreate : public DeltaUpdateOp {
   DeltaUpdateOpCreate();
 
  private:
-  virtual ~DeltaUpdateOpCreate();
+  ~DeltaUpdateOpCreate() override;
 
   // Overrides of DeltaUpdateOp.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
+  void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   base::FilePath patch_abs_path_;
 
@@ -153,15 +153,15 @@ class DeltaUpdateOpPatch : public DeltaUpdateOp {
                      scoped_refptr<OutOfProcessPatcher> out_of_process_patcher);
 
  private:
-  virtual ~DeltaUpdateOpPatch();
+  ~DeltaUpdateOpPatch() override;
 
   // Overrides of DeltaUpdateOp.
-  virtual ComponentUnpacker::Error DoParseArguments(
+  ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
       ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
+  void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   // |success_code| is the code that indicates a successful patch.
   // |result| is the code the patching operation returned.
diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
index 4cd4a7a..92f13814 100644
--- a/components/component_updater/component_updater_service.cc
+++ b/components/component_updater/component_updater_service.cc
@@ -103,20 +103,19 @@ CrxComponent::~CrxComponent() {
 class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
  public:
   explicit CrxUpdateService(Configurator* config);
-  virtual ~CrxUpdateService();
+  ~CrxUpdateService() override;
 
   // Overrides for ComponentUpdateService.
-  virtual void AddObserver(Observer* observer) override;
-  virtual void RemoveObserver(Observer* observer) override;
-  virtual Status Start() override;
-  virtual Status Stop() override;
-  virtual Status RegisterComponent(const CrxComponent& component) override;
-  virtual std::vector<std::string> GetComponentIDs() const override;
-  virtual OnDemandUpdater& GetOnDemandUpdater() override;
-  virtual void MaybeThrottle(const std::string& crx_id,
-                             const base::Closure& callback) override;
-  virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
-      override;
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
+  Status Start() override;
+  Status Stop() override;
+  Status RegisterComponent(const CrxComponent& component) override;
+  std::vector<std::string> GetComponentIDs() const override;
+  OnDemandUpdater& GetOnDemandUpdater() override;
+  void MaybeThrottle(const std::string& crx_id,
+                     const base::Closure& callback) override;
+  scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner() override;
 
   // Context for a crx download url request.
   struct CRXContext {
@@ -142,11 +141,11 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
   };
 
   // Overrides for ComponentUpdateService.
-  virtual bool GetComponentDetails(const std::string& component_id,
-                                   CrxUpdateItem* item) const override;
+  bool GetComponentDetails(const std::string& component_id,
+                           CrxUpdateItem* item) const override;
 
   // Overrides for OnDemandUpdater.
-  virtual Status OnDemandUpdate(const std::string& component_id) override;
+  Status OnDemandUpdate(const std::string& component_id) override;
 
   void UpdateCheckComplete(const GURL& original_url,
                            int error,
diff --git a/components/component_updater/default_component_installer.h b/components/component_updater/default_component_installer.h
index 345c3dd..3946ab39 100644
--- a/components/component_updater/default_component_installer.h
+++ b/components/component_updater/default_component_installer.h
@@ -91,13 +91,13 @@ class DefaultComponentInstaller : public ComponentInstaller {
   void Register(ComponentUpdateService* cus);
 
   // Overridden from ComponentInstaller:
-  virtual void OnUpdateError(int error) override;
-  virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) override;
-  virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) override;
+  void OnUpdateError(int error) override;
+  bool Install(const base::DictionaryValue& manifest,
+               const base::FilePath& unpack_path) override;
+  bool GetInstalledFile(const std::string& file,
+                        base::FilePath* installed_file) override;
 
-  virtual ~DefaultComponentInstaller();
+  ~DefaultComponentInstaller() override;
 
  private:
   base::FilePath GetInstallDirectory();
diff --git a/components/component_updater/request_sender.h b/components/component_updater/request_sender.h
index 2abcf47..10a26f8 100644
--- a/components/component_updater/request_sender.h
+++ b/components/component_updater/request_sender.h
@@ -34,7 +34,7 @@ class RequestSender : public net::URLFetcherDelegate {
       RequestSenderCallback;
 
   explicit RequestSender(const Configurator& config);
-  virtual ~RequestSender();
+  ~RequestSender() override;
 
   void Send(const std::string& request_string,
             const std::vector<GURL>& urls,
@@ -44,7 +44,7 @@ class RequestSender : public net::URLFetcherDelegate {
   void SendInternal();
 
   // Overrides for URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   const Configurator& config_;
   std::vector<GURL> urls_;
diff --git a/components/component_updater/test/test_configurator.h b/components/component_updater/test/test_configurator.h
index e525db7..264b7c9 100644
--- a/components/component_updater/test/test_configurator.h
+++ b/components/component_updater/test/test_configurator.h
@@ -36,32 +36,31 @@ class TestConfigurator : public Configurator {
   TestConfigurator(
       const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
       const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner);
-  virtual ~TestConfigurator();
+  ~TestConfigurator() override;
 
   // Overrrides for Configurator.
-  virtual int InitialDelay() const override;
-  virtual int NextCheckDelay() override;
-  virtual int StepDelay() const override;
-  virtual int StepDelayMedium() override;
-  virtual int MinimumReCheckWait() const override;
-  virtual int OnDemandDelay() const override;
-  virtual std::vector<GURL> UpdateUrl() const override;
-  virtual std::vector<GURL> PingUrl() const override;
-  virtual base::Version GetBrowserVersion() const override;
-  virtual std::string GetChannel() const override;
-  virtual std::string GetLang() const override;
-  virtual std::string GetOSLongName() const override;
-  virtual std::string ExtraRequestParams() const override;
-  virtual size_t UrlSizeLimit() const override;
-  virtual net::URLRequestContextGetter* RequestContext() const override;
-  virtual scoped_refptr<OutOfProcessPatcher> CreateOutOfProcessPatcher()
+  int InitialDelay() const override;
+  int NextCheckDelay() override;
+  int StepDelay() const override;
+  int StepDelayMedium() override;
+  int MinimumReCheckWait() const override;
+  int OnDemandDelay() const override;
+  std::vector<GURL> UpdateUrl() const override;
+  std::vector<GURL> PingUrl() const override;
+  base::Version GetBrowserVersion() const override;
+  std::string GetChannel() const override;
+  std::string GetLang() const override;
+  std::string GetOSLongName() const override;
+  std::string ExtraRequestParams() const override;
+  size_t UrlSizeLimit() const override;
+  net::URLRequestContextGetter* RequestContext() const override;
+  scoped_refptr<OutOfProcessPatcher> CreateOutOfProcessPatcher() const override;
+  bool DeltasEnabled() const override;
+  bool UseBackgroundDownloader() const override;
+  scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
       const override;
-  virtual bool DeltasEnabled() const override;
-  virtual bool UseBackgroundDownloader() const override;
-  virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
+  scoped_refptr<base::SingleThreadTaskRunner> GetSingleThreadTaskRunner()
       const override;
-  virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetSingleThreadTaskRunner() const override;
 
   void SetLoopCount(int times);
   void SetRecheckTime(int seconds);
diff --git a/components/component_updater/test/test_installer.h b/components/component_updater/test/test_installer.h
index 914b52e..e44c48d 100644
--- a/components/component_updater/test/test_installer.h
+++ b/components/component_updater/test/test_installer.h
@@ -23,13 +23,13 @@ class TestInstaller : public ComponentInstaller {
  public:
   TestInstaller();
 
-  virtual void OnUpdateError(int error) override;
+  void OnUpdateError(int error) override;
 
-  virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) override;
+  bool Install(const base::DictionaryValue& manifest,
+               const base::FilePath& unpack_path) override;
 
-  virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) override;
+  bool GetInstalledFile(const std::string& file,
+                        base::FilePath* installed_file) override;
 
   int error() const;
 
@@ -46,10 +46,10 @@ class ReadOnlyTestInstaller : public TestInstaller {
  public:
   explicit ReadOnlyTestInstaller(const base::FilePath& installed_path);
 
-  virtual ~ReadOnlyTestInstaller();
+  ~ReadOnlyTestInstaller() override;
 
-  virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) override;
+  bool GetInstalledFile(const std::string& file,
+                        base::FilePath* installed_file) override;
 
  private:
   base::FilePath install_directory_;
@@ -61,13 +61,13 @@ class VersionedTestInstaller : public TestInstaller {
  public:
   VersionedTestInstaller();
 
-  virtual ~VersionedTestInstaller();
+  ~VersionedTestInstaller() override;
 
-  virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) override;
+  bool Install(const base::DictionaryValue& manifest,
+               const base::FilePath& unpack_path) override;
 
-  virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) override;
+  bool GetInstalledFile(const std::string& file,
+                        base::FilePath* installed_file) override;
 
  private:
   base::FilePath install_directory_;
diff --git a/components/component_updater/test/url_request_post_interceptor.cc b/components/component_updater/test/url_request_post_interceptor.cc
index 2dd474a..f2dc839 100644
--- a/components/component_updater/test/url_request_post_interceptor.cc
+++ b/components/component_updater/test/url_request_post_interceptor.cc
@@ -31,12 +31,12 @@ class URLRequestMockJob : public net::URLRequestSimpleJob {
         response_body_(response_body) {}
 
  protected:
-  virtual int GetResponseCode() const override { return response_code_; }
+  int GetResponseCode() const override { return response_code_; }
 
-  virtual int GetData(std::string* mime_type,
-                      std::string* charset,
-                      std::string* data,
-                      const net::CompletionCallback& callback) const override {
+  int GetData(std::string* mime_type,
+              std::string* charset,
+              std::string* data,
+              const net::CompletionCallback& callback) const override {
     mime_type->assign("text/plain");
     charset->assign("US-ASCII");
     data->assign(response_body_);
@@ -44,7 +44,7 @@ class URLRequestMockJob : public net::URLRequestSimpleJob {
   }
 
  private:
-  virtual ~URLRequestMockJob() {}
+  ~URLRequestMockJob() override {}
 
   int response_code_;
   std::string response_body_;
@@ -169,9 +169,9 @@ class URLRequestPostInterceptor::Delegate : public net::URLRequestInterceptor {
   }
 
  private:
-  virtual ~Delegate() {}
+  ~Delegate() override {}
 
-  virtual net::URLRequestJob* MaybeInterceptRequest(
+  net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const override {
     DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
diff --git a/components/component_updater/test/url_request_post_interceptor.h b/components/component_updater/test/url_request_post_interceptor.h
index 01a5ef4..ffdcfb1 100644
--- a/components/component_updater/test/url_request_post_interceptor.h
+++ b/components/component_updater/test/url_request_post_interceptor.h
@@ -171,7 +171,7 @@ class InterceptorFactory : public URLRequestPostInterceptorFactory {
 class PartialMatch : public URLRequestPostInterceptor::RequestMatcher {
  public:
   explicit PartialMatch(const std::string& expected) : expected_(expected) {}
-  virtual bool Match(const std::string& actual) const override;
+  bool Match(const std::string& actual) const override;
 
  private:
   const std::string expected_;
diff --git a/components/component_updater/update_checker.cc b/components/component_updater/update_checker.cc
index 3bfff63..f14263c 100644
--- a/components/component_updater/update_checker.cc
+++ b/components/component_updater/update_checker.cc
@@ -79,10 +79,10 @@ std::string BuildUpdateCheckRequest(const Configurator& config,
 class UpdateCheckerImpl : public UpdateChecker {
  public:
   explicit UpdateCheckerImpl(const Configurator& config);
-  virtual ~UpdateCheckerImpl();
+  ~UpdateCheckerImpl() override;
 
   // Overrides for UpdateChecker.
-  virtual bool CheckForUpdates(
+  bool CheckForUpdates(
       const std::vector<CrxUpdateItem*>& items_to_check,
       const std::string& additional_attributes,
       const UpdateCheckCallback& update_check_callback) override;
diff --git a/components/component_updater/url_fetcher_downloader.h b/components/component_updater/url_fetcher_downloader.h
index 7a51c20..99a7d3a 100644
--- a/components/component_updater/url_fetcher_downloader.h
+++ b/components/component_updater/url_fetcher_downloader.h
@@ -30,17 +30,17 @@ class UrlFetcherDownloader : public CrxDownloader,
   UrlFetcherDownloader(scoped_ptr<CrxDownloader> successor,
                        net::URLRequestContextGetter* context_getter,
                        scoped_refptr<base::SequencedTaskRunner> task_runner);
-  virtual ~UrlFetcherDownloader();
+  ~UrlFetcherDownloader() override;
 
  private:
   // Overrides for CrxDownloader.
-  virtual void DoStartDownload(const GURL& url) override;
+  void DoStartDownload(const GURL& url) override;
 
   // Overrides for URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
-  virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                          int64_t current,
-                                          int64_t total) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchDownloadProgress(const net::URLFetcher* source,
+                                  int64_t current,
+                                  int64_t total) override;
   scoped_ptr<net::URLFetcher> url_fetcher_;
   net::URLRequestContextGetter* context_getter_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
diff --git a/components/content_settings/core/browser/content_settings_observable_provider.h b/components/content_settings/core/browser/content_settings_observable_provider.h
index e12f778..6c011e0 100644
--- a/components/content_settings/core/browser/content_settings_observable_provider.h
+++ b/components/content_settings/core/browser/content_settings_observable_provider.h
@@ -17,7 +17,7 @@ namespace content_settings {
 class ObservableProvider : public ProviderInterface {
  public:
   ObservableProvider();
-  virtual ~ObservableProvider();
+  ~ObservableProvider() override;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
diff --git a/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
index 7a404db..5d887a6 100644
--- a/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
+++ b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
@@ -30,13 +30,11 @@ class RuleIteratorImpl : public RuleIterator {
         rule_end_(rule_end),
         auto_lock_(auto_lock) {
   }
-  virtual ~RuleIteratorImpl() {}
+  ~RuleIteratorImpl() override {}
 
-  virtual bool HasNext() const override {
-    return (current_rule_ != rule_end_);
-  }
+  bool HasNext() const override { return (current_rule_ != rule_end_); }
 
-  virtual Rule Next() override {
+  Rule Next() override {
     DCHECK(current_rule_ != rule_end_);
     DCHECK(current_rule_->second.get());
     Rule to_return(current_rule_->first.primary_pattern,
diff --git a/components/content_settings/core/browser/content_settings_rule.h b/components/content_settings/core/browser/content_settings_rule.h
index bff9f65..6305c8c 100644
--- a/components/content_settings/core/browser/content_settings_rule.h
+++ b/components/content_settings/core/browser/content_settings_rule.h
@@ -39,9 +39,9 @@ class RuleIterator {
 
 class EmptyRuleIterator : public RuleIterator {
  public:
-  virtual ~EmptyRuleIterator();
-  virtual bool HasNext() const override;
-  virtual Rule Next() override;
+  ~EmptyRuleIterator() override;
+  bool HasNext() const override;
+  Rule Next() override;
 };
 
 class ConcatenationIterator : public RuleIterator {
@@ -50,9 +50,10 @@ class ConcatenationIterator : public RuleIterator {
   // list and |auto_lock|. |auto_lock| can be NULL if no locking is needed.
   ConcatenationIterator(ScopedVector<RuleIterator>* iterators,
                         base::AutoLock* auto_lock);
-  virtual ~ConcatenationIterator();
-  virtual bool HasNext() const override;
-  virtual Rule Next() override;
+  ~ConcatenationIterator() override;
+  bool HasNext() const override;
+  Rule Next() override;
+
  private:
   ScopedVector<RuleIterator> iterators_;
   scoped_ptr<base::AutoLock> auto_lock_;
diff --git a/components/content_settings/core/browser/content_settings_rule_unittest.cc b/components/content_settings/core/browser/content_settings_rule_unittest.cc
index 1d6cf31..e588596 100644
--- a/components/content_settings/core/browser/content_settings_rule_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_rule_unittest.cc
@@ -17,13 +17,11 @@ class ListIterator : public RuleIterator {
   explicit ListIterator(const std::list<Rule>& rules)
       : rules_(rules) {}
 
-  virtual ~ListIterator() {}
+  ~ListIterator() override {}
 
-  virtual bool HasNext() const override {
-    return !rules_.empty();
-  }
+  bool HasNext() const override { return !rules_.empty(); }
 
-  virtual Rule Next() override {
+  Rule Next() override {
     EXPECT_FALSE(rules_.empty());
     // |front()| returns a reference but we're going to discard the object
     // referred to; force copying here.
diff --git a/components/content_settings/core/common/content_settings_pattern.cc b/components/content_settings/core/common/content_settings_pattern.cc
index 353d7df..b02cbee 100644
--- a/components/content_settings/core/common/content_settings_pattern.cc
+++ b/components/content_settings/core/common/content_settings_pattern.cc
@@ -87,19 +87,19 @@ class ContentSettingsPattern::Builder :
     public ContentSettingsPattern::BuilderInterface {
  public:
   explicit Builder(bool use_legacy_validate);
-  virtual ~Builder();
+  ~Builder() override;
 
   // BuilderInterface:
-  virtual BuilderInterface* WithPort(const std::string& port) override;
-  virtual BuilderInterface* WithPortWildcard() override;
-  virtual BuilderInterface* WithHost(const std::string& host) override;
-  virtual BuilderInterface* WithDomainWildcard() override;
-  virtual BuilderInterface* WithScheme(const std::string& scheme) override;
-  virtual BuilderInterface* WithSchemeWildcard() override;
-  virtual BuilderInterface* WithPath(const std::string& path) override;
-  virtual BuilderInterface* WithPathWildcard() override;
-  virtual BuilderInterface* Invalid() override;
-  virtual ContentSettingsPattern Build() override;
+  BuilderInterface* WithPort(const std::string& port) override;
+  BuilderInterface* WithPortWildcard() override;
+  BuilderInterface* WithHost(const std::string& host) override;
+  BuilderInterface* WithDomainWildcard() override;
+  BuilderInterface* WithScheme(const std::string& scheme) override;
+  BuilderInterface* WithSchemeWildcard() override;
+  BuilderInterface* WithPath(const std::string& path) override;
+  BuilderInterface* WithPathWildcard() override;
+  BuilderInterface* Invalid() override;
+  ContentSettingsPattern Build() override;
 
  private:
   // Canonicalizes the pattern parts so that they are ASCII only, either
diff --git a/components/copresence/copresence_manager_impl.h b/components/copresence/copresence_manager_impl.h
index 7f14cbc..035f462 100644
--- a/components/copresence/copresence_manager_impl.h
+++ b/components/copresence/copresence_manager_impl.h
@@ -37,10 +37,10 @@ struct PendingRequest {
 // The implementation for CopresenceManager.
 class CopresenceManagerImpl : public CopresenceManager {
  public:
-  virtual ~CopresenceManagerImpl();
-  virtual void ExecuteReportRequest(ReportRequest request,
-                                    const std::string& app_id,
-                                    const StatusCallback& callback) override;
+  ~CopresenceManagerImpl() override;
+  void ExecuteReportRequest(ReportRequest request,
+                            const std::string& app_id,
+                            const StatusCallback& callback) override;
 
  private:
   // Create managers with the CopresenceManager::Create() method.
diff --git a/components/copresence/handlers/audio/audio_directive_handler_unittest.cc b/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
index 31c5f58..56dd49d 100644
--- a/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
+++ b/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
@@ -21,16 +21,16 @@ namespace copresence {
 class TestAudioPlayer : public AudioPlayer {
  public:
   TestAudioPlayer() {}
-  virtual ~TestAudioPlayer() {}
+  ~TestAudioPlayer() override {}
 
   // AudioPlayer overrides:
-  virtual void Initialize() override {}
-  virtual void Play(
+  void Initialize() override {}
+  void Play(
       const scoped_refptr<media::AudioBusRefCounted>& /* samples */) override {
     set_is_playing(true);
   }
-  virtual void Stop() override { set_is_playing(false); }
-  virtual void Finalize() override { delete this; }
+  void Stop() override { set_is_playing(false); }
+  void Finalize() override { delete this; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestAudioPlayer);
@@ -39,13 +39,13 @@ class TestAudioPlayer : public AudioPlayer {
 class TestAudioRecorder : public AudioRecorder {
  public:
   TestAudioRecorder() : AudioRecorder(AudioRecorder::DecodeSamplesCallback()) {}
-  virtual ~TestAudioRecorder() {}
+  ~TestAudioRecorder() override {}
 
   // AudioRecorder overrides:
-  virtual void Initialize() override {}
-  virtual void Record() override { set_is_recording(true); }
-  virtual void Stop() override { set_is_recording(false); }
-  virtual void Finalize() override { delete this; }
+  void Initialize() override {}
+  void Record() override { set_is_recording(true); }
+  void Stop() override { set_is_recording(false); }
+  void Finalize() override { delete this; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestAudioRecorder);
diff --git a/components/copresence/mediums/audio/audio_player.h b/components/copresence/mediums/audio/audio_player.h
index 96c1f0f..e2bb64d 100644
--- a/components/copresence/mediums/audio/audio_player.h
+++ b/components/copresence/mediums/audio/audio_player.h
@@ -47,7 +47,7 @@ class AudioPlayer : public media::AudioOutputStream::AudioSourceCallback {
   }
 
  protected:
-  virtual ~AudioPlayer();
+  ~AudioPlayer() override;
   void set_is_playing(bool is_playing) { is_playing_ = is_playing; }
 
  private:
@@ -66,9 +66,8 @@ class AudioPlayer : public media::AudioOutputStream::AudioSourceCallback {
 
   // AudioOutputStream::AudioSourceCallback overrides:
   // Following methods could be called from *ANY* thread.
-  virtual int OnMoreData(media::AudioBus* dest,
-                         uint32 total_bytes_delay) override;
-  virtual void OnError(media::AudioOutputStream* stream) override;
+  int OnMoreData(media::AudioBus* dest, uint32 total_bytes_delay) override;
+  void OnError(media::AudioOutputStream* stream) override;
 
   // Flushes the audio loop, making sure that any queued operations are
   // performed.
diff --git a/components/copresence/mediums/audio/audio_player_unittest.cc b/components/copresence/mediums/audio/audio_player_unittest.cc
index b978b99..97d58e5 100644
--- a/components/copresence/mediums/audio/audio_player_unittest.cc
+++ b/components/copresence/mediums/audio/audio_player_unittest.cc
@@ -29,17 +29,17 @@ class TestAudioOutputStream : public media::AudioOutputStream {
     caller_loop_ = base::MessageLoop::current();
   }
 
-  virtual ~TestAudioOutputStream() {}
+  ~TestAudioOutputStream() override {}
 
-  virtual bool Open() override { return true; }
-  virtual void Start(AudioSourceCallback* callback) override {
+  bool Open() override { return true; }
+  void Start(AudioSourceCallback* callback) override {
     callback_ = callback;
     GatherPlayedSamples();
   }
-  virtual void Stop() override {}
-  virtual void SetVolume(double volume) override {}
-  virtual void GetVolume(double* volume) override {}
-  virtual void Close() override {}
+  void Stop() override {}
+  void SetVolume(double volume) override {}
+  void GetVolume(double* volume) override {}
+  void Close() override {}
 
  private:
   void GatherPlayedSamples() {
diff --git a/components/copresence/mediums/audio/audio_recorder.h b/components/copresence/mediums/audio/audio_recorder.h
index 5c68eca..e554f01 100644
--- a/components/copresence/mediums/audio/audio_recorder.h
+++ b/components/copresence/mediums/audio/audio_recorder.h
@@ -55,7 +55,7 @@ class AudioRecorder : public media::AudioInputStream::AudioInputCallback,
   }
 
  protected:
-  virtual ~AudioRecorder();
+  ~AudioRecorder() override;
   void set_is_recording(bool is_recording) { is_recording_ = is_recording; }
 
  private:
@@ -75,15 +75,15 @@ class AudioRecorder : public media::AudioInputStream::AudioInputCallback,
   // Called by the audio recorder when a full packet of audio data is
   // available. This is called from a special audio thread and the
   // implementation should return as soon as possible.
-  virtual void OnData(media::AudioInputStream* stream,
-                      const media::AudioBus* source,
-                      uint32 hardware_delay_bytes,
-                      double volume) override;
-  virtual void OnError(media::AudioInputStream* stream) override;
+  void OnData(media::AudioInputStream* stream,
+              const media::AudioBus* source,
+              uint32 hardware_delay_bytes,
+              double volume) override;
+  void OnError(media::AudioInputStream* stream) override;
 
   // AudioConverter::InputCallback overrides:
-  virtual double ProvideInput(media::AudioBus* dest,
-                              base::TimeDelta buffer_delay) override;
+  double ProvideInput(media::AudioBus* dest,
+                      base::TimeDelta buffer_delay) override;
 
   // Flushes the audio loop, making sure that any queued operations are
   // performed.
diff --git a/components/copresence/mediums/audio/audio_recorder_unittest.cc b/components/copresence/mediums/audio/audio_recorder_unittest.cc
index 2c81213..1e01c94 100644
--- a/components/copresence/mediums/audio/audio_recorder_unittest.cc
+++ b/components/copresence/mediums/audio/audio_recorder_unittest.cc
@@ -29,10 +29,10 @@ class TestAudioInputStream : public media::AudioInputStream {
     buffer_->set_frames(samples);
   }
 
-  virtual ~TestAudioInputStream() {}
+  ~TestAudioInputStream() override {}
 
-  virtual bool Open() override { return true; }
-  virtual void Start(AudioInputCallback* callback) override {
+  bool Open() override { return true; }
+  void Start(AudioInputCallback* callback) override {
     DCHECK(callback);
     callback_ = callback;
     media::AudioManager::Get()->GetTaskRunner()->PostTask(
@@ -40,14 +40,14 @@ class TestAudioInputStream : public media::AudioInputStream {
         base::Bind(&TestAudioInputStream::SimulateRecording,
                    base::Unretained(this)));
   }
-  virtual void Stop() override {}
-  virtual void Close() override {}
-  virtual double GetMaxVolume() override { return 1.0; }
-  virtual void SetVolume(double volume) override {}
-  virtual double GetVolume() override { return 1.0; }
-  virtual void SetAutomaticGainControl(bool enabled) override {}
-  virtual bool GetAutomaticGainControl() override { return true; }
-  virtual bool IsMuted() override { return false; }
+  void Stop() override {}
+  void Close() override {}
+  double GetMaxVolume() override { return 1.0; }
+  void SetVolume(double volume) override {}
+  double GetVolume() override { return 1.0; }
+  void SetAutomaticGainControl(bool enabled) override {}
+  bool GetAutomaticGainControl() override { return true; }
+  bool IsMuted() override { return false; }
 
  private:
   void SimulateRecording() {
diff --git a/components/copresence/rpc/http_post.h b/components/copresence/rpc/http_post.h
index f324b69..83a39c0 100644
--- a/components/copresence/rpc/http_post.h
+++ b/components/copresence/rpc/http_post.h
@@ -47,7 +47,7 @@ class HttpPost : public net::URLFetcherDelegate {
            const google::protobuf::MessageLite& request_proto);
 
   // HTTP requests are cancelled on delete.
-  virtual ~HttpPost();
+  ~HttpPost() override;
 
   // Send an HttpPost request.
   void Start(const ResponseCallback& response_callback);
@@ -60,7 +60,7 @@ class HttpPost : public net::URLFetcherDelegate {
   friend class HttpPostTest;
 
   // Overridden from net::URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   ResponseCallback response_callback_;
 
diff --git a/components/copresence/rpc/rpc_handler_unittest.cc b/components/copresence/rpc/rpc_handler_unittest.cc
index 77d61cb..aad39e3 100644
--- a/components/copresence/rpc/rpc_handler_unittest.cc
+++ b/components/copresence/rpc/rpc_handler_unittest.cc
@@ -40,21 +40,21 @@ void CreateSubscribedMessage(const std::vector<std::string>& subscription_ids,
 class FakeDirectiveHandler : public DirectiveHandler {
  public:
   FakeDirectiveHandler() {}
-  virtual ~FakeDirectiveHandler() {}
+  ~FakeDirectiveHandler() override {}
 
   const std::vector<Directive>& added_directives() const {
     return added_directives_;
   }
 
-  virtual void Initialize(
+  void Initialize(
       const AudioRecorder::DecodeSamplesCallback& decode_cb,
       const AudioDirectiveHandler::EncodeTokenCallback& encode_cb) override {}
 
-  virtual void AddDirective(const Directive& directive) override {
+  void AddDirective(const Directive& directive) override {
     added_directives_.push_back(directive);
   }
 
-  virtual void RemoveDirectives(const std::string& op_id) override {
+  void RemoveDirectives(const std::string& op_id) override {
     // TODO(ckehoe): Add a parallel implementation when prod has one.
   }
 
@@ -137,29 +137,24 @@ class RpcHandlerTest : public testing::Test, public CopresenceDelegate {
 
   // CopresenceDelegate implementation
 
-  virtual void HandleMessages(
-      const std::string& app_id,
-      const std::string& subscription_id,
-      const std::vector<Message>& messages) override {
+  void HandleMessages(const std::string& app_id,
+                      const std::string& subscription_id,
+                      const std::vector<Message>& messages) override {
     // app_id is unused for now, pending a server fix.
     messages_by_subscription_[subscription_id] = messages;
   }
 
-  virtual net::URLRequestContextGetter* GetRequestContext() const override {
+  net::URLRequestContextGetter* GetRequestContext() const override {
     return NULL;
   }
 
-  virtual const std::string GetPlatformVersionString() const override {
+  const std::string GetPlatformVersionString() const override {
     return kChromeVersion;
   }
 
-  virtual const std::string GetAPIKey() const override {
-    return api_key_;
-  }
+  const std::string GetAPIKey() const override { return api_key_; }
 
-  virtual WhispernetClient* GetWhispernetClient() override {
-    return NULL;
-  }
+  WhispernetClient* GetWhispernetClient() override { return NULL; }
 
  protected:
   // For rpc_handler_.invalid_audio_token_cache_
diff --git a/components/copresence_sockets/copresence_peer.cc b/components/copresence_sockets/copresence_peer.cc
index af897df..bacebcb 100644
--- a/components/copresence_sockets/copresence_peer.cc
+++ b/components/copresence_sockets/copresence_peer.cc
@@ -41,20 +41,19 @@ class DefaultApprovalDelegate
     : public device::BluetoothDevice::PairingDelegate {
  public:
   DefaultApprovalDelegate() {}
-  virtual ~DefaultApprovalDelegate() {}
+  ~DefaultApprovalDelegate() override {}
 
   // device::BluetoothDevice::PairingDelegate overrides:
-  virtual void RequestPinCode(device::BluetoothDevice* device) override {}
-  virtual void RequestPasskey(device::BluetoothDevice* device) override {}
-  virtual void DisplayPinCode(device::BluetoothDevice* device,
-                              const std::string& pincode) override {}
-  virtual void DisplayPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) override {}
-  virtual void KeysEntered(device::BluetoothDevice* device,
-                           uint32 entered) override {}
-  virtual void ConfirmPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) override {}
-  virtual void AuthorizePairing(device::BluetoothDevice* device) override {
+  void RequestPinCode(device::BluetoothDevice* device) override {}
+  void RequestPasskey(device::BluetoothDevice* device) override {}
+  void DisplayPinCode(device::BluetoothDevice* device,
+                      const std::string& pincode) override {}
+  void DisplayPasskey(device::BluetoothDevice* device,
+                      uint32 passkey) override {}
+  void KeysEntered(device::BluetoothDevice* device, uint32 entered) override {}
+  void ConfirmPasskey(device::BluetoothDevice* device,
+                      uint32 passkey) override {}
+  void AuthorizePairing(device::BluetoothDevice* device) override {
     if (device->ExpectingConfirmation())
       device->ConfirmPairing();
   }
diff --git a/components/copresence_sockets/transports/bluetooth/copresence_socket_bluetooth.h b/components/copresence_sockets/transports/bluetooth/copresence_socket_bluetooth.h
index 6544d35..21d9cff 100644
--- a/components/copresence_sockets/transports/bluetooth/copresence_socket_bluetooth.h
+++ b/components/copresence_sockets/transports/bluetooth/copresence_socket_bluetooth.h
@@ -25,12 +25,12 @@ class CopresenceSocketBluetooth : public CopresenceSocket {
  public:
   explicit CopresenceSocketBluetooth(
       const scoped_refptr<device::BluetoothSocket>& socket);
-  virtual ~CopresenceSocketBluetooth();
+  ~CopresenceSocketBluetooth() override;
 
   // CopresenceSocket overrides:
-  virtual bool Send(const scoped_refptr<net::IOBuffer>& buffer,
-                    int buffer_size) override;
-  virtual void Receive(const ReceiveCallback& callback) override;
+  bool Send(const scoped_refptr<net::IOBuffer>& buffer,
+            int buffer_size) override;
+  void Receive(const ReceiveCallback& callback) override;
 
  private:
   void OnSendComplete(int status);
diff --git a/components/crash/app/breakpad_mac.mm b/components/crash/app/breakpad_mac.mm
index 95862a7..cca9b54 100644
--- a/components/crash/app/breakpad_mac.mm
+++ b/components/crash/app/breakpad_mac.mm
@@ -116,7 +116,7 @@ class DumpHelper : public base::PlatformThread::Delegate {
  private:
   DumpHelper() {}
 
-  virtual void ThreadMain() override {
+  void ThreadMain() override {
     base::PlatformThread::SetName("CrDumpHelper");
     BreakpadGenerateAndSendReport(gBreakpadRef);
   }
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc
index bf7d888..4d4d093 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler_unittest.cc
@@ -100,15 +100,13 @@ class TestDataReductionProxyAuthRequestHandler
       : DataReductionProxyAuthRequestHandler(
             client, version, params, loop_proxy) {}
 
-  virtual std::string GetDefaultKey() const override {
-    return kTestKey;
-  }
+  std::string GetDefaultKey() const override { return kTestKey; }
 
-  virtual base::Time Now() const override {
+  base::Time Now() const override {
     return base::Time::UnixEpoch() + now_offset_;
   }
 
-  virtual void RandBytes(void* output, size_t length) override {
+  void RandBytes(void* output, size_t length) override {
     char* c =  static_cast<char*>(output);
     for (size_t i = 0; i < length; ++i) {
       c[i] = 'a';
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h
index f7b6f56..49e56c4 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service.h
@@ -36,16 +36,13 @@ class DataReductionProxyConfigService
   // Takes ownership of the passed |base_service|.
   DataReductionProxyConfigService(
       scoped_ptr<net::ProxyConfigService> base_service);
-  virtual ~DataReductionProxyConfigService();
+  ~DataReductionProxyConfigService() override;
 
   // ProxyConfigService implementation:
-  virtual void AddObserver(
-      net::ProxyConfigService::Observer* observer) override;
-  virtual void RemoveObserver(
-      net::ProxyConfigService::Observer* observer) override;
-  virtual ConfigAvailability GetLatestProxyConfig(
-      net::ProxyConfig* config) override;
-  virtual void OnLazyPoll() override;
+  void AddObserver(net::ProxyConfigService::Observer* observer) override;
+  void RemoveObserver(net::ProxyConfigService::Observer* observer) override;
+  ConfigAvailability GetLatestProxyConfig(net::ProxyConfig* config) override;
+  void OnLazyPoll() override;
 
   // Method on IO thread that receives the data reduction proxy settings pushed
   // from DataReductionProxyConfiguratorImpl.
@@ -56,8 +53,8 @@ class DataReductionProxyConfigService
   friend class DataReductionProxyConfigServiceTest;
 
   // ProxyConfigService::Observer implementation:
-  virtual void OnProxyConfigChanged(const net::ProxyConfig& config,
-                                    ConfigAvailability availability) override;
+  void OnProxyConfigChanged(const net::ProxyConfig& config,
+                            ConfigAvailability availability) override;
 
   // Makes sure that the observer registration with the base service is set up.
   void RegisterObserver();
@@ -94,16 +91,16 @@ class DataReductionProxyConfigTracker : public DataReductionProxyConfigurator {
   DataReductionProxyConfigTracker(
       base::Callback<void(bool, const net::ProxyConfig&)> update_proxy_config,
       const scoped_refptr<base::TaskRunner>& task_runner);
-  virtual ~DataReductionProxyConfigTracker();
-
-  virtual void Enable(bool primary_restricted,
-                      bool fallback_restricted,
-                      const std::string& primary_origin,
-                      const std::string& fallback_origin,
-                      const std::string& ssl_origin) override;
-  virtual void Disable() override;
-  virtual void AddHostPatternToBypass(const std::string& pattern) override;
-  virtual void AddURLPatternToBypass(const std::string& pattern) override;
+  ~DataReductionProxyConfigTracker() override;
+
+  void Enable(bool primary_restricted,
+              bool fallback_restricted,
+              const std::string& primary_origin,
+              const std::string& fallback_origin,
+              const std::string& ssl_origin) override;
+  void Disable() override;
+  void AddHostPatternToBypass(const std::string& pattern) override;
+  void AddURLPatternToBypass(const std::string& pattern) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigServiceTest,
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc
index 801d73b..904778c 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_unittest.cc
@@ -47,18 +47,15 @@ class TestProxyConfigService : public net::ProxyConfigService {
                       OnProxyConfigChanged(config, availability));
   }
 
-  virtual void AddObserver(
-      net::ProxyConfigService::Observer* observer) override {
+  void AddObserver(net::ProxyConfigService::Observer* observer) override {
     observers_.AddObserver(observer);
   }
 
-  virtual void RemoveObserver(
-      net::ProxyConfigService::Observer* observer) override {
+  void RemoveObserver(net::ProxyConfigService::Observer* observer) override {
     observers_.RemoveObserver(observer);
   }
 
-  virtual ConfigAvailability GetLatestProxyConfig(
-      net::ProxyConfig* config) override {
+  ConfigAvailability GetLatestProxyConfig(net::ProxyConfig* config) override {
     *config = config_;
     return availability_;
   }
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h
index 10c0992..c610a89 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate.h
@@ -28,25 +28,23 @@ class DataReductionProxyDelegate : public net::ProxyDelegate {
   explicit DataReductionProxyDelegate(
       DataReductionProxyAuthRequestHandler* auth_handler);
 
-  virtual ~DataReductionProxyDelegate();
+  ~DataReductionProxyDelegate() override;
 
-  virtual void OnResolveProxy(const GURL& url,
-                              int load_flags,
-                              const net::ProxyService& proxy_service,
-                              net::ProxyInfo* result) override;
+  void OnResolveProxy(const GURL& url,
+                      int load_flags,
+                      const net::ProxyService& proxy_service,
+                      net::ProxyInfo* result) override;
 
-  virtual void OnFallback(const net::ProxyServer& bad_proxy,
-                          int net_error) override;
+  void OnFallback(const net::ProxyServer& bad_proxy, int net_error) override;
 
-  virtual void OnBeforeSendHeaders(net::URLRequest* request,
-                                   const net::ProxyInfo& proxy_info,
-                                   net::HttpRequestHeaders* headers) override;
+  void OnBeforeSendHeaders(net::URLRequest* request,
+                           const net::ProxyInfo& proxy_info,
+                           net::HttpRequestHeaders* headers) override;
 
-  virtual void OnBeforeTunnelRequest(
-      const net::HostPortPair& proxy_server,
-      net::HttpRequestHeaders* extra_headers) override;
+  void OnBeforeTunnelRequest(const net::HostPortPair& proxy_server,
+                             net::HttpRequestHeaders* extra_headers) override;
 
-  virtual void OnTunnelHeadersReceived(
+  void OnTunnelHeadersReceived(
       const net::HostPortPair& origin,
       const net::HostPortPair& proxy_server,
       const net::HttpResponseHeaders& response_headers) override;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_params_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_params_test_utils.h
index 8044da4..43d54d8 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_params_test_utils.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_params_test_utils.h
@@ -47,21 +47,21 @@ class TestDataReductionProxyParams : public DataReductionProxyParams {
   static std::string FlagProbeURL();
 
  protected:
-  virtual std::string GetDefaultDevOrigin() const override;
+  std::string GetDefaultDevOrigin() const override;
 
-  virtual std::string GetDefaultDevFallbackOrigin() const override;
+  std::string GetDefaultDevFallbackOrigin() const override;
 
-  virtual std::string GetDefaultOrigin() const override;
+  std::string GetDefaultOrigin() const override;
 
-  virtual std::string GetDefaultFallbackOrigin() const override;
+  std::string GetDefaultFallbackOrigin() const override;
 
-  virtual std::string GetDefaultSSLOrigin() const override;
+  std::string GetDefaultSSLOrigin() const override;
 
-  virtual std::string GetDefaultAltOrigin() const override;
+  std::string GetDefaultAltOrigin() const override;
 
-  virtual std::string GetDefaultAltFallbackOrigin() const override;
+  std::string GetDefaultAltFallbackOrigin() const override;
 
-  virtual std::string GetDefaultProbeURL() const override;
+  std::string GetDefaultProbeURL() const override;
 
  private:
   std::string GetDefinition(unsigned int has_def,
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol_unittest.cc
index ee53355..1ff3832 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_protocol_unittest.cc
@@ -54,7 +54,7 @@ class TestDataReductionProxyNetworkDelegate : public net::NetworkDelegate {
         bypass_type_(bypass_type) {
   }
 
-  virtual int OnHeadersReceived(
+  int OnHeadersReceived(
       URLRequest* request,
       const net::CompletionCallback& callback,
       const HttpResponseHeaders* original_response_headers,
@@ -820,10 +820,10 @@ TEST_F(DataReductionProxyProtocolTest,
 
 class BadEntropyProvider : public base::FieldTrial::EntropyProvider {
  public:
-  virtual ~BadEntropyProvider() {}
+  ~BadEntropyProvider() override {}
 
-  virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const override {
+  double GetEntropyForTrial(const std::string& trial_name,
+                            uint32 randomization_seed) const override {
     return 0.5;
   }
 };
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h
index c8b06e8..68f152e 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h
@@ -92,7 +92,7 @@ class DataReductionProxySettings
   static bool IsProxyKeySetOnCommandLine();
 
   DataReductionProxySettings(DataReductionProxyParams* params);
-  virtual ~DataReductionProxySettings();
+  ~DataReductionProxySettings() override;
 
   DataReductionProxyParams* params() const {
     return params_.get();
@@ -179,7 +179,7 @@ class DataReductionProxySettings
   ContentLengthList GetDailyContentLengths(const char* pref_name);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  protected:
   void InitPrefMembers();
@@ -269,7 +269,7 @@ class DataReductionProxySettings
                            TestSetProxyConfigsHoldback);
 
   // NetworkChangeNotifier::IPAddressObserver:
-  virtual void OnIPAddressChanged() override;
+  void OnIPAddressChanged() override;
 
   void OnProxyEnabledPrefChange();
   void OnProxyAlternativeEnabledPrefChange();
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 126e5bd..64698d35 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
@@ -27,15 +27,15 @@ class DataReductionProxyStatisticsPrefs;
 class TestDataReductionProxyConfig : public DataReductionProxyConfigurator {
  public:
   TestDataReductionProxyConfig();
-  virtual ~TestDataReductionProxyConfig() {}
-  virtual void Enable(bool restricted,
-                      bool fallback_restricted,
-                      const std::string& primary_origin,
-                      const std::string& fallback_origin,
-                      const std::string& ssl_origin) override;
-  virtual void Disable() override;
-  virtual void AddHostPatternToBypass(const std::string& pattern) override {}
-  virtual void AddURLPatternToBypass(const std::string& pattern) override {}
+  ~TestDataReductionProxyConfig() override {}
+  void Enable(bool restricted,
+              bool fallback_restricted,
+              const std::string& primary_origin,
+              const std::string& fallback_origin,
+              const std::string& ssl_origin) override;
+  void Disable() override;
+  void AddHostPatternToBypass(const std::string& pattern) override {}
+  void AddURLPatternToBypass(const std::string& pattern) override {}
 
   // True if the proxy has been enabled, i.e., only after |Enable| has been
   // called. Defaults to false.
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h
index 3681fe0..84fe8cd 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h
@@ -47,7 +47,7 @@ class DataReductionProxyUsageStats
   DataReductionProxyUsageStats(
       DataReductionProxyParams* params,
       const scoped_refptr<base::MessageLoopProxy>& ui_thread_proxy);
-  virtual ~DataReductionProxyUsageStats();
+  ~DataReductionProxyUsageStats() override;
 
   // Sets the callback to be called on the UI thread when the unavailability
   // status has changed.
@@ -108,7 +108,7 @@ class DataReductionProxyUsageStats
   void RecordMissingViaHeaderBytes(net::URLRequest* request);
 
   // NetworkChangeNotifier::NetworkChangeObserver:
-  virtual void OnNetworkChanged(
+  void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   // Called when request counts change. Resets counts if they exceed thresholds,
diff --git a/components/dom_distiller/content/distiller_page_web_contents.h b/components/dom_distiller/content/distiller_page_web_contents.h
index a5a46c3..e73b0cc 100644
--- a/components/dom_distiller/content/distiller_page_web_contents.h
+++ b/components/dom_distiller/content/distiller_page_web_contents.h
@@ -20,7 +20,7 @@ class SourcePageHandleWebContents : public SourcePageHandle {
  public:
   explicit SourcePageHandleWebContents(
       scoped_ptr<content::WebContents> web_contents);
-  virtual ~SourcePageHandleWebContents();
+  ~SourcePageHandleWebContents() override;
 
   scoped_ptr<content::WebContents> GetWebContents();
 
@@ -34,11 +34,11 @@ class DistillerPageWebContentsFactory : public DistillerPageFactory {
   explicit DistillerPageWebContentsFactory(
       content::BrowserContext* browser_context)
       : DistillerPageFactory(), browser_context_(browser_context) {}
-  virtual ~DistillerPageWebContentsFactory() {}
+  ~DistillerPageWebContentsFactory() override {}
 
-  virtual scoped_ptr<DistillerPage> CreateDistillerPage(
+  scoped_ptr<DistillerPage> CreateDistillerPage(
       const gfx::Size& render_view_size) const override;
-  virtual scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
+  scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
       scoped_ptr<SourcePageHandle> handle) const override;
 
  private:
@@ -53,24 +53,23 @@ class DistillerPageWebContents : public DistillerPage,
       content::BrowserContext* browser_context,
       const gfx::Size& render_view_size,
       scoped_ptr<SourcePageHandleWebContents> optional_web_contents_handle);
-  virtual ~DistillerPageWebContents();
+  ~DistillerPageWebContents() override;
 
   // content::WebContentsDelegate implementation.
-  virtual gfx::Size GetSizeForNewRenderView(
+  gfx::Size GetSizeForNewRenderView(
       content::WebContents* web_contents) const override;
 
   // content::WebContentsObserver implementation.
-  virtual void DocumentLoadedInFrame(
+  void DocumentLoadedInFrame(
       content::RenderFrameHost* render_frame_host) override;
 
-  virtual void DidFailLoad(content::RenderFrameHost* render_frame_host,
-                           const GURL& validated_url,
-                           int error_code,
-                           const base::string16& error_description) override;
+  void DidFailLoad(content::RenderFrameHost* render_frame_host,
+                   const GURL& validated_url,
+                   int error_code,
+                   const base::string16& error_description) override;
 
  protected:
-  virtual void DistillPageImpl(const GURL& url,
-                               const std::string& script) override;
+  void DistillPageImpl(const GURL& url, const std::string& script) override;
 
  private:
   friend class TestDistillerPageWebContents;
diff --git a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc
index 5a96d14..d769615 100644
--- a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc
+++ b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc
@@ -38,7 +38,7 @@ const char* kVideoArticlePath = "/video_article.html";
 class DistillerPageWebContentsTest : public ContentBrowserTest {
  public:
   // ContentBrowserTest:
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     AddComponentsResources();
     SetUpTestServer();
     ContentBrowserTest::SetUpOnMainThread();
@@ -103,7 +103,7 @@ class TestDistillerPageWebContents : public DistillerPageWebContents {
         expect_new_web_contents_(expect_new_web_contents),
         new_web_contents_created_(false) {}
 
-  virtual void CreateNewWebContents(const GURL& url) override {
+  void CreateNewWebContents(const GURL& url) override {
     ASSERT_EQ(true, expect_new_web_contents_);
     new_web_contents_created_ = true;
     // DistillerPageWebContents::CreateNewWebContents resets the scoped_ptr to
@@ -114,7 +114,7 @@ class TestDistillerPageWebContents : public DistillerPageWebContents {
     DistillerPageWebContents::CreateNewWebContents(url);
   }
 
-  virtual ~TestDistillerPageWebContents() {
+  ~TestDistillerPageWebContents() override {
     if (!expect_new_web_contents_) {
       // Intentionally leaking WebContents, since it is owned by the shell.
       content::WebContents* web_contents = web_contents_.release();
@@ -142,7 +142,7 @@ class WebContentsMainFrameHelper : public content::WebContentsObserver {
         callback_(callback),
         wait_for_document_loaded_(wait_for_document_loaded) {}
 
-  virtual void DidCommitProvisionalLoadForFrame(
+  void DidCommitProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& url,
       ui::PageTransition transition_type) override {
@@ -152,7 +152,7 @@ class WebContentsMainFrameHelper : public content::WebContentsObserver {
       callback_.Run();
   }
 
-  virtual void DocumentLoadedInFrame(
+  void DocumentLoadedInFrame(
       content::RenderFrameHost* render_frame_host) override {
     if (wait_for_document_loaded_) {
       if (!render_frame_host->GetParent())
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source.cc b/components/dom_distiller/content/dom_distiller_viewer_source.cc
index 9c844d6..5d6bb6ab 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/dom_distiller_viewer_source.cc
@@ -44,25 +44,23 @@ class DomDistillerViewerSource::RequestViewerHandle
       const std::string& expected_request_path,
       const content::URLDataSource::GotDataCallback& callback,
       DistilledPagePrefs* distilled_page_prefs);
-  virtual ~RequestViewerHandle();
+  ~RequestViewerHandle() override;
 
   // ViewRequestDelegate implementation:
-  virtual void OnArticleReady(
-      const DistilledArticleProto* article_proto) override;
+  void OnArticleReady(const DistilledArticleProto* article_proto) override;
 
-  virtual void OnArticleUpdated(
-      ArticleDistillationUpdate article_update) override;
+  void OnArticleUpdated(ArticleDistillationUpdate article_update) override;
 
   void TakeViewerHandle(scoped_ptr<ViewerHandle> viewer_handle);
 
   // content::WebContentsObserver implementation:
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
-  virtual void RenderProcessGone(base::TerminationStatus status) override;
-  virtual void WebContentsDestroyed() override;
-  virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
-                             const GURL& validated_url) override;
+  void RenderProcessGone(base::TerminationStatus status) override;
+  void WebContentsDestroyed() override;
+  void DidFinishLoad(content::RenderFrameHost* render_frame_host,
+                     const GURL& validated_url) override;
 
  private:
   // Sends JavaScript to the attached Viewer, buffering data if the viewer isn't
@@ -75,9 +73,9 @@ class DomDistillerViewerSource::RequestViewerHandle
   void Cancel();
 
   // DistilledPagePrefs::Observer implementation:
-  virtual void OnChangeFontFamily(
+  void OnChangeFontFamily(
       DistilledPagePrefs::FontFamily new_font_family) override;
-  virtual void OnChangeTheme(DistilledPagePrefs::Theme new_theme) override;
+  void OnChangeTheme(DistilledPagePrefs::Theme new_theme) override;
 
   // The handle to the view request towards the DomDistillerService. It
   // needs to be kept around to ensure the distillation request finishes.
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source.h b/components/dom_distiller/content/dom_distiller_viewer_source.h
index d9eaf9f..5a9721e 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source.h
+++ b/components/dom_distiller/content/dom_distiller_viewer_source.h
@@ -23,23 +23,22 @@ class DomDistillerViewerSource : public content::URLDataSource {
  public:
   DomDistillerViewerSource(DomDistillerServiceInterface* dom_distiller_service,
                            const std::string& scheme);
-  virtual ~DomDistillerViewerSource();
+  ~DomDistillerViewerSource() override;
 
   class RequestViewerHandle;
 
   // Overridden from content::URLDataSource:
-  virtual std::string GetSource() const override;
-  virtual void StartDataRequest(
+  std::string GetSource() const override;
+  void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
       const content::URLDataSource::GotDataCallback& callback) override;
-  virtual std::string GetMimeType(const std::string& path) const override;
-  virtual bool ShouldServiceRequest(
-      const net::URLRequest* request) const override;
-  virtual void WillServiceRequest(const net::URLRequest* request,
-                                  std::string* path) const override;
-  virtual std::string GetContentSecurityPolicyObjectSrc() const override;
+  std::string GetMimeType(const std::string& path) const override;
+  bool ShouldServiceRequest(const net::URLRequest* request) const override;
+  void WillServiceRequest(const net::URLRequest* request,
+                          std::string* path) const override;
+  std::string GetContentSecurityPolicyObjectSrc() const override;
 
  private:
   friend class DomDistillerViewerSourceTest;
diff --git a/components/dom_distiller/content/web_contents_main_frame_observer.h b/components/dom_distiller/content/web_contents_main_frame_observer.h
index 7d9a85b..e1a6299 100644
--- a/components/dom_distiller/content/web_contents_main_frame_observer.h
+++ b/components/dom_distiller/content/web_contents_main_frame_observer.h
@@ -18,7 +18,7 @@ class WebContentsMainFrameObserver
     : public content::WebContentsObserver,
       public content::WebContentsUserData<WebContentsMainFrameObserver> {
  public:
-  virtual ~WebContentsMainFrameObserver();
+  ~WebContentsMainFrameObserver() override;
 
   bool is_document_loaded_in_main_frame() {
     return is_document_loaded_in_main_frame_;
@@ -27,12 +27,12 @@ class WebContentsMainFrameObserver
   bool is_initialized() { return is_initialized_; }
 
   // content::WebContentsObserver implementation.
-  virtual void DocumentLoadedInFrame(
+  void DocumentLoadedInFrame(
       content::RenderFrameHost* render_frame_host) override;
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
-  virtual void RenderProcessGone(base::TerminationStatus status) override;
+  void RenderProcessGone(base::TerminationStatus status) override;
 
  private:
   explicit WebContentsMainFrameObserver(content::WebContents* web_contents);
diff --git a/components/dom_distiller/core/distilled_content_store.h b/components/dom_distiller/core/distilled_content_store.h
index 4312b01..0063dd3 100644
--- a/components/dom_distiller/core/distilled_content_store.h
+++ b/components/dom_distiller/core/distilled_content_store.h
@@ -45,14 +45,13 @@ class DistilledContentStore {
 class InMemoryContentStore : public DistilledContentStore {
  public:
   explicit InMemoryContentStore(const int max_num_entries);
-  virtual ~InMemoryContentStore();
+  ~InMemoryContentStore() override;
 
   // DistilledContentStore implementation
-  virtual void SaveContent(const ArticleEntry& entry,
-                           const DistilledArticleProto& proto,
-                           SaveCallback callback) override;
-  virtual void LoadContent(const ArticleEntry& entry,
-                           LoadCallback callback) override;
+  void SaveContent(const ArticleEntry& entry,
+                   const DistilledArticleProto& proto,
+                   SaveCallback callback) override;
+  void LoadContent(const ArticleEntry& entry, LoadCallback callback) override;
 
   // Synchronously saves the content.
   void InjectContent(const ArticleEntry& entry,
diff --git a/components/dom_distiller/core/distilled_page_prefs_unittests.cc b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
index 665fbc9..cf13fce 100644
--- a/components/dom_distiller/core/distilled_page_prefs_unittests.cc
+++ b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
@@ -19,14 +19,13 @@ class TestingObserver : public DistilledPagePrefs::Observer {
       : font_(DistilledPagePrefs::SANS_SERIF),
         theme_(DistilledPagePrefs::LIGHT) {}
 
-  virtual void OnChangeFontFamily(
-      DistilledPagePrefs::FontFamily new_font) override {
+  void OnChangeFontFamily(DistilledPagePrefs::FontFamily new_font) override {
     font_ = new_font;
   }
 
   DistilledPagePrefs::FontFamily GetFontFamily() { return font_; }
 
-  virtual void OnChangeTheme(DistilledPagePrefs::Theme new_theme) override {
+  void OnChangeTheme(DistilledPagePrefs::Theme new_theme) override {
     theme_ = new_theme;
   }
 
diff --git a/components/dom_distiller/core/distiller.h b/components/dom_distiller/core/distiller.h
index 425eed8..9f959db 100644
--- a/components/dom_distiller/core/distiller.h
+++ b/components/dom_distiller/core/distiller.h
@@ -58,8 +58,8 @@ class DistillerFactoryImpl : public DistillerFactory {
   DistillerFactoryImpl(
       scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory,
       const dom_distiller::proto::DomDistillerOptions& dom_distiller_options);
-  virtual ~DistillerFactoryImpl();
-  virtual scoped_ptr<Distiller> CreateDistiller() override;
+  ~DistillerFactoryImpl() override;
+  scoped_ptr<Distiller> CreateDistiller() override;
 
  private:
   scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory_;
@@ -72,13 +72,12 @@ class DistillerImpl : public Distiller {
   DistillerImpl(
       const DistillerURLFetcherFactory& distiller_url_fetcher_factory,
       const dom_distiller::proto::DomDistillerOptions& dom_distiller_options);
-  virtual ~DistillerImpl();
+  ~DistillerImpl() override;
 
-  virtual void DistillPage(
-      const GURL& url,
-      scoped_ptr<DistillerPage> distiller_page,
-      const DistillationFinishedCallback& finished_cb,
-      const DistillationUpdateCallback& update_cb) override;
+  void DistillPage(const GURL& url,
+                   scoped_ptr<DistillerPage> distiller_page,
+                   const DistillationFinishedCallback& finished_cb,
+                   const DistillationUpdateCallback& update_cb) override;
 
   void SetMaxNumPagesInArticle(size_t max_num_pages);
 
diff --git a/components/dom_distiller/core/distiller_unittest.cc b/components/dom_distiller/core/distiller_unittest.cc
index 573818c..a6ef019 100644
--- a/components/dom_distiller/core/distiller_unittest.cc
+++ b/components/dom_distiller/core/distiller_unittest.cc
@@ -200,8 +200,8 @@ class TestDistillerURLFetcher : public DistillerURLFetcher {
     responses_[kImageURLs[1]] = string(kImageData[1]);
   }
 
-  virtual void FetchURL(const string& url,
-                        const URLFetcherCallback& callback) override {
+  void FetchURL(const string& url,
+                const URLFetcherCallback& callback) override {
     ASSERT_FALSE(callback.is_null());
     url_ = url;
     callback_ = callback;
@@ -228,8 +228,8 @@ class TestDistillerURLFetcherFactory : public DistillerURLFetcherFactory {
  public:
   TestDistillerURLFetcherFactory() : DistillerURLFetcherFactory(NULL) {}
 
-  virtual ~TestDistillerURLFetcherFactory() {}
-  virtual DistillerURLFetcher* CreateDistillerURLFetcher() const override {
+  ~TestDistillerURLFetcherFactory() override {}
+  DistillerURLFetcher* CreateDistillerURLFetcher() const override {
     return new TestDistillerURLFetcher(false);
   }
 };
diff --git a/components/dom_distiller/core/distiller_url_fetcher.h b/components/dom_distiller/core/distiller_url_fetcher.h
index 203136d..4ed91cd 100644
--- a/components/dom_distiller/core/distiller_url_fetcher.h
+++ b/components/dom_distiller/core/distiller_url_fetcher.h
@@ -33,7 +33,7 @@ class DistillerURLFetcherFactory {
 class DistillerURLFetcher : public net::URLFetcherDelegate {
  public:
   explicit DistillerURLFetcher(net::URLRequestContextGetter* context_getter);
-  virtual ~DistillerURLFetcher();
+  ~DistillerURLFetcher() override;
 
   // Indicates when a fetch is done.
   typedef base::Callback<void(const std::string& data)> URLFetcherCallback;
@@ -49,7 +49,7 @@ class DistillerURLFetcher : public net::URLFetcherDelegate {
 
  private:
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   scoped_ptr<net::URLFetcher> url_fetcher_;
   URLFetcherCallback callback_;
diff --git a/components/dom_distiller/core/dom_distiller_service.h b/components/dom_distiller/core/dom_distiller_service.h
index 182cfb3..f227c73 100644
--- a/components/dom_distiller/core/dom_distiller_service.h
+++ b/components/dom_distiller/core/dom_distiller_service.h
@@ -118,34 +118,31 @@ class DomDistillerService : public DomDistillerServiceInterface {
                       scoped_ptr<DistillerFactory> distiller_factory,
                       scoped_ptr<DistillerPageFactory> distiller_page_factory,
                       scoped_ptr<DistilledPagePrefs> distilled_page_prefs);
-  virtual ~DomDistillerService();
+  ~DomDistillerService() override;
 
   // DomDistillerServiceInterface implementation.
-  virtual syncer::SyncableService* GetSyncableService() const override;
-  virtual const std::string AddToList(
+  syncer::SyncableService* GetSyncableService() const override;
+  const std::string AddToList(
       const GURL& url,
       scoped_ptr<DistillerPage> distiller_page,
       const ArticleAvailableCallback& article_cb) override;
-  virtual bool HasEntry(const std::string& entry_id) override;
-  virtual std::string GetUrlForEntry(const std::string& entry_id) override;
-  virtual std::vector<ArticleEntry> GetEntries() const override;
-  virtual scoped_ptr<ArticleEntry> RemoveEntry(
-      const std::string& entry_id) override;
-  virtual scoped_ptr<ViewerHandle> ViewEntry(
-      ViewRequestDelegate* delegate,
-      scoped_ptr<DistillerPage> distiller_page,
-      const std::string& entry_id) override;
-  virtual scoped_ptr<ViewerHandle> ViewUrl(
-      ViewRequestDelegate* delegate,
-      scoped_ptr<DistillerPage> distiller_page,
-      const GURL& url) override;
-  virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPage(
+  bool HasEntry(const std::string& entry_id) override;
+  std::string GetUrlForEntry(const std::string& entry_id) override;
+  std::vector<ArticleEntry> GetEntries() const override;
+  scoped_ptr<ArticleEntry> RemoveEntry(const std::string& entry_id) override;
+  scoped_ptr<ViewerHandle> ViewEntry(ViewRequestDelegate* delegate,
+                                     scoped_ptr<DistillerPage> distiller_page,
+                                     const std::string& entry_id) override;
+  scoped_ptr<ViewerHandle> ViewUrl(ViewRequestDelegate* delegate,
+                                   scoped_ptr<DistillerPage> distiller_page,
+                                   const GURL& url) override;
+  scoped_ptr<DistillerPage> CreateDefaultDistillerPage(
       const gfx::Size& render_view_size) override;
-  virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPageWithHandle(
+  scoped_ptr<DistillerPage> CreateDefaultDistillerPageWithHandle(
       scoped_ptr<SourcePageHandle> handle) override;
-  virtual void AddObserver(DomDistillerObserver* observer) override;
-  virtual void RemoveObserver(DomDistillerObserver* observer) override;
-  virtual DistilledPagePrefs* GetDistilledPagePrefs() override;
+  void AddObserver(DomDistillerObserver* observer) override;
+  void RemoveObserver(DomDistillerObserver* observer) override;
+  DistilledPagePrefs* GetDistilledPagePrefs() override;
 
  private:
   void CancelTask(TaskTracker* task);
diff --git a/components/dom_distiller/core/dom_distiller_store.h b/components/dom_distiller/core/dom_distiller_store.h
index 563927b..186c273 100644
--- a/components/dom_distiller/core/dom_distiller_store.h
+++ b/components/dom_distiller/core/dom_distiller_store.h
@@ -92,29 +92,28 @@ class DomDistillerStore : public syncer::SyncableService,
       const std::vector<ArticleEntry>& initial_data,
       const base::FilePath& database_dir);
 
-  virtual ~DomDistillerStore();
+  ~DomDistillerStore() override;
 
   // DomDistillerStoreInterface implementation.
-  virtual syncer::SyncableService* GetSyncableService() override;
-  virtual bool AddEntry(const ArticleEntry& entry) override;
-  virtual bool UpdateEntry(const ArticleEntry& entry) override;
-  virtual bool RemoveEntry(const ArticleEntry& entry) override;
-  virtual bool GetEntryById(const std::string& entry_id,
-                            ArticleEntry* entry) override;
-  virtual bool GetEntryByUrl(const GURL& url, ArticleEntry* entry) override;
-  virtual std::vector<ArticleEntry> GetEntries() const override;
-  virtual void AddObserver(DomDistillerObserver* observer) override;
-  virtual void RemoveObserver(DomDistillerObserver* observer) override;
+  syncer::SyncableService* GetSyncableService() override;
+  bool AddEntry(const ArticleEntry& entry) override;
+  bool UpdateEntry(const ArticleEntry& entry) override;
+  bool RemoveEntry(const ArticleEntry& entry) override;
+  bool GetEntryById(const std::string& entry_id, ArticleEntry* entry) override;
+  bool GetEntryByUrl(const GURL& url, ArticleEntry* entry) override;
+  std::vector<ArticleEntry> GetEntries() const override;
+  void AddObserver(DomDistillerObserver* observer) override;
+  void RemoveObserver(DomDistillerObserver* observer) override;
 
   // syncer::SyncableService implementation.
-  virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
-      syncer::ModelType type, const syncer::SyncDataList& initial_sync_data,
+  syncer::SyncMergeResult MergeDataAndStartSyncing(
+      syncer::ModelType type,
+      const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
-  virtual void StopSyncing(syncer::ModelType type) override;
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const override;
-  virtual syncer::SyncError ProcessSyncChanges(
+  void StopSyncing(syncer::ModelType type) override;
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
 
diff --git a/components/dom_distiller/core/dom_distiller_store_unittest.cc b/components/dom_distiller/core/dom_distiller_store_unittest.cc
index b7ebfb3..b84f2b0 100644
--- a/components/dom_distiller/core/dom_distiller_store_unittest.cc
+++ b/components/dom_distiller/core/dom_distiller_store_unittest.cc
@@ -48,7 +48,7 @@ void AddEntry(const ArticleEntry& e, EntryMap* map) {
 
 class FakeSyncErrorFactory : public syncer::SyncErrorFactory {
  public:
-  virtual syncer::SyncError CreateAndUploadError(
+  syncer::SyncError CreateAndUploadError(
       const tracked_objects::Location& location,
       const std::string& message) override {
     return syncer::SyncError();
@@ -59,15 +59,13 @@ class FakeSyncChangeProcessor : public syncer::SyncChangeProcessor {
  public:
   explicit FakeSyncChangeProcessor(EntryMap* model) : model_(model) {}
 
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const override {
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override {
     ADD_FAILURE() << "FakeSyncChangeProcessor::GetAllSyncData not implemented.";
     return syncer::SyncDataList();
   }
 
-  virtual SyncError ProcessSyncChanges(
-      const tracked_objects::Location&,
-      const syncer::SyncChangeList& changes) override {
+  SyncError ProcessSyncChanges(const tracked_objects::Location&,
+                               const syncer::SyncChangeList& changes) override {
     for (SyncChangeList::const_iterator it = changes.begin();
          it != changes.end(); ++it) {
       AddEntry(GetEntryFromChange(*it), model_);
diff --git a/components/dom_distiller/webui/dom_distiller_handler.h b/components/dom_distiller/webui/dom_distiller_handler.h
index b0aa026..286befe 100644
--- a/components/dom_distiller/webui/dom_distiller_handler.h
+++ b/components/dom_distiller/webui/dom_distiller_handler.h
@@ -20,10 +20,10 @@ class DomDistillerHandler : public content::WebUIMessageHandler {
  public:
   // The lifetime of |service| has to outlive this handler.
   DomDistillerHandler(DomDistillerService* service, const std::string& scheme);
-  virtual ~DomDistillerHandler();
+  ~DomDistillerHandler() override;
 
   // content::WebUIMessageHandler implementation.
-  virtual void RegisterMessages() override;
+  void RegisterMessages() override;
 
   // Callback from JavaScript for the "requestEntries" message. This
   // requests the list of entries and returns it to the front end by calling
diff --git a/components/dom_distiller/webui/dom_distiller_ui.h b/components/dom_distiller/webui/dom_distiller_ui.h
index c0a5cc8..24939ab 100644
--- a/components/dom_distiller/webui/dom_distiller_ui.h
+++ b/components/dom_distiller/webui/dom_distiller_ui.h
@@ -19,7 +19,7 @@ class DomDistillerUi : public content::WebUIController {
   DomDistillerUi(content::WebUI* web_ui,
                  DomDistillerService* service,
                  const std::string& scheme);
-  virtual ~DomDistillerUi();
+  ~DomDistillerUi() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DomDistillerUi);
diff --git a/components/domain_reliability/service.cc b/components/domain_reliability/service.cc
index 9ca7fdd..3ce1cb1 100644
--- a/components/domain_reliability/service.cc
+++ b/components/domain_reliability/service.cc
@@ -35,11 +35,11 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
       const std::string& upload_reporter_string)
       : upload_reporter_string_(upload_reporter_string) {}
 
-  virtual ~DomainReliabilityServiceImpl() {}
+  ~DomainReliabilityServiceImpl() override {}
 
   // DomainReliabilityService implementation:
 
-  virtual scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
+  scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
       override {
     DCHECK(!network_task_runner_.get());
@@ -55,8 +55,8 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
     return monitor.Pass();
   }
 
-  virtual void ClearBrowsingData(DomainReliabilityClearMode clear_mode,
-                                 const base::Closure& callback) override {
+  void ClearBrowsingData(DomainReliabilityClearMode clear_mode,
+                         const base::Closure& callback) override {
     DCHECK(network_task_runner_.get());
 
     network_task_runner_->PostTaskAndReply(
@@ -67,9 +67,8 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
         callback);
   }
 
-  virtual void GetWebUIData(
-      const base::Callback<void(scoped_ptr<base::Value>)>& callback)
-      const override {
+  void GetWebUIData(const base::Callback<void(scoped_ptr<base::Value>)>&
+                        callback) const override {
     DCHECK(network_task_runner_.get());
 
     PostTaskAndReplyWithResult(
diff --git a/components/domain_reliability/service.h b/components/domain_reliability/service.h
index e04e944..9625ae6 100644
--- a/components/domain_reliability/service.h
+++ b/components/domain_reliability/service.h
@@ -42,7 +42,7 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityService
   static DomainReliabilityService* Create(
       const std::string& upload_reporter_string);
 
-  virtual ~DomainReliabilityService();
+  ~DomainReliabilityService() override;
 
   // Initializes the Service: given the task runner on which Monitor methods
   // should be called, creates the Monitor and returns it. Can be called at
diff --git a/components/domain_reliability/test_util.cc b/components/domain_reliability/test_util.cc
index 49d9807..b541bf7 100644
--- a/components/domain_reliability/test_util.cc
+++ b/components/domain_reliability/test_util.cc
@@ -24,12 +24,12 @@ class MockTimer : public MockableTime::Timer {
     DCHECK(time);
   }
 
-  virtual ~MockTimer() {}
+  ~MockTimer() override {}
 
   // MockableTime::Timer implementation:
-  virtual void Start(const tracked_objects::Location& posted_from,
-                     base::TimeDelta delay,
-                     const base::Closure& user_task) override {
+  void Start(const tracked_objects::Location& posted_from,
+             base::TimeDelta delay,
+             const base::Closure& user_task) override {
     DCHECK(!user_task.is_null());
 
     if (running_)
@@ -42,14 +42,14 @@ class MockTimer : public MockableTime::Timer {
                    callback_sequence_number_));
   }
 
-  virtual void Stop() override {
+  void Stop() override {
     if (running_) {
       ++callback_sequence_number_;
       running_ = false;
     }
   }
 
-  virtual bool IsRunning() override { return running_; }
+  bool IsRunning() override { return running_; }
 
  private:
   void OnDelayPassed(int expected_callback_sequence_number) {
diff --git a/components/domain_reliability/test_util.h b/components/domain_reliability/test_util.h
index d8ac1b6..7018c82 100644
--- a/components/domain_reliability/test_util.h
+++ b/components/domain_reliability/test_util.h
@@ -46,16 +46,16 @@ class MockUploader : public DomainReliabilityUploader {
 
   MockUploader(const UploadRequestCallback& callback);
 
-  virtual ~MockUploader();
+  ~MockUploader() override;
 
   virtual bool discard_uploads() const;
 
   // DomainReliabilityUploader implementation:
-  virtual void UploadReport(const std::string& report_json,
-                            const GURL& upload_url,
-                            const UploadCallback& callback) override;
+  void UploadReport(const std::string& report_json,
+                    const GURL& upload_url,
+                    const UploadCallback& callback) override;
 
-  virtual void set_discard_uploads(bool discard_uploads) override;
+  void set_discard_uploads(bool discard_uploads) override;
 
  private:
   UploadRequestCallback callback_;
@@ -69,12 +69,12 @@ class MockTime : public MockableTime {
   // N.B.: Tasks (and therefore Timers) scheduled to run in the future will
   // never be run if MockTime is destroyed before the mock time is advanced
   // to their scheduled time.
-  virtual ~MockTime();
+  ~MockTime() override;
 
   // MockableTime implementation:
-  virtual base::Time Now() override;
-  virtual base::TimeTicks NowTicks() override;
-  virtual scoped_ptr<MockableTime::Timer> CreateTimer() override;
+  base::Time Now() override;
+  base::TimeTicks NowTicks() override;
+  scoped_ptr<MockableTime::Timer> CreateTimer() override;
 
   // Pretends that |delta| has passed, and runs tasks that would've happened
   // during that interval (with |Now()| returning proper values while they
diff --git a/components/domain_reliability/uploader.cc b/components/domain_reliability/uploader.cc
index 3a9e7b0..1008456 100644
--- a/components/domain_reliability/uploader.cc
+++ b/components/domain_reliability/uploader.cc
@@ -46,14 +46,14 @@ class DomainReliabilityUploaderImpl
       : url_request_context_getter_(url_request_context_getter),
         discard_uploads_(true) {}
 
-  virtual ~DomainReliabilityUploaderImpl() {
+  ~DomainReliabilityUploaderImpl() override {
     // Delete any in-flight URLFetchers.
     STLDeleteContainerPairFirstPointers(
         upload_callbacks_.begin(), upload_callbacks_.end());
   }
 
   // DomainReliabilityUploader implementation:
-  virtual void UploadReport(
+  void UploadReport(
       const std::string& report_json,
       const GURL& upload_url,
       const DomainReliabilityUploader::UploadCallback& callback) override {
@@ -81,14 +81,13 @@ class DomainReliabilityUploaderImpl
     upload_callbacks_[fetcher] = callback;
   }
 
-  virtual void set_discard_uploads(bool discard_uploads) override {
+  void set_discard_uploads(bool discard_uploads) override {
     discard_uploads_ = discard_uploads;
     VLOG(1) << "Setting discard_uploads to " << discard_uploads;
   }
 
   // net::URLFetcherDelegate implementation:
-  virtual void OnURLFetchComplete(
-      const net::URLFetcher* fetcher) override {
+  void OnURLFetchComplete(const net::URLFetcher* fetcher) override {
     DCHECK(fetcher);
 
     UploadCallbackMap::iterator callback_it = upload_callbacks_.find(fetcher);
diff --git a/components/domain_reliability/util.cc b/components/domain_reliability/util.cc
index c7b83b2..0fc03a5 100644
--- a/components/domain_reliability/util.cc
+++ b/components/domain_reliability/util.cc
@@ -20,22 +20,18 @@ class ActualTimer : public MockableTime::Timer {
   // Initialize base timer with retain_user_info and is_repeating false.
   ActualTimer() : base_timer_(false, false) {}
 
-  virtual ~ActualTimer() {}
+  ~ActualTimer() override {}
 
   // MockableTime::Timer implementation:
-  virtual void Start(const tracked_objects::Location& posted_from,
-                     base::TimeDelta delay,
-                     const base::Closure& user_task) override {
+  void Start(const tracked_objects::Location& posted_from,
+             base::TimeDelta delay,
+             const base::Closure& user_task) override {
     base_timer_.Start(posted_from, delay, user_task);
   }
 
-  virtual void Stop() override {
-    base_timer_.Stop();
-  }
+  void Stop() override { base_timer_.Stop(); }
 
-  virtual bool IsRunning() override {
-    return base_timer_.IsRunning();
-  }
+  bool IsRunning() override { return base_timer_.IsRunning(); }
 
  private:
   base::Timer base_timer_;
diff --git a/components/domain_reliability/util.h b/components/domain_reliability/util.h
index 6b142c6..80699d4 100644
--- a/components/domain_reliability/util.h
+++ b/components/domain_reliability/util.h
@@ -74,12 +74,12 @@ class DOMAIN_RELIABILITY_EXPORT ActualTime : public MockableTime {
  public:
   ActualTime();
 
-  virtual ~ActualTime();
+  ~ActualTime() override;
 
   // MockableTime implementation:
-  virtual base::Time Now() override;
-  virtual base::TimeTicks NowTicks() override;
-  virtual scoped_ptr<MockableTime::Timer> CreateTimer() override;
+  base::Time Now() override;
+  base::TimeTicks NowTicks() override;
+  scoped_ptr<MockableTime::Timer> CreateTimer() override;
 };
 
 }  // namespace domain_reliability
diff --git a/components/enhanced_bookmarks/bookmark_image_service.h b/components/enhanced_bookmarks/bookmark_image_service.h
index 67abac7..8b36b70 100644
--- a/components/enhanced_bookmarks/bookmark_image_service.h
+++ b/components/enhanced_bookmarks/bookmark_image_service.h
@@ -34,12 +34,12 @@ class BookmarkImageService : public KeyedService,
                        EnhancedBookmarkModel* enhanced_bookmark_model,
                        scoped_refptr<base::SequencedWorkerPool> pool);
 
-  virtual ~BookmarkImageService();
+  ~BookmarkImageService() override;
 
   typedef base::Callback<void(const gfx::Image&, const GURL& url)> Callback;
 
   // KeyedService:
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Returns a salient image for a URL. This may trigger a network request for
   // the image if the image was not retrieved before and if a bookmark node has
@@ -49,32 +49,30 @@ class BookmarkImageService : public KeyedService,
   void SalientImageForUrl(const GURL& page_url, Callback callback);
 
   // BookmarkModelObserver methods.
-  virtual void BookmarkNodeRemoved(BookmarkModel* model,
-                                   const BookmarkNode* parent,
-                                   int old_index,
-                                   const BookmarkNode* node,
+  void BookmarkNodeRemoved(BookmarkModel* model,
+                           const BookmarkNode* parent,
+                           int old_index,
+                           const BookmarkNode* node,
+                           const std::set<GURL>& removed_urls) override;
+  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 OnWillChangeBookmarkNode(BookmarkModel* model,
+                                const BookmarkNode* node) override;
+  void BookmarkNodeChanged(BookmarkModel* model,
+                           const BookmarkNode* node) override;
+  void BookmarkNodeFaviconChanged(BookmarkModel* model,
+                                  const BookmarkNode* node) override;
+  void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                     const BookmarkNode* node) override;
+  void BookmarkAllUserNodesRemoved(BookmarkModel* model,
                                    const std::set<GURL>& removed_urls) override;
-  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 OnWillChangeBookmarkNode(BookmarkModel* model,
-                                        const BookmarkNode* node) override;
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) override;
-  virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) override;
-  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) override;
-  virtual void BookmarkAllUserNodesRemoved(
-      BookmarkModel* model,
-      const std::set<GURL>& removed_urls) override;
 
  protected:
   // Returns true if the image for the page_url is currently being fetched.
diff --git a/components/enhanced_bookmarks/bookmark_server_cluster_service.h b/components/enhanced_bookmarks/bookmark_server_cluster_service.h
index ae7cc08..717d49f 100644
--- a/components/enhanced_bookmarks/bookmark_server_cluster_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_cluster_service.h
@@ -38,7 +38,7 @@ class BookmarkServerClusterService : public KeyedService,
       SigninManagerBase* signin_manager,
       EnhancedBookmarkModel* enhanced_bookmark_model,
       PrefService* pref_service);
-  virtual ~BookmarkServerClusterService();
+  ~BookmarkServerClusterService() override;
 
   // Retrieves all the bookmarks associated with a cluster. The returned
   // BookmarkNodes are owned by the bookmark model, and one must listen to the
@@ -58,20 +58,19 @@ class BookmarkServerClusterService : public KeyedService,
 
  protected:
   // BookmarkServerService methods.
-  virtual scoped_ptr<net::URLFetcher> CreateFetcher() override;
-  virtual bool ProcessResponse(const std::string& response,
-                               bool* should_notify) override;
-  virtual void CleanAfterFailure() override;
+  scoped_ptr<net::URLFetcher> CreateFetcher() override;
+  bool ProcessResponse(const std::string& response,
+                       bool* should_notify) override;
+  void CleanAfterFailure() override;
 
   // EnhancedBookmarkModelObserver methods.
-  virtual void EnhancedBookmarkModelLoaded() override;
-  virtual void EnhancedBookmarkAdded(const BookmarkNode* node) override;
-  virtual void EnhancedBookmarkRemoved(const BookmarkNode* node) override;
-  virtual void EnhancedBookmarkAllUserNodesRemoved() override;
-  virtual void EnhancedBookmarkRemoteIdChanged(
-      const BookmarkNode* node,
-      const std::string& old_remote_id,
-      const std::string& remote_id) override;
+  void EnhancedBookmarkModelLoaded() override;
+  void EnhancedBookmarkAdded(const BookmarkNode* node) override;
+  void EnhancedBookmarkRemoved(const BookmarkNode* node) override;
+  void EnhancedBookmarkAllUserNodesRemoved() override;
+  void EnhancedBookmarkRemoteIdChanged(const BookmarkNode* node,
+                                       const std::string& old_remote_id,
+                                       const std::string& remote_id) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, Cluster);
@@ -84,8 +83,8 @@ class BookmarkServerClusterService : public KeyedService,
                            ClearClusterMapOnRemoveAllBookmarks);
 
   // Overriden from SigninManagerBase::Observer.
-  virtual void GoogleSignedOut(const std::string& account_id,
-                               const std::string& username) override;
+  void GoogleSignedOut(const std::string& account_id,
+                       const std::string& username) override;
 
   // Updates |cluster_data_| with the |cluster_map| and saves the result to
   // profile prefs. All changes to |cluster_data_| should go through this method
diff --git a/components/enhanced_bookmarks/bookmark_server_search_service.h b/components/enhanced_bookmarks/bookmark_server_search_service.h
index 946b184..9771318 100644
--- a/components/enhanced_bookmarks/bookmark_server_search_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_search_service.h
@@ -24,7 +24,7 @@ class BookmarkServerSearchService : public BookmarkServerService {
       ProfileOAuth2TokenService* token_service,
       SigninManagerBase* signin_manager,
       EnhancedBookmarkModel* bookmark_model);
-  virtual ~BookmarkServerSearchService();
+  ~BookmarkServerSearchService() override;
 
   // Triggers a search. The query must not be empty. A call to this method
   // cancels any previous searches. OnChange() is garanteed to be called once
@@ -37,22 +37,21 @@ class BookmarkServerSearchService : public BookmarkServerService {
   std::vector<const BookmarkNode*> ResultForQuery(const std::string& query);
 
  protected:
-  virtual scoped_ptr<net::URLFetcher> CreateFetcher() override;
+  scoped_ptr<net::URLFetcher> CreateFetcher() override;
 
-  virtual bool ProcessResponse(const std::string& response,
-                               bool* should_notify) override;
+  bool ProcessResponse(const std::string& response,
+                       bool* should_notify) override;
 
-  virtual void CleanAfterFailure() override;
+  void CleanAfterFailure() override;
 
   // EnhancedBookmarkModelObserver methods.
-  virtual void EnhancedBookmarkModelLoaded() override{};
-  virtual void EnhancedBookmarkAdded(const BookmarkNode* node) override;
-  virtual void EnhancedBookmarkRemoved(const BookmarkNode* node) override{};
-  virtual void EnhancedBookmarkAllUserNodesRemoved() override;
-  virtual void EnhancedBookmarkRemoteIdChanged(
-      const BookmarkNode* node,
-      const std::string& old_remote_id,
-      const std::string& remote_id) override;
+  void EnhancedBookmarkModelLoaded() override{};
+  void EnhancedBookmarkAdded(const BookmarkNode* node) override;
+  void EnhancedBookmarkRemoved(const BookmarkNode* node) override{};
+  void EnhancedBookmarkAllUserNodesRemoved() override;
+  void EnhancedBookmarkRemoteIdChanged(const BookmarkNode* node,
+                                       const std::string& old_remote_id,
+                                       const std::string& remote_id) override;
 
  private:
   // The search data, a map from query to a vector of stars.id.
diff --git a/components/enhanced_bookmarks/bookmark_server_service.h b/components/enhanced_bookmarks/bookmark_server_service.h
index 42e848d..41416fd 100644
--- a/components/enhanced_bookmarks/bookmark_server_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_service.h
@@ -45,7 +45,7 @@ class BookmarkServerService : protected net::URLFetcherDelegate,
       ProfileOAuth2TokenService* token_service,
       SigninManagerBase* signin_manager,
       EnhancedBookmarkModel* enhanced_bookmark_model);
-  virtual ~BookmarkServerService();
+  ~BookmarkServerService() override;
 
   virtual void AddObserver(BookmarkServerServiceObserver* observer);
   void RemoveObserver(BookmarkServerServiceObserver* observer);
@@ -77,7 +77,7 @@ class BookmarkServerService : protected net::URLFetcherDelegate,
   virtual void CleanAfterFailure() = 0;
 
   // EnhancedBookmarkModelObserver:
-  virtual void EnhancedBookmarkModelShuttingDown() override;
+  void EnhancedBookmarkModelShuttingDown() override;
 
   SigninManagerBase* GetSigninManager();
 
@@ -95,14 +95,14 @@ class BookmarkServerService : protected net::URLFetcherDelegate,
                            ClearClusterMapOnRemoveAllBookmarks);
 
   // net::URLFetcherDelegate methods. Called when the query is finished.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // OAuth2TokenService::Consumer methods.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // The Auth service is used to get a token for auth with the server.
   ProfileOAuth2TokenService* token_service_;  // Weak
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model.h b/components/enhanced_bookmarks/enhanced_bookmark_model.h
index d46e7d9..d708d8d 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model.h
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model.h
@@ -38,9 +38,9 @@ class EnhancedBookmarkModel : public KeyedService,
  public:
   EnhancedBookmarkModel(BookmarkModel* bookmark_model,
                         const std::string& version);
-  virtual ~EnhancedBookmarkModel();
+  ~EnhancedBookmarkModel() override;
 
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   void AddObserver(EnhancedBookmarkModelObserver* observer);
   void RemoveObserver(EnhancedBookmarkModelObserver* observer);
@@ -139,24 +139,22 @@ class EnhancedBookmarkModel : public KeyedService,
   typedef std::map<const BookmarkNode*, std::string> NodeToIdMap;
 
   // BaseBookmarkModelObserver:
-  virtual void BookmarkModelChanged() override;
-  virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) 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,
+  void BookmarkModelChanged() override;
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) 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 OnWillChangeBookmarkMetaInfo(BookmarkModel* model,
+                                    const BookmarkNode* node) override;
+  void BookmarkMetaInfoChanged(BookmarkModel* model,
+                               const BookmarkNode* node) override;
+  void BookmarkAllUserNodesRemoved(BookmarkModel* model,
                                    const std::set<GURL>& removed_urls) override;
-  virtual void OnWillChangeBookmarkMetaInfo(BookmarkModel* model,
-                                            const BookmarkNode* node) override;
-  virtual void BookmarkMetaInfoChanged(BookmarkModel* model,
-                                       const BookmarkNode* node) override;
-  virtual void BookmarkAllUserNodesRemoved(
-      BookmarkModel* model,
-      const std::set<GURL>& removed_urls) override;
 
   // Initialize the mapping from remote ids to nodes.
   void InitializeIdMap();
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
index 8db03d0..4d9f2e7 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
@@ -108,25 +108,22 @@ class EnhancedBookmarkModelTest
   scoped_ptr<EnhancedBookmarkModel> model_;
 
   // EnhancedBookmarkModelObserver implementation:
-  virtual void EnhancedBookmarkModelLoaded() override { loaded_calls_++; }
-  virtual void EnhancedBookmarkModelShuttingDown() override {
-    shutting_down_calls_++;
-  }
-  virtual void EnhancedBookmarkAdded(const BookmarkNode* node) override {
+  void EnhancedBookmarkModelLoaded() override { loaded_calls_++; }
+  void EnhancedBookmarkModelShuttingDown() override { shutting_down_calls_++; }
+  void EnhancedBookmarkAdded(const BookmarkNode* node) override {
     added_calls_++;
     last_added_ = node;
   }
-  virtual void EnhancedBookmarkRemoved(const BookmarkNode* node) override {
+  void EnhancedBookmarkRemoved(const BookmarkNode* node) override {
     removed_calls_++;
     last_removed_ = node;
   }
-  virtual void EnhancedBookmarkAllUserNodesRemoved() override {
+  void EnhancedBookmarkAllUserNodesRemoved() override {
     all_user_nodes_removed_calls_++;
   }
-  virtual void EnhancedBookmarkRemoteIdChanged(
-      const BookmarkNode* node,
-      const std::string& old_remote_id,
-      const std::string& remote_id) override {
+  void EnhancedBookmarkRemoteIdChanged(const BookmarkNode* node,
+                                       const std::string& old_remote_id,
+                                       const std::string& remote_id) override {
     remote_id_changed_calls_++;
     last_remote_id_node_ = node;
     last_old_remote_id_ = old_remote_id;
diff --git a/components/enhanced_bookmarks/persistent_image_store.h b/components/enhanced_bookmarks/persistent_image_store.h
index 5cb0474..bc715a5 100644
--- a/components/enhanced_bookmarks/persistent_image_store.h
+++ b/components/enhanced_bookmarks/persistent_image_store.h
@@ -17,19 +17,19 @@ class PersistentImageStore : public ImageStore {
  public:
   // Creates a PersistentImageStore in the directory at the given path.
   explicit PersistentImageStore(const base::FilePath& path);
-  virtual bool HasKey(const GURL& page_url) override;
-  virtual void Insert(const GURL& page_url,
-                      const GURL& image_url,
-                      const gfx::Image& image) override;
-  virtual void Erase(const GURL& page_url) override;
-  virtual std::pair<gfx::Image, GURL> Get(const GURL& page_url) override;
-  virtual gfx::Size GetSize(const GURL& page_url) override;
-  virtual void GetAllPageUrls(std::set<GURL>* urls) override;
-  virtual void ClearAll() override;
-  virtual int64 GetStoreSizeInBytes() override;
+  bool HasKey(const GURL& page_url) override;
+  void Insert(const GURL& page_url,
+              const GURL& image_url,
+              const gfx::Image& image) override;
+  void Erase(const GURL& page_url) override;
+  std::pair<gfx::Image, GURL> Get(const GURL& page_url) override;
+  gfx::Size GetSize(const GURL& page_url) override;
+  void GetAllPageUrls(std::set<GURL>* urls) override;
+  void ClearAll() override;
+  int64 GetStoreSizeInBytes() override;
 
  protected:
-  virtual ~PersistentImageStore();
+  ~PersistentImageStore() override;
 
  private:
   sql::InitStatus OpenDatabase();
diff --git a/components/enhanced_bookmarks/test_image_store.h b/components/enhanced_bookmarks/test_image_store.h
index 2666ea0..5acef16 100644
--- a/components/enhanced_bookmarks/test_image_store.h
+++ b/components/enhanced_bookmarks/test_image_store.h
@@ -13,19 +13,19 @@
 class TestImageStore : public ImageStore {
  public:
   TestImageStore();
-  virtual bool HasKey(const GURL& page_url) override;
-  virtual void Insert(const GURL& page_url,
-                      const GURL& image_url,
-                      const gfx::Image& image) override;
-  virtual void Erase(const GURL& page_url) override;
-  virtual std::pair<gfx::Image, GURL> Get(const GURL& page_url) override;
-  virtual gfx::Size GetSize(const GURL& page_url) override;
-  virtual void GetAllPageUrls(std::set<GURL>* urls) override;
-  virtual void ClearAll() override;
-  virtual int64 GetStoreSizeInBytes() override;
+  bool HasKey(const GURL& page_url) override;
+  void Insert(const GURL& page_url,
+              const GURL& image_url,
+              const gfx::Image& image) override;
+  void Erase(const GURL& page_url) override;
+  std::pair<gfx::Image, GURL> Get(const GURL& page_url) override;
+  gfx::Size GetSize(const GURL& page_url) override;
+  void GetAllPageUrls(std::set<GURL>* urls) override;
+  void ClearAll() override;
+  int64 GetStoreSizeInBytes() override;
 
  protected:
-  virtual ~TestImageStore();
+  ~TestImageStore() override;
 
  private:
   typedef std::map<const GURL, std::pair<gfx::Image, const GURL> > ImageMap;
diff --git a/components/error_page/renderer/net_error_helper_core_unittest.cc b/components/error_page/renderer/net_error_helper_core_unittest.cc
index 88cdcc3..34a579e 100644
--- a/components/error_page/renderer/net_error_helper_core_unittest.cc
+++ b/components/error_page/renderer/net_error_helper_core_unittest.cc
@@ -296,36 +296,35 @@ class NetErrorHelperCoreTest : public testing::Test,
   }
 
   // NetErrorHelperCore::Delegate implementation:
-  virtual void GenerateLocalizedErrorPage(const WebURLError& error,
-                                          bool is_failed_post,
-                                          scoped_ptr<ErrorPageParams> params,
-                                          bool* reload_button_shown,
-                                          bool* load_stale_button_shown,
-                                          std::string* html) const override {
+  void GenerateLocalizedErrorPage(const WebURLError& error,
+                                  bool is_failed_post,
+                                  scoped_ptr<ErrorPageParams> params,
+                                  bool* reload_button_shown,
+                                  bool* load_stale_button_shown,
+                                  std::string* html) const override {
     last_error_page_params_.reset(params.release());
     *reload_button_shown = false;
     *load_stale_button_shown = false;
     *html = ErrorToString(error, is_failed_post);
   }
 
-  virtual void LoadErrorPageInMainFrame(const std::string& html,
-                                        const GURL& failed_url) override {
+  void LoadErrorPageInMainFrame(const std::string& html,
+                                const GURL& failed_url) override {
     error_html_update_count_++;
     last_error_html_ = html;
   }
 
-  virtual void EnablePageHelperFunctions() override {
+  void EnablePageHelperFunctions() override {
     enable_page_helper_functions_count_++;
   }
 
-  virtual void UpdateErrorPage(const WebURLError& error,
-                               bool is_failed_post) override {
+  void UpdateErrorPage(const WebURLError& error, bool is_failed_post) override {
     update_count_++;
     last_error_page_params_.reset(NULL);
     last_error_html_ = ErrorToString(error, is_failed_post);
   }
 
-  virtual void FetchNavigationCorrections(
+  void FetchNavigationCorrections(
       const GURL& navigation_correction_url,
       const std::string& navigation_correction_request_body) override {
     EXPECT_TRUE(url_being_fetched_.is_empty());
@@ -350,23 +349,20 @@ class NetErrorHelperCoreTest : public testing::Test,
     EXPECT_TRUE(StringValueEquals(*dict, "params.key", kApiKey));
   }
 
-  virtual void CancelFetchNavigationCorrections() override {
+  void CancelFetchNavigationCorrections() override {
     url_being_fetched_ = GURL();
     request_body_.clear();
   }
 
-  virtual void ReloadPage() override {
-    reload_count_++;
-  }
+  void ReloadPage() override { reload_count_++; }
 
-  virtual void LoadPageFromCache(const GURL& error_url) override {
+  void LoadPageFromCache(const GURL& error_url) override {
     load_stale_count_++;
     load_stale_url_ = error_url;
   }
 
-  virtual void SendTrackingRequest(
-      const GURL& tracking_url,
-      const std::string& tracking_request_body) override {
+  void SendTrackingRequest(const GURL& tracking_url,
+                           const std::string& tracking_request_body) override {
     last_tracking_url_ = tracking_url;
     last_tracking_request_body_ = tracking_request_body;
     tracking_request_count_++;
diff --git a/components/favicon/core/browser/favicon_client.h b/components/favicon/core/browser/favicon_client.h
index f33d54a..bad4437 100644
--- a/components/favicon/core/browser/favicon_client.h
+++ b/components/favicon/core/browser/favicon_client.h
@@ -14,7 +14,7 @@ class GURL;
 // e.g. Chrome.
 class FaviconClient : public KeyedService {
  public:
-  virtual ~FaviconClient() {};
+  ~FaviconClient() override{};
 
   virtual FaviconService* GetFaviconService() = 0;
 
diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc
index d53225d..492d211 100644
--- a/components/favicon_base/select_favicon_frames.cc
+++ b/components/favicon_base/select_favicon_frames.cc
@@ -171,10 +171,10 @@ SkBitmap GetResizedBitmap(const SkBitmap& source_bitmap,
 class FaviconImageSource : public gfx::ImageSkiaSource {
  public:
   FaviconImageSource() {}
-  virtual ~FaviconImageSource() {}
+  ~FaviconImageSource() override {}
 
   // gfx::ImageSkiaSource:
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) override {
+  gfx::ImageSkiaRep GetImageForScale(float scale) override {
     const gfx::ImageSkiaRep* rep = NULL;
     // gfx::ImageSkia passes one of the resource scale factors. The source
     // should return:
diff --git a/components/feedback/feedback_data.h b/components/feedback/feedback_data.h
index 3fdf75c..54749ab 100644
--- a/components/feedback/feedback_data.h
+++ b/components/feedback/feedback_data.h
@@ -77,7 +77,7 @@ class FeedbackData : public FeedbackCommon {
   }
 
  private:
-  virtual ~FeedbackData();
+  ~FeedbackData() override;
 
   // Called once a compression operation is complete.
   void OnCompressComplete();
diff --git a/components/feedback/feedback_uploader_chrome.h b/components/feedback/feedback_uploader_chrome.h
index bf007b1..9a1d52c 100644
--- a/components/feedback/feedback_uploader_chrome.h
+++ b/components/feedback/feedback_uploader_chrome.h
@@ -19,7 +19,7 @@ class FeedbackUploaderChrome : public FeedbackUploader,
  public:
   explicit FeedbackUploaderChrome(content::BrowserContext* context);
 
-  virtual void DispatchReport(const std::string& data) override;
+  void DispatchReport(const std::string& data) override;
 
  private:
   // Browser context this uploader was created for.
diff --git a/components/feedback/feedback_uploader_delegate.h b/components/feedback/feedback_uploader_delegate.h
index d674a10..93cbd68 100644
--- a/components/feedback/feedback_uploader_delegate.h
+++ b/components/feedback/feedback_uploader_delegate.h
@@ -22,11 +22,11 @@ class FeedbackUploaderDelegate : public net::URLFetcherDelegate {
   FeedbackUploaderDelegate(const std::string& post_body,
                            const base::Closure& success_callback,
                            const ReportDataCallback& error_callback);
-  virtual ~FeedbackUploaderDelegate();
+  ~FeedbackUploaderDelegate() override;
 
  private:
   // Overridden from net::URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   std::string post_body_;
   base::Closure success_callback_;
diff --git a/components/feedback/feedback_uploader_factory.h b/components/feedback/feedback_uploader_factory.h
index 0ad60e4..13e9ee3 100644
--- a/components/feedback/feedback_uploader_factory.h
+++ b/components/feedback/feedback_uploader_factory.h
@@ -31,12 +31,12 @@ class FeedbackUploaderFactory : public BrowserContextKeyedServiceFactory {
   friend struct DefaultSingletonTraits<FeedbackUploaderFactory>;
 
   FeedbackUploaderFactory();
-  virtual ~FeedbackUploaderFactory();
+  ~FeedbackUploaderFactory() override;
 
   // BrowserContextKeyedServiceFactory overrides:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-  virtual content::BrowserContext* GetBrowserContextToUse(
+  content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(FeedbackUploaderFactory);
diff --git a/components/gcm_driver/default_gcm_app_handler.h b/components/gcm_driver/default_gcm_app_handler.h
index ffe382b..bfe76a11 100644
--- a/components/gcm_driver/default_gcm_app_handler.h
+++ b/components/gcm_driver/default_gcm_app_handler.h
@@ -15,18 +15,18 @@ namespace gcm {
 class DefaultGCMAppHandler : public GCMAppHandler {
  public:
   DefaultGCMAppHandler();
-  virtual ~DefaultGCMAppHandler();
+  ~DefaultGCMAppHandler() override;
 
   // Overridden from GCMAppHandler:
-  virtual void ShutdownHandler() override;
-  virtual void OnMessage(const std::string& app_id,
-                         const GCMClient::IncomingMessage& message) override;
-  virtual void OnMessagesDeleted(const std::string& app_id) override;
-  virtual void OnSendError(
+  void ShutdownHandler() override;
+  void OnMessage(const std::string& app_id,
+                 const GCMClient::IncomingMessage& message) override;
+  void OnMessagesDeleted(const std::string& app_id) override;
+  void OnSendError(
       const std::string& app_id,
       const GCMClient::SendErrorDetails& send_error_details) override;
-  virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) override;
+  void OnSendAcknowledged(const std::string& app_id,
+                          const std::string& message_id) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultGCMAppHandler);
diff --git a/components/gcm_driver/fake_gcm_app_handler.h b/components/gcm_driver/fake_gcm_app_handler.h
index 4943534..29fcd29 100644
--- a/components/gcm_driver/fake_gcm_app_handler.h
+++ b/components/gcm_driver/fake_gcm_app_handler.h
@@ -25,7 +25,7 @@ class FakeGCMAppHandler : public GCMAppHandler {
   };
 
   FakeGCMAppHandler();
-  virtual ~FakeGCMAppHandler();
+  ~FakeGCMAppHandler() override;
 
   const Event& received_event() const { return received_event_; }
   const std::string& app_id() const { return app_id_; }
@@ -38,15 +38,15 @@ class FakeGCMAppHandler : public GCMAppHandler {
   void WaitForNotification();
 
   // GCMAppHandler implementation.
-  virtual void ShutdownHandler() override;
-  virtual void OnMessage(const std::string& app_id,
-                         const GCMClient::IncomingMessage& message) override;
-  virtual void OnMessagesDeleted(const std::string& app_id) override;
-  virtual void OnSendError(
+  void ShutdownHandler() override;
+  void OnMessage(const std::string& app_id,
+                 const GCMClient::IncomingMessage& message) override;
+  void OnMessagesDeleted(const std::string& app_id) override;
+  void OnSendError(
       const std::string& app_id,
       const GCMClient::SendErrorDetails& send_error_details) override;
-  virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) override;
+  void OnSendAcknowledged(const std::string& app_id,
+                          const std::string& message_id) override;
 
  private:
   void ClearResults();
diff --git a/components/gcm_driver/fake_gcm_client.h b/components/gcm_driver/fake_gcm_client.h
index fa91bbc..f4ac33a 100644
--- a/components/gcm_driver/fake_gcm_client.h
+++ b/components/gcm_driver/fake_gcm_client.h
@@ -32,11 +32,11 @@ class FakeGCMClient : public GCMClient {
   FakeGCMClient(StartMode start_mode,
                 const scoped_refptr<base::SequencedTaskRunner>& ui_thread,
                 const scoped_refptr<base::SequencedTaskRunner>& io_thread);
-  virtual ~FakeGCMClient();
+  ~FakeGCMClient() override;
 
   // Overridden from GCMClient:
   // Called on IO thread.
-  virtual void Initialize(
+  void Initialize(
       const ChromeBuildInfo& chrome_build_info,
       const base::FilePath& store_path,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
@@ -44,23 +44,22 @@ class FakeGCMClient : public GCMClient {
           url_request_context_getter,
       scoped_ptr<Encryptor> encryptor,
       Delegate* delegate) override;
-  virtual void Start() override;
-  virtual void Stop() override;
-  virtual void CheckOut() override;
-  virtual void Register(const std::string& app_id,
-                        const std::vector<std::string>& sender_ids) override;
-  virtual void Unregister(const std::string& app_id) override;
-  virtual void Send(const std::string& app_id,
-                    const std::string& receiver_id,
-                    const OutgoingMessage& message) override;
-  virtual void SetRecording(bool recording) override;
-  virtual void ClearActivityLogs() override;
-  virtual GCMStatistics GetStatistics() const override;
-  virtual void SetAccountTokens(
+  void Start() override;
+  void Stop() override;
+  void CheckOut() override;
+  void Register(const std::string& app_id,
+                const std::vector<std::string>& sender_ids) override;
+  void Unregister(const std::string& app_id) override;
+  void Send(const std::string& app_id,
+            const std::string& receiver_id,
+            const OutgoingMessage& message) override;
+  void SetRecording(bool recording) override;
+  void ClearActivityLogs() override;
+  GCMStatistics GetStatistics() const override;
+  void SetAccountTokens(
       const std::vector<AccountTokenInfo>& account_tokens) override;
-  virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) override;
-  virtual void RemoveAccountMapping(const std::string& account_id) override;
+  void UpdateAccountMapping(const AccountMapping& account_mapping) override;
+  void RemoveAccountMapping(const std::string& account_id) override;
 
   // Initiate the loading that has been delayed.
   // Called on UI thread.
diff --git a/components/gcm_driver/fake_gcm_client_factory.h b/components/gcm_driver/fake_gcm_client_factory.h
index 6ccb0e2..949c225 100644
--- a/components/gcm_driver/fake_gcm_client_factory.h
+++ b/components/gcm_driver/fake_gcm_client_factory.h
@@ -24,10 +24,10 @@ class FakeGCMClientFactory : public GCMClientFactory {
       FakeGCMClient::StartMode gcm_client_start_mode,
       const scoped_refptr<base::SequencedTaskRunner>& ui_thread,
       const scoped_refptr<base::SequencedTaskRunner>& io_thread);
-  virtual ~FakeGCMClientFactory();
+  ~FakeGCMClientFactory() override;
 
   // GCMClientFactory:
-  virtual scoped_ptr<GCMClient> BuildInstance() override;
+  scoped_ptr<GCMClient> BuildInstance() override;
 
  private:
   FakeGCMClient::StartMode gcm_client_start_mode_;
diff --git a/components/gcm_driver/fake_gcm_driver.h b/components/gcm_driver/fake_gcm_driver.h
index 366881e..e1e5d02 100644
--- a/components/gcm_driver/fake_gcm_driver.h
+++ b/components/gcm_driver/fake_gcm_driver.h
@@ -14,44 +14,41 @@ namespace gcm {
 class FakeGCMDriver : public GCMDriver {
  public:
   FakeGCMDriver();
-  virtual ~FakeGCMDriver();
+  ~FakeGCMDriver() override;
 
   // GCMDriver overrides:
-  virtual void Shutdown() override;
-  virtual void AddAppHandler(const std::string& app_id,
-                             GCMAppHandler* handler) override;
-  virtual void RemoveAppHandler(const std::string& app_id) override;
-  virtual void OnSignedIn() override;
-  virtual void OnSignedOut() override;
-  virtual void Purge() override;
-  virtual void AddConnectionObserver(GCMConnectionObserver* observer) override;
-  virtual void RemoveConnectionObserver(
-      GCMConnectionObserver* observer) override;
-  virtual void Enable() override;
-  virtual void Disable() override;
-  virtual GCMClient* GetGCMClientForTesting() const override;
-  virtual bool IsStarted() const override;
-  virtual bool IsConnected() const override;
-  virtual void GetGCMStatistics(const GetGCMStatisticsCallback& callback,
-                                bool clear_logs) override;
-  virtual void SetGCMRecording(const GetGCMStatisticsCallback& callback,
-                               bool recording) override;
-  virtual void SetAccountTokens(
+  void Shutdown() override;
+  void AddAppHandler(const std::string& app_id,
+                     GCMAppHandler* handler) override;
+  void RemoveAppHandler(const std::string& app_id) override;
+  void OnSignedIn() override;
+  void OnSignedOut() override;
+  void Purge() override;
+  void AddConnectionObserver(GCMConnectionObserver* observer) override;
+  void RemoveConnectionObserver(GCMConnectionObserver* observer) override;
+  void Enable() override;
+  void Disable() override;
+  GCMClient* GetGCMClientForTesting() const override;
+  bool IsStarted() const override;
+  bool IsConnected() const override;
+  void GetGCMStatistics(const GetGCMStatisticsCallback& callback,
+                        bool clear_logs) override;
+  void SetGCMRecording(const GetGCMStatisticsCallback& callback,
+                       bool recording) override;
+  void SetAccountTokens(
       const std::vector<GCMClient::AccountTokenInfo>& account_tokens) override;
-  virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) override;
-  virtual void RemoveAccountMapping(const std::string& account_id) override;
+  void UpdateAccountMapping(const AccountMapping& account_mapping) override;
+  void RemoveAccountMapping(const std::string& account_id) override;
 
  protected:
   // GCMDriver implementation:
-  virtual GCMClient::Result EnsureStarted() override;
-  virtual void RegisterImpl(
-      const std::string& app_id,
-      const std::vector<std::string>& sender_ids) override;
-  virtual void UnregisterImpl(const std::string& app_id) override;
-  virtual void SendImpl(const std::string& app_id,
-                        const std::string& receiver_id,
-                        const GCMClient::OutgoingMessage& message) override;
+  GCMClient::Result EnsureStarted() override;
+  void RegisterImpl(const std::string& app_id,
+                    const std::vector<std::string>& sender_ids) override;
+  void UnregisterImpl(const std::string& app_id) override;
+  void SendImpl(const std::string& app_id,
+                const std::string& receiver_id,
+                const GCMClient::OutgoingMessage& message) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeGCMDriver);
diff --git a/components/gcm_driver/gcm_account_mapper.h b/components/gcm_driver/gcm_account_mapper.h
index dc4c601..5616236 100644
--- a/components/gcm_driver/gcm_account_mapper.h
+++ b/components/gcm_driver/gcm_account_mapper.h
@@ -31,7 +31,7 @@ class GCMAccountMapper : public GCMAppHandler {
   typedef std::vector<AccountMapping> AccountMappings;
 
   explicit GCMAccountMapper(GCMDriver* gcm_driver);
-  virtual ~GCMAccountMapper();
+  ~GCMAccountMapper() override;
 
   void Initialize(const AccountMappings& account_mappings);
 
@@ -41,16 +41,16 @@ class GCMAccountMapper : public GCMAppHandler {
       const std::vector<GCMClient::AccountTokenInfo>& account_tokens);
 
   // Implementation of GCMAppHandler:
-  virtual void ShutdownHandler() override;
-  virtual void OnMessage(const std::string& app_id,
-                         const GCMClient::IncomingMessage& message) override;
-  virtual void OnMessagesDeleted(const std::string& app_id) override;
-  virtual void OnSendError(
+  void ShutdownHandler() override;
+  void OnMessage(const std::string& app_id,
+                 const GCMClient::IncomingMessage& message) override;
+  void OnMessagesDeleted(const std::string& app_id) override;
+  void OnSendError(
       const std::string& app_id,
       const GCMClient::SendErrorDetails& send_error_details) override;
-  virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) override;
-  virtual bool CanHandle(const std::string& app_id) const override;
+  void OnSendAcknowledged(const std::string& app_id,
+                          const std::string& message_id) override;
+  bool CanHandle(const std::string& app_id) const override;
 
  private:
   friend class GCMAccountMapperTest;
diff --git a/components/gcm_driver/gcm_account_mapper_unittest.cc b/components/gcm_driver/gcm_account_mapper_unittest.cc
index bf8fdf0..b714e92 100644
--- a/components/gcm_driver/gcm_account_mapper_unittest.cc
+++ b/components/gcm_driver/gcm_account_mapper_unittest.cc
@@ -78,17 +78,15 @@ class CustomFakeGCMDriver : public FakeGCMDriver {
   };
 
   CustomFakeGCMDriver();
-  virtual ~CustomFakeGCMDriver();
-
-  virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) override;
-  virtual void RemoveAccountMapping(const std::string& account_id) override;
-  virtual void AddAppHandler(const std::string& app_id,
-                             GCMAppHandler* handler) override;
-  virtual void RemoveAppHandler(const std::string& app_id) override;
-  virtual void RegisterImpl(
-      const std::string& app_id,
-      const std::vector<std::string>& sender_ids) override;
+  ~CustomFakeGCMDriver() override;
+
+  void UpdateAccountMapping(const AccountMapping& account_mapping) override;
+  void RemoveAccountMapping(const std::string& account_id) override;
+  void AddAppHandler(const std::string& app_id,
+                     GCMAppHandler* handler) override;
+  void RemoveAppHandler(const std::string& app_id) override;
+  void RegisterImpl(const std::string& app_id,
+                    const std::vector<std::string>& sender_ids) override;
 
   void CompleteRegister(const std::string& registration_id,
                         GCMClient::Result result);
@@ -114,9 +112,9 @@ class CustomFakeGCMDriver : public FakeGCMDriver {
   bool registration_id_requested() const { return registration_id_requested_; }
 
  protected:
-  virtual void SendImpl(const std::string& app_id,
-                        const std::string& receiver_id,
-                        const GCMClient::OutgoingMessage& message) override;
+  void SendImpl(const std::string& app_id,
+                const std::string& receiver_id,
+                const GCMClient::OutgoingMessage& message) override;
 
  private:
   AccountMapping account_mapping_;
diff --git a/components/gcm_driver/gcm_activity.h b/components/gcm_driver/gcm_activity.h
index 0d3da0c..2209cb0 100644
--- a/components/gcm_driver/gcm_activity.h
+++ b/components/gcm_driver/gcm_activity.h
@@ -25,19 +25,19 @@ struct Activity {
 // Contains relevant data of a connection activity.
 struct ConnectionActivity : Activity {
   ConnectionActivity();
-  virtual ~ConnectionActivity();
+  ~ConnectionActivity() override;
 };
 
 // Contains relevant data of a check-in activity.
 struct CheckinActivity : Activity {
   CheckinActivity();
-  virtual ~CheckinActivity();
+  ~CheckinActivity() override;
 };
 
 // Contains relevant data of a registration/unregistration step.
 struct RegistrationActivity : Activity {
   RegistrationActivity();
-  virtual ~RegistrationActivity();
+  ~RegistrationActivity() override;
 
   std::string app_id;
   std::string sender_ids;  // Comma separated sender ids.
@@ -46,7 +46,7 @@ struct RegistrationActivity : Activity {
 // Contains relevant data of a message receiving event.
 struct ReceivingActivity : Activity {
   ReceivingActivity();
-  virtual ~ReceivingActivity();
+  ~ReceivingActivity() override;
 
   std::string app_id;
   std::string from;
@@ -56,7 +56,7 @@ struct ReceivingActivity : Activity {
 // Contains relevant data of a send-message step.
 struct SendingActivity : Activity {
   SendingActivity();
-  virtual ~SendingActivity();
+  ~SendingActivity() override;
 
   std::string app_id;
   std::string receiver_id;
diff --git a/components/gcm_driver/gcm_channel_status_request.h b/components/gcm_driver/gcm_channel_status_request.h
index e1ddf15..1be074f 100644
--- a/components/gcm_driver/gcm_channel_status_request.h
+++ b/components/gcm_driver/gcm_channel_status_request.h
@@ -42,7 +42,7 @@ class GCMChannelStatusRequest : public net::URLFetcherDelegate {
       const std::string& channel_status_request_url,
       const std::string& user_agent,
       const GCMChannelStatusRequestCallback& callback);
-  virtual ~GCMChannelStatusRequest();
+  ~GCMChannelStatusRequest() override;
 
   void Start();
 
@@ -53,7 +53,7 @@ class GCMChannelStatusRequest : public net::URLFetcherDelegate {
   FRIEND_TEST_ALL_PREFIXES(GCMChannelStatusRequestTest, RequestData);
 
   // Overridden from URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   bool ParseResponse(const net::URLFetcher* source);
   void RetryWithBackoff(bool update_backoff);
diff --git a/components/gcm_driver/gcm_client_impl.h b/components/gcm_driver/gcm_client_impl.h
index 6abe149..a20cb12 100644
--- a/components/gcm_driver/gcm_client_impl.h
+++ b/components/gcm_driver/gcm_client_impl.h
@@ -80,10 +80,10 @@ class GCMClientImpl
       public ConnectionFactory::ConnectionListener {
  public:
   explicit GCMClientImpl(scoped_ptr<GCMInternalsBuilder> internals_builder);
-  virtual ~GCMClientImpl();
+  ~GCMClientImpl() override;
 
   // GCMClient implementation.
-  virtual void Initialize(
+  void Initialize(
       const ChromeBuildInfo& chrome_build_info,
       const base::FilePath& store_path,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
@@ -91,31 +91,30 @@ class GCMClientImpl
           url_request_context_getter,
       scoped_ptr<Encryptor> encryptor,
       GCMClient::Delegate* delegate) override;
-  virtual void Start() override;
-  virtual void Stop() override;
-  virtual void CheckOut() override;
-  virtual void Register(const std::string& app_id,
-                        const std::vector<std::string>& sender_ids) override;
-  virtual void Unregister(const std::string& app_id) override;
-  virtual void Send(const std::string& app_id,
-                    const std::string& receiver_id,
-                    const OutgoingMessage& message) override;
-  virtual void SetRecording(bool recording) override;
-  virtual void ClearActivityLogs() override;
-  virtual GCMStatistics GetStatistics() const override;
-  virtual void SetAccountTokens(
+  void Start() override;
+  void Stop() override;
+  void CheckOut() override;
+  void Register(const std::string& app_id,
+                const std::vector<std::string>& sender_ids) override;
+  void Unregister(const std::string& app_id) override;
+  void Send(const std::string& app_id,
+            const std::string& receiver_id,
+            const OutgoingMessage& message) override;
+  void SetRecording(bool recording) override;
+  void ClearActivityLogs() override;
+  GCMStatistics GetStatistics() const override;
+  void SetAccountTokens(
       const std::vector<AccountTokenInfo>& account_tokens) override;
-  virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) override;
-  virtual void RemoveAccountMapping(const std::string& account_id) override;
+  void UpdateAccountMapping(const AccountMapping& account_mapping) override;
+  void RemoveAccountMapping(const std::string& account_id) override;
 
   // GCMStatsRecorder::Delegate implemenation.
-  virtual void OnActivityRecorded() override;
+  void OnActivityRecorded() override;
 
   // ConnectionFactory::ConnectionListener implementation.
-  virtual void OnConnected(const GURL& current_server,
-                           const net::IPEndPoint& ip_endpoint) override;
-  virtual void OnDisconnected() override;
+  void OnConnected(const GURL& current_server,
+                   const net::IPEndPoint& ip_endpoint) override;
+  void OnDisconnected() override;
 
  private:
   // State representation of the GCMClient.
diff --git a/components/gcm_driver/gcm_client_impl_unittest.cc b/components/gcm_driver/gcm_client_impl_unittest.cc
index 198ed8c..270641b 100644
--- a/components/gcm_driver/gcm_client_impl_unittest.cc
+++ b/components/gcm_driver/gcm_client_impl_unittest.cc
@@ -92,9 +92,9 @@ class FakeMCSClient : public MCSClient {
                 ConnectionFactory* connection_factory,
                 GCMStore* gcm_store,
                 GCMStatsRecorder* recorder);
-  virtual ~FakeMCSClient();
-  virtual void Login(uint64 android_id, uint64 security_token) override;
-  virtual void SendMessage(const MCSMessage& message) override;
+  ~FakeMCSClient() override;
+  void Login(uint64 android_id, uint64 security_token) override;
+  void SendMessage(const MCSMessage& message) override;
 
   uint64 last_android_id() const { return last_android_id_; }
   uint64 last_security_token() const { return last_security_token_; }
@@ -140,9 +140,9 @@ void FakeMCSClient::SendMessage(const MCSMessage& message) {
 class AutoAdvancingTestClock : public base::Clock {
  public:
   explicit AutoAdvancingTestClock(base::TimeDelta auto_increment_time_delta);
-  virtual ~AutoAdvancingTestClock();
+  ~AutoAdvancingTestClock() override;
 
-  virtual base::Time Now() override;
+  base::Time Now() override;
   void Advance(TimeDelta delta);
   int call_count() const { return call_count_; }
 
@@ -175,16 +175,15 @@ void AutoAdvancingTestClock::Advance(base::TimeDelta delta) {
 class FakeGCMInternalsBuilder : public GCMInternalsBuilder {
  public:
   FakeGCMInternalsBuilder(base::TimeDelta clock_step);
-  virtual ~FakeGCMInternalsBuilder();
-
-  virtual scoped_ptr<base::Clock> BuildClock() override;
-  virtual scoped_ptr<MCSClient> BuildMCSClient(
-      const std::string& version,
-      base::Clock* clock,
-      ConnectionFactory* connection_factory,
-      GCMStore* gcm_store,
-      GCMStatsRecorder* recorder) override;
-  virtual scoped_ptr<ConnectionFactory> BuildConnectionFactory(
+  ~FakeGCMInternalsBuilder() override;
+
+  scoped_ptr<base::Clock> BuildClock() override;
+  scoped_ptr<MCSClient> BuildMCSClient(const std::string& version,
+                                       base::Clock* clock,
+                                       ConnectionFactory* connection_factory,
+                                       GCMStore* gcm_store,
+                                       GCMStatsRecorder* recorder) override;
+  scoped_ptr<ConnectionFactory> BuildConnectionFactory(
       const std::vector<GURL>& endpoints,
       const net::BackoffEntry::Policy& backoff_policy,
       const scoped_refptr<net::HttpNetworkSession>& gcm_network_session,
@@ -260,28 +259,26 @@ class GCMClientImplTest : public testing::Test,
                        const std::string& registration_id);
 
   // GCMClient::Delegate overrides (for verification).
-  virtual void OnRegisterFinished(const std::string& app_id,
-                                  const std::string& registration_id,
-                                  GCMClient::Result result) override;
-  virtual void OnUnregisterFinished(const std::string& app_id,
-                                    GCMClient::Result result) override;
-  virtual void OnSendFinished(const std::string& app_id,
-                              const std::string& message_id,
-                              GCMClient::Result result) override {}
-  virtual void OnMessageReceived(const std::string& registration_id,
-                                 const GCMClient::IncomingMessage& message)
-      override;
-  virtual void OnMessagesDeleted(const std::string& app_id) override;
-  virtual void OnMessageSendError(
+  void OnRegisterFinished(const std::string& app_id,
+                          const std::string& registration_id,
+                          GCMClient::Result result) override;
+  void OnUnregisterFinished(const std::string& app_id,
+                            GCMClient::Result result) override;
+  void OnSendFinished(const std::string& app_id,
+                      const std::string& message_id,
+                      GCMClient::Result result) override {}
+  void OnMessageReceived(const std::string& registration_id,
+                         const GCMClient::IncomingMessage& message) override;
+  void OnMessagesDeleted(const std::string& app_id) override;
+  void OnMessageSendError(
       const std::string& app_id,
       const gcm::GCMClient::SendErrorDetails& send_error_details) override;
-  virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) override;
-  virtual void OnGCMReady(
-      const std::vector<AccountMapping>& account_mappings) override;
-  virtual void OnActivityRecorded() override {}
-  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override {}
-  virtual void OnDisconnected() override {}
+  void OnSendAcknowledged(const std::string& app_id,
+                          const std::string& message_id) override;
+  void OnGCMReady(const std::vector<AccountMapping>& account_mappings) override;
+  void OnActivityRecorded() override {}
+  void OnConnected(const net::IPEndPoint& ip_endpoint) override {}
+  void OnDisconnected() override {}
 
   GCMClientImpl* gcm_client() const { return gcm_client_.get(); }
   FakeMCSClient* mcs_client() const {
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc
index 35e2a81..fc0c36a 100644
--- a/components/gcm_driver/gcm_driver_desktop.cc
+++ b/components/gcm_driver/gcm_driver_desktop.cc
@@ -35,28 +35,26 @@ class GCMDriverDesktop::IOWorker : public GCMClient::Delegate {
 
   // Overridden from GCMClient::Delegate:
   // Called on IO thread.
-  virtual void OnRegisterFinished(const std::string& app_id,
-                                  const std::string& registration_id,
-                                  GCMClient::Result result) override;
-  virtual void OnUnregisterFinished(const std::string& app_id,
-                                    GCMClient::Result result) override;
-  virtual void OnSendFinished(const std::string& app_id,
-                              const std::string& message_id,
-                              GCMClient::Result result) override;
-  virtual void OnMessageReceived(
-      const std::string& app_id,
-      const GCMClient::IncomingMessage& message) override;
-  virtual void OnMessagesDeleted(const std::string& app_id) override;
-  virtual void OnMessageSendError(
+  void OnRegisterFinished(const std::string& app_id,
+                          const std::string& registration_id,
+                          GCMClient::Result result) override;
+  void OnUnregisterFinished(const std::string& app_id,
+                            GCMClient::Result result) override;
+  void OnSendFinished(const std::string& app_id,
+                      const std::string& message_id,
+                      GCMClient::Result result) override;
+  void OnMessageReceived(const std::string& app_id,
+                         const GCMClient::IncomingMessage& message) override;
+  void OnMessagesDeleted(const std::string& app_id) override;
+  void OnMessageSendError(
       const std::string& app_id,
       const GCMClient::SendErrorDetails& send_error_details) override;
-  virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) override;
-  virtual void OnGCMReady(
-      const std::vector<AccountMapping>& account_mappings) override;
-  virtual void OnActivityRecorded() override;
-  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override;
-  virtual void OnDisconnected() override;
+  void OnSendAcknowledged(const std::string& app_id,
+                          const std::string& message_id) override;
+  void OnGCMReady(const std::vector<AccountMapping>& account_mappings) override;
+  void OnActivityRecorded() override;
+  void OnConnected(const net::IPEndPoint& ip_endpoint) override;
+  void OnDisconnected() override;
 
   // Called on IO thread.
   void Initialize(
diff --git a/components/gcm_driver/gcm_driver_desktop.h b/components/gcm_driver/gcm_driver_desktop.h
index 8cfb733..7267de0 100644
--- a/components/gcm_driver/gcm_driver_desktop.h
+++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -56,33 +56,31 @@ class GCMDriverDesktop : public GCMDriver {
       const scoped_refptr<base::SequencedTaskRunner>& ui_thread,
       const scoped_refptr<base::SequencedTaskRunner>& io_thread,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
-  virtual ~GCMDriverDesktop();
+  ~GCMDriverDesktop() override;
 
   // GCMDriver overrides:
-  virtual void Shutdown() override;
-  virtual void OnSignedIn() override;
-  virtual void OnSignedOut() override;
-  virtual void Purge() override;
-  virtual void AddAppHandler(const std::string& app_id,
-                             GCMAppHandler* handler) override;
-  virtual void RemoveAppHandler(const std::string& app_id) override;
-  virtual void AddConnectionObserver(GCMConnectionObserver* observer) override;
-  virtual void RemoveConnectionObserver(
-      GCMConnectionObserver* observer) override;
-  virtual void Enable() override;
-  virtual void Disable() override;
-  virtual GCMClient* GetGCMClientForTesting() const override;
-  virtual bool IsStarted() const override;
-  virtual bool IsConnected() const override;
-  virtual void GetGCMStatistics(const GetGCMStatisticsCallback& callback,
-                                bool clear_logs) override;
-  virtual void SetGCMRecording(const GetGCMStatisticsCallback& callback,
-                               bool recording) override;
-  virtual void SetAccountTokens(
+  void Shutdown() override;
+  void OnSignedIn() override;
+  void OnSignedOut() override;
+  void Purge() override;
+  void AddAppHandler(const std::string& app_id,
+                     GCMAppHandler* handler) override;
+  void RemoveAppHandler(const std::string& app_id) override;
+  void AddConnectionObserver(GCMConnectionObserver* observer) override;
+  void RemoveConnectionObserver(GCMConnectionObserver* observer) override;
+  void Enable() override;
+  void Disable() override;
+  GCMClient* GetGCMClientForTesting() const override;
+  bool IsStarted() const override;
+  bool IsConnected() const override;
+  void GetGCMStatistics(const GetGCMStatisticsCallback& callback,
+                        bool clear_logs) override;
+  void SetGCMRecording(const GetGCMStatisticsCallback& callback,
+                       bool recording) override;
+  void SetAccountTokens(
       const std::vector<GCMClient::AccountTokenInfo>& account_tokens) override;
-  virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) override;
-  virtual void RemoveAccountMapping(const std::string& account_id) override;
+  void UpdateAccountMapping(const AccountMapping& account_mapping) override;
+  void RemoveAccountMapping(const std::string& account_id) override;
 
   // Exposed for testing purpose.
   bool gcm_enabled() const { return gcm_enabled_; }
@@ -92,14 +90,13 @@ class GCMDriverDesktop : public GCMDriver {
 
  protected:
   // GCMDriver implementation:
-  virtual GCMClient::Result EnsureStarted() override;
-  virtual void RegisterImpl(
-      const std::string& app_id,
-      const std::vector<std::string>& sender_ids) override;
-  virtual void UnregisterImpl(const std::string& app_id) override;
-  virtual void SendImpl(const std::string& app_id,
-                        const std::string& receiver_id,
-                        const GCMClient::OutgoingMessage& message) override;
+  GCMClient::Result EnsureStarted() override;
+  void RegisterImpl(const std::string& app_id,
+                    const std::vector<std::string>& sender_ids) override;
+  void UnregisterImpl(const std::string& app_id) override;
+  void SendImpl(const std::string& app_id,
+                const std::string& receiver_id,
+                const GCMClient::OutgoingMessage& message) override;
 
  private:
   class IOWorker;
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc
index 9c8a353..8d9211b 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -46,11 +46,11 @@ const char kUserID1[] = "user1";
 class FakeGCMConnectionObserver : public GCMConnectionObserver {
  public:
   FakeGCMConnectionObserver();
-  virtual ~FakeGCMConnectionObserver();
+  ~FakeGCMConnectionObserver() override;
 
   // gcm::GCMConnectionObserver implementation:
-  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override;
-  virtual void OnDisconnected() override;
+  void OnConnected(const net::IPEndPoint& ip_endpoint) override;
+  void OnDisconnected() override;
 
   bool connected() const { return connected_; }
 
diff --git a/components/gcm_driver/gcm_stats_recorder_impl.h b/components/gcm_driver/gcm_stats_recorder_impl.h
index 16472e1..a2836be 100644
--- a/components/gcm_driver/gcm_stats_recorder_impl.h
+++ b/components/gcm_driver/gcm_stats_recorder_impl.h
@@ -27,7 +27,7 @@ namespace gcm {
 class GCMStatsRecorderImpl : public GCMStatsRecorder {
  public:
   GCMStatsRecorderImpl();
-  virtual ~GCMStatsRecorderImpl();
+  ~GCMStatsRecorderImpl() override;
 
   // Indicates whether the recorder is currently recording activities or not.
   bool is_recording() const {
@@ -44,52 +44,49 @@ class GCMStatsRecorderImpl : public GCMStatsRecorder {
   void Clear();
 
   // GCMStatsRecorder implementation:
-  virtual void RecordCheckinInitiated(uint64 android_id) override;
-  virtual void RecordCheckinDelayedDueToBackoff(int64 delay_msec) override;
-  virtual void RecordCheckinSuccess() override;
-  virtual void RecordCheckinFailure(std::string status,
-                                    bool will_retry) override;
-  virtual void RecordConnectionInitiated(const std::string& host) override;
-  virtual void RecordConnectionDelayedDueToBackoff(int64 delay_msec) override;
-  virtual void RecordConnectionSuccess() override;
-  virtual void RecordConnectionFailure(int network_error) override;
-  virtual void RecordConnectionResetSignaled(
+  void RecordCheckinInitiated(uint64 android_id) override;
+  void RecordCheckinDelayedDueToBackoff(int64 delay_msec) override;
+  void RecordCheckinSuccess() override;
+  void RecordCheckinFailure(std::string status, bool will_retry) override;
+  void RecordConnectionInitiated(const std::string& host) override;
+  void RecordConnectionDelayedDueToBackoff(int64 delay_msec) override;
+  void RecordConnectionSuccess() override;
+  void RecordConnectionFailure(int network_error) override;
+  void RecordConnectionResetSignaled(
       ConnectionFactory::ConnectionResetReason reason) override;
-  virtual void RecordRegistrationSent(const std::string& app_id,
-                                      const std::string& sender_ids) override;
-  virtual void RecordRegistrationResponse(
-      const std::string& app_id,
-      const std::vector<std::string>& sender_ids,
-      RegistrationRequest::Status status) override;
-  virtual void RecordRegistrationRetryRequested(
+  void RecordRegistrationSent(const std::string& app_id,
+                              const std::string& sender_ids) override;
+  void RecordRegistrationResponse(const std::string& app_id,
+                                  const std::vector<std::string>& sender_ids,
+                                  RegistrationRequest::Status status) override;
+  void RecordRegistrationRetryRequested(
       const std::string& app_id,
       const std::vector<std::string>& sender_ids,
       int retries_left) override;
-  virtual void RecordUnregistrationSent(const std::string& app_id) override;
-  virtual void RecordUnregistrationResponse(
+  void RecordUnregistrationSent(const std::string& app_id) override;
+  void RecordUnregistrationResponse(
       const std::string& app_id,
       UnregistrationRequest::Status status) override;
-  virtual void RecordUnregistrationRetryDelayed(const std::string& app_id,
-                                                int64 delay_msec) override;
-  virtual void RecordDataMessageReceived(
-      const std::string& app_id,
-      const std::string& from,
-      int message_byte_size,
-      bool to_registered_app,
-      ReceivedMessageType message_type) override;
-  virtual void RecordDataSentToWire(const std::string& app_id,
-                                    const std::string& receiver_id,
-                                    const std::string& message_id,
-                                    int queued) override;
-  virtual void RecordNotifySendStatus(const std::string& app_id,
-                                      const std::string& receiver_id,
-                                      const std::string& message_id,
-                                      MCSClient::MessageSendStatus status,
-                                      int byte_size,
-                                      int ttl) override;
-  virtual void RecordIncomingSendError(const std::string& app_id,
-                                       const std::string& receiver_id,
-                                       const std::string& message_id) override;
+  void RecordUnregistrationRetryDelayed(const std::string& app_id,
+                                        int64 delay_msec) override;
+  void RecordDataMessageReceived(const std::string& app_id,
+                                 const std::string& from,
+                                 int message_byte_size,
+                                 bool to_registered_app,
+                                 ReceivedMessageType message_type) override;
+  void RecordDataSentToWire(const std::string& app_id,
+                            const std::string& receiver_id,
+                            const std::string& message_id,
+                            int queued) override;
+  void RecordNotifySendStatus(const std::string& app_id,
+                              const std::string& receiver_id,
+                              const std::string& message_id,
+                              MCSClient::MessageSendStatus status,
+                              int byte_size,
+                              int ttl) override;
+  void RecordIncomingSendError(const std::string& app_id,
+                               const std::string& receiver_id,
+                               const std::string& message_id) override;
 
   // Collect all recorded activities into the struct.
   void CollectActivities(RecordedActivities* recorder_activities) const;
diff --git a/components/gcm_driver/system_encryptor.h b/components/gcm_driver/system_encryptor.h
index 48c75c8..02339ad 100644
--- a/components/gcm_driver/system_encryptor.h
+++ b/components/gcm_driver/system_encryptor.h
@@ -13,13 +13,13 @@ namespace gcm {
 // Encryptor that uses the Chrome password manager's encryptor.
 class SystemEncryptor : public Encryptor {
  public:
-  virtual ~SystemEncryptor();
+  ~SystemEncryptor() override;
 
-  virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) override;
+  bool EncryptString(const std::string& plaintext,
+                     std::string* ciphertext) override;
 
-  virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) override;
+  bool DecryptString(const std::string& ciphertext,
+                     std::string* plaintext) override;
 };
 
 }  // namespace gcm
diff --git a/components/google/core/browser/google_url_tracker.h b/components/google/core/browser/google_url_tracker.h
index 0c6a80f..aaa2c4b 100644
--- a/components/google/core/browser/google_url_tracker.h
+++ b/components/google/core/browser/google_url_tracker.h
@@ -63,7 +63,7 @@ class GoogleURLTracker
   // Only the GoogleURLTrackerFactory and tests should call this.
   GoogleURLTracker(scoped_ptr<GoogleURLTrackerClient> client, Mode mode);
 
-  virtual ~GoogleURLTracker();
+  ~GoogleURLTracker() override;
 
   // Returns the current Google homepage URL.
   const GURL& google_url() const { return google_url_; }
@@ -128,14 +128,14 @@ class GoogleURLTracker
   static const char kSearchDomainCheckURL[];
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // NetworkChangeNotifier::IPAddressObserver:
-  virtual void OnNetworkChanged(
+  void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   // KeyedService:
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Registers consumer interest in getting an updated URL from the server.
   // Observe chrome::NOTIFICATION_GOOGLE_URL_UPDATED to be notified when the URL
diff --git a/components/google/core/browser/google_url_tracker_infobar_delegate.h b/components/google/core/browser/google_url_tracker_infobar_delegate.h
index 601b4b3..dac9874 100644
--- a/components/google/core/browser/google_url_tracker_infobar_delegate.h
+++ b/components/google/core/browser/google_url_tracker_infobar_delegate.h
@@ -27,8 +27,8 @@ class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
       const GURL& search_url);
 
   // ConfirmInfoBarDelegate:
-  virtual bool Accept() override;
-  virtual bool Cancel() override;
+  bool Accept() override;
+  bool Cancel() override;
 
   GoogleURLTrackerNavigationHelper* navigation_helper() {
     return navigation_helper_weak_ptr_;
@@ -54,16 +54,15 @@ class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
   GoogleURLTrackerInfoBarDelegate(
       GoogleURLTracker* google_url_tracker,
       const GURL& search_url);
-  virtual ~GoogleURLTrackerInfoBarDelegate();
+  ~GoogleURLTrackerInfoBarDelegate() override;
 
  private:
   // ConfirmInfoBarDelegate:
-  virtual base::string16 GetMessageText() const override;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
-  virtual base::string16 GetLinkText() const override;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
-  virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const override;
+  base::string16 GetMessageText() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  base::string16 GetLinkText() const override;
+  bool LinkClicked(WindowOpenDisposition disposition) override;
+  bool ShouldExpireInternal(const NavigationDetails& details) const override;
 
   GoogleURLTracker* google_url_tracker_;
   scoped_ptr<GoogleURLTrackerNavigationHelper> navigation_helper_;
diff --git a/components/google/core/browser/google_url_tracker_map_entry.h b/components/google/core/browser/google_url_tracker_map_entry.h
index bfa3ddc..79c52b7 100644
--- a/components/google/core/browser/google_url_tracker_map_entry.h
+++ b/components/google/core/browser/google_url_tracker_map_entry.h
@@ -47,10 +47,8 @@ class GoogleURLTrackerMapEntry : public infobars::InfoBarManager::Observer {
   friend class GoogleURLTrackerTest;
 
   // infobars::InfoBarManager::Observer:
-  virtual void OnInfoBarRemoved(infobars::InfoBar* infobar,
-                                bool animate) override;
-  virtual void OnManagerShuttingDown(
-      infobars::InfoBarManager* manager) override;
+  void OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override;
+  void OnManagerShuttingDown(infobars::InfoBarManager* manager) override;
 
   GoogleURLTracker* const google_url_tracker_;
   infobars::InfoBarManager* const infobar_manager_;
diff --git a/components/google/core/browser/google_url_tracker_unittest.cc b/components/google/core/browser/google_url_tracker_unittest.cc
index a95d392..0303d93 100644
--- a/components/google/core/browser/google_url_tracker_unittest.cc
+++ b/components/google/core/browser/google_url_tracker_unittest.cc
@@ -72,13 +72,13 @@ void TestCallbackListener::RegisterCallback(
 class TestGoogleURLTrackerClient : public GoogleURLTrackerClient {
  public:
   explicit TestGoogleURLTrackerClient(PrefService* prefs_);
-  virtual ~TestGoogleURLTrackerClient();
+  ~TestGoogleURLTrackerClient() override;
 
-  virtual void SetListeningForNavigationStart(bool listen) override;
-  virtual bool IsListeningForNavigationStart() override;
-  virtual bool IsBackgroundNetworkingEnabled() override;
-  virtual PrefService* GetPrefs() override;
-  virtual net::URLRequestContextGetter* GetRequestContext() override;
+  void SetListeningForNavigationStart(bool listen) override;
+  bool IsListeningForNavigationStart() override;
+  bool IsBackgroundNetworkingEnabled() override;
+  PrefService* GetPrefs() override;
+  net::URLRequestContextGetter* GetRequestContext() override;
 
  private:
   PrefService* prefs_;
@@ -125,15 +125,15 @@ class TestGoogleURLTrackerNavigationHelper
     : public GoogleURLTrackerNavigationHelper {
  public:
   explicit TestGoogleURLTrackerNavigationHelper(GoogleURLTracker* tracker);
-  virtual ~TestGoogleURLTrackerNavigationHelper();
+  ~TestGoogleURLTrackerNavigationHelper() override;
 
-  virtual void SetListeningForNavigationCommit(bool listen) override;
-  virtual bool IsListeningForNavigationCommit() override;
-  virtual void SetListeningForTabDestruction(bool listen) override;
-  virtual bool IsListeningForTabDestruction() override;
-  virtual void OpenURL(GURL url,
-                       WindowOpenDisposition disposition,
-                       bool user_clicked_on_link) override;
+  void SetListeningForNavigationCommit(bool listen) override;
+  bool IsListeningForNavigationCommit() override;
+  void SetListeningForTabDestruction(bool listen) override;
+  bool IsListeningForTabDestruction() override;
+  void OpenURL(GURL url,
+               WindowOpenDisposition disposition,
+               bool user_clicked_on_link) override;
 
  private:
   bool listening_for_nav_commit_;
@@ -181,8 +181,8 @@ void TestGoogleURLTrackerNavigationHelper::OpenURL(
 class TestInfoBarManager : public infobars::InfoBarManager {
  public:
   explicit TestInfoBarManager(int unique_id);
-  virtual ~TestInfoBarManager();
-  virtual int GetActiveEntryID() override;
+  ~TestInfoBarManager() override;
+  int GetActiveEntryID() override;
 
  private:
   int unique_id_;
diff --git a/components/history/core/browser/in_memory_database.h b/components/history/core/browser/in_memory_database.h
index 6a010de..9730f1e 100644
--- a/components/history/core/browser/in_memory_database.h
+++ b/components/history/core/browser/in_memory_database.h
@@ -21,7 +21,7 @@ namespace history {
 class InMemoryDatabase : public URLDatabase {
  public:
   InMemoryDatabase();
-  virtual ~InMemoryDatabase();
+  ~InMemoryDatabase() override;
 
   // Creates an empty in-memory database.
   bool InitFromScratch();
@@ -34,7 +34,7 @@ class InMemoryDatabase : public URLDatabase {
 
  protected:
   // Implemented for URLDatabase.
-  virtual sql::Connection& GetDB() override;
+  sql::Connection& GetDB() override;
 
  private:
   // Initializes the database connection, this is the shared code between
diff --git a/components/history/core/browser/url_database_unittest.cc b/components/history/core/browser/url_database_unittest.cc
index 804df15..000d70c 100644
--- a/components/history/core/browser/url_database_unittest.cc
+++ b/components/history/core/browser/url_database_unittest.cc
@@ -41,9 +41,7 @@ class URLDatabaseTest : public testing::Test,
 
  protected:
   // Provided for URL/VisitDatabase.
-  virtual sql::Connection& GetDB() override {
-    return db_;
-  }
+  sql::Connection& GetDB() override { return db_; }
 
  private:
   // Test setup.
diff --git a/components/history/core/browser/url_row.h b/components/history/core/browser/url_row.h
index 8c8315a..f7c956b 100644
--- a/components/history/core/browser/url_row.h
+++ b/components/history/core/browser/url_row.h
@@ -167,7 +167,7 @@ class URLResult : public URLRow {
   URLResult(const GURL& url,
             const query_parser::Snippet::MatchPositions& title_matches);
   explicit URLResult(const URLRow& url_row);
-  virtual ~URLResult();
+  ~URLResult() override;
 
   base::Time visit_time() const { return visit_time_; }
   void set_visit_time(base::Time visit_time) { visit_time_ = visit_time; }
diff --git a/components/history/core/test/history_client_fake_bookmarks.h b/components/history/core/test/history_client_fake_bookmarks.h
index b4afeb1..ee5c540 100644
--- a/components/history/core/test/history_client_fake_bookmarks.h
+++ b/components/history/core/test/history_client_fake_bookmarks.h
@@ -16,7 +16,7 @@ namespace history {
 class HistoryClientFakeBookmarks : public HistoryClient {
  public:
   HistoryClientFakeBookmarks();
-  virtual ~HistoryClientFakeBookmarks();
+  ~HistoryClientFakeBookmarks() override;
 
   void ClearAllBookmarks();
   void AddBookmark(const GURL& url);
@@ -24,8 +24,8 @@ class HistoryClientFakeBookmarks : public HistoryClient {
   void DelBookmark(const GURL& url);
 
   // HistoryClient:
-  virtual bool IsBookmarked(const GURL& url) override;
-  virtual void GetBookmarks(std::vector<URLAndTitle>* bookmarks) override;
+  bool IsBookmarked(const GURL& url) override;
+  void GetBookmarks(std::vector<URLAndTitle>* bookmarks) override;
 
  private:
   std::map<GURL, base::string16> bookmarks_;
diff --git a/components/infobars/core/confirm_infobar_delegate.h b/components/infobars/core/confirm_infobar_delegate.h
index f88206c..1e1930d 100644
--- a/components/infobars/core/confirm_infobar_delegate.h
+++ b/components/infobars/core/confirm_infobar_delegate.h
@@ -23,10 +23,10 @@ class ConfirmInfoBarDelegate : public infobars::InfoBarDelegate {
     BUTTON_CANCEL = 1 << 1,
   };
 
-  virtual ~ConfirmInfoBarDelegate();
+  ~ConfirmInfoBarDelegate() override;
 
   // Returns the InfoBar type to be displayed for the InfoBar.
-  virtual InfoBarAutomationType GetInfoBarAutomationType() const override;
+  InfoBarAutomationType GetInfoBarAutomationType() const override;
 
   // Returns the message string to be displayed for the InfoBar.
   virtual base::string16 GetMessageText() const = 0;
@@ -70,14 +70,12 @@ class ConfirmInfoBarDelegate : public infobars::InfoBarDelegate {
   static scoped_ptr<infobars::InfoBar> CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate> delegate);
 
-  virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const override;
+  bool ShouldExpireInternal(const NavigationDetails& details) const override;
 
  private:
   // InfoBarDelegate:
-  virtual bool EqualsDelegate(
-      infobars::InfoBarDelegate* delegate) const override;
-  virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() override;
+  bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override;
+  ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() override;
 
   DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBarDelegate);
 };
diff --git a/components/infobars/core/infobar.h b/components/infobars/core/infobar.h
index 86d0f0d..6124d88 100644
--- a/components/infobars/core/infobar.h
+++ b/components/infobars/core/infobar.h
@@ -51,7 +51,7 @@ class InfoBar : public gfx::AnimationDelegate {
   static const int kMaximumArrowTargetHalfWidth;
 
   explicit InfoBar(scoped_ptr<InfoBarDelegate> delegate);
-  virtual ~InfoBar();
+  ~InfoBar() override;
 
   static SkColor GetTopColor(InfoBarDelegate::Type infobar_type);
   static SkColor GetBottomColor(InfoBarDelegate::Type infobar_type);
@@ -98,7 +98,7 @@ class InfoBar : public gfx::AnimationDelegate {
 
  protected:
   // gfx::AnimationDelegate:
-  virtual void AnimationProgressed(const gfx::Animation* animation) override;
+  void AnimationProgressed(const gfx::Animation* animation) override;
 
   const InfoBarContainer* container() const { return container_; }
   InfoBarContainer* container() { return container_; }
@@ -116,7 +116,7 @@ class InfoBar : public gfx::AnimationDelegate {
 
  private:
   // gfx::AnimationDelegate:
-  virtual void AnimationEnded(const gfx::Animation* animation) override;
+  void AnimationEnded(const gfx::Animation* animation) override;
 
   // Finds the new desired arrow and bar heights, and if they differ from the
   // current ones, calls PlatformSpecificOnHeightRecalculated().  Informs our
diff --git a/components/infobars/core/infobar_container.h b/components/infobars/core/infobar_container.h
index eda97aa..f802ab1 100644
--- a/components/infobars/core/infobar_container.h
+++ b/components/infobars/core/infobar_container.h
@@ -102,11 +102,10 @@ class InfoBarContainer : public InfoBarManager::Observer {
   typedef std::vector<InfoBar*> InfoBars;
 
   // InfoBarManager::Observer:
-  virtual void OnInfoBarAdded(InfoBar* infobar) override;
-  virtual void OnInfoBarRemoved(InfoBar* infobar, bool animate) override;
-  virtual void OnInfoBarReplaced(InfoBar* old_infobar,
-                                 InfoBar* new_infobar) override;
-  virtual void OnManagerShuttingDown(InfoBarManager* manager) override;
+  void OnInfoBarAdded(InfoBar* infobar) override;
+  void OnInfoBarRemoved(InfoBar* infobar, bool animate) override;
+  void OnInfoBarReplaced(InfoBar* old_infobar, InfoBar* new_infobar) override;
+  void OnManagerShuttingDown(InfoBarManager* manager) override;
 
   // Adds |infobar| to this container before the existing infobar at position
   // |position| and calls Show() on it.  |animate| is passed along to
diff --git a/components/invalidation/fake_invalidation_handler.h b/components/invalidation/fake_invalidation_handler.h
index 7711a2f..8ba2009 100644
--- a/components/invalidation/fake_invalidation_handler.h
+++ b/components/invalidation/fake_invalidation_handler.h
@@ -17,17 +17,17 @@ namespace syncer {
 class FakeInvalidationHandler : public InvalidationHandler {
  public:
   FakeInvalidationHandler();
-  virtual ~FakeInvalidationHandler();
+  ~FakeInvalidationHandler() override;
 
   InvalidatorState GetInvalidatorState() const;
   const ObjectIdInvalidationMap& GetLastInvalidationMap() const;
   int GetInvalidationCount() const;
 
   // InvalidationHandler implementation.
-  virtual void OnInvalidatorStateChange(InvalidatorState state) override;
-  virtual void OnIncomingInvalidation(
+  void OnInvalidatorStateChange(InvalidatorState state) override;
+  void OnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) override;
-  virtual std::string GetOwnerName() const override;
+  std::string GetOwnerName() const override;
 
  private:
   InvalidatorState state_;
diff --git a/components/invalidation/fake_invalidation_state_tracker.h b/components/invalidation/fake_invalidation_state_tracker.h
index 4058f8e..1388bad 100644
--- a/components/invalidation/fake_invalidation_state_tracker.h
+++ b/components/invalidation/fake_invalidation_state_tracker.h
@@ -17,17 +17,16 @@ class FakeInvalidationStateTracker
       public base::SupportsWeakPtr<FakeInvalidationStateTracker> {
  public:
   FakeInvalidationStateTracker();
-  virtual ~FakeInvalidationStateTracker();
+  ~FakeInvalidationStateTracker() override;
 
   // InvalidationStateTracker implementation.
-  virtual void ClearAndSetNewClientId(const std::string& client_id) override;
-  virtual std::string GetInvalidatorClientId() const override;
-  virtual void SetBootstrapData(const std::string& data) override;
-  virtual std::string GetBootstrapData() const override;
-  virtual void SetSavedInvalidations(
-      const UnackedInvalidationsMap& states) override;
-  virtual UnackedInvalidationsMap GetSavedInvalidations() const override;
-  virtual void Clear() override;
+  void ClearAndSetNewClientId(const std::string& client_id) override;
+  std::string GetInvalidatorClientId() const override;
+  void SetBootstrapData(const std::string& data) override;
+  std::string GetBootstrapData() const override;
+  void SetSavedInvalidations(const UnackedInvalidationsMap& states) override;
+  UnackedInvalidationsMap GetSavedInvalidations() const override;
+  void Clear() override;
 
   static const int64 kMinVersion;
 
diff --git a/components/invalidation/fake_invalidator.h b/components/invalidation/fake_invalidator.h
index ef19f07..b040027 100644
--- a/components/invalidation/fake_invalidator.h
+++ b/components/invalidation/fake_invalidator.h
@@ -18,7 +18,7 @@ namespace syncer {
 class FakeInvalidator : public Invalidator {
  public:
   FakeInvalidator();
-  virtual ~FakeInvalidator();
+  ~FakeInvalidator() override;
 
   bool IsHandlerRegistered(InvalidationHandler* handler) const;
   ObjectIdSet GetRegisteredIds(InvalidationHandler* handler) const;
@@ -30,16 +30,15 @@ class FakeInvalidator : public Invalidator {
   void EmitOnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map);
 
-  virtual void RegisterHandler(InvalidationHandler* handler) override;
-  virtual void UpdateRegisteredIds(InvalidationHandler* handler,
-                                   const ObjectIdSet& ids) override;
-  virtual void UnregisterHandler(InvalidationHandler* handler) override;
-  virtual InvalidatorState GetInvalidatorState() const override;
-  virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) override;
-  virtual void RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> callback) const
-    override;
+  void RegisterHandler(InvalidationHandler* handler) override;
+  void UpdateRegisteredIds(InvalidationHandler* handler,
+                           const ObjectIdSet& ids) override;
+  void UnregisterHandler(InvalidationHandler* handler) override;
+  InvalidatorState GetInvalidatorState() const override;
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override;
+  void RequestDetailedStatus(base::Callback<void(const base::DictionaryValue&)>
+                                 callback) const override;
 
  private:
   InvalidatorRegistrar registrar_;
diff --git a/components/invalidation/gcm_invalidation_bridge.cc b/components/invalidation/gcm_invalidation_bridge.cc
index 1ff5aa6..23cb09e 100644
--- a/components/invalidation/gcm_invalidation_bridge.cc
+++ b/components/invalidation/gcm_invalidation_bridge.cc
@@ -38,14 +38,14 @@ class GCMInvalidationBridge::Core : public syncer::GCMNetworkChannelDelegate,
  public:
   Core(base::WeakPtr<GCMInvalidationBridge> bridge,
        scoped_refptr<base::SingleThreadTaskRunner> ui_thread_task_runner);
-  virtual ~Core();
+  ~Core() override;
 
   // syncer::GCMNetworkChannelDelegate implementation.
-  virtual void Initialize(ConnectionStateCallback callback) override;
-  virtual void RequestToken(RequestTokenCallback callback) override;
-  virtual void InvalidateToken(const std::string& token) override;
-  virtual void Register(RegisterCallback callback) override;
-  virtual void SetMessageReceiver(MessageCallback callback) override;
+  void Initialize(ConnectionStateCallback callback) override;
+  void RequestToken(RequestTokenCallback callback) override;
+  void InvalidateToken(const std::string& token) override;
+  void Register(RegisterCallback callback) override;
+  void SetMessageReceiver(MessageCallback callback) override;
 
   void RequestTokenFinished(RequestTokenCallback callback,
                             const GoogleServiceAuthError& error,
diff --git a/components/invalidation/gcm_invalidation_bridge.h b/components/invalidation/gcm_invalidation_bridge.h
index 2a5f7f3..4f3e735 100644
--- a/components/invalidation/gcm_invalidation_bridge.h
+++ b/components/invalidation/gcm_invalidation_bridge.h
@@ -41,30 +41,29 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
 
   GCMInvalidationBridge(gcm::GCMDriver* gcm_driver,
                         IdentityProvider* identity_provider);
-  virtual ~GCMInvalidationBridge();
+  ~GCMInvalidationBridge() override;
 
   // OAuth2TokenService::Consumer implementation.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // gcm::GCMAppHandler implementation.
-  virtual void ShutdownHandler() override;
-  virtual void OnMessage(
-      const std::string& app_id,
-      const gcm::GCMClient::IncomingMessage& message) override;
-  virtual void OnMessagesDeleted(const std::string& app_id) override;
-  virtual void OnSendError(
+  void ShutdownHandler() override;
+  void OnMessage(const std::string& app_id,
+                 const gcm::GCMClient::IncomingMessage& message) override;
+  void OnMessagesDeleted(const std::string& app_id) override;
+  void OnSendError(
       const std::string& app_id,
       const gcm::GCMClient::SendErrorDetails& send_error_details) override;
-  virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) override;
+  void OnSendAcknowledged(const std::string& app_id,
+                          const std::string& message_id) override;
 
   // gcm::GCMConnectionObserver implementation.
-  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override;
-  virtual void OnDisconnected() override;
+  void OnConnected(const net::IPEndPoint& ip_endpoint) override;
+  void OnDisconnected() override;
 
   scoped_ptr<syncer::GCMNetworkChannelDelegate> CreateDelegate();
 
diff --git a/components/invalidation/gcm_network_channel.h b/components/invalidation/gcm_network_channel.h
index 8fecd5a..bf84518 100644
--- a/components/invalidation/gcm_network_channel.h
+++ b/components/invalidation/gcm_network_channel.h
@@ -56,25 +56,25 @@ class INVALIDATION_EXPORT_PRIVATE GCMNetworkChannel
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       scoped_ptr<GCMNetworkChannelDelegate> delegate);
 
-  virtual ~GCMNetworkChannel();
+  ~GCMNetworkChannel() override;
 
   // invalidation::NetworkChannel implementation.
-  virtual void SendMessage(const std::string& message) override;
-  virtual void SetMessageReceiver(
+  void SendMessage(const std::string& message) override;
+  void SetMessageReceiver(
       invalidation::MessageCallback* incoming_receiver) override;
 
   // SyncNetworkChannel implementation.
-  virtual void UpdateCredentials(const std::string& email,
-                                 const std::string& token) override;
-  virtual int GetInvalidationClientType() override;
-  virtual void RequestDetailedStatus(
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override;
+  int GetInvalidationClientType() override;
+  void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> callback) override;
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // NetworkChangeObserver implementation.
-  virtual void OnNetworkChanged(
+  void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType connection_type) override;
 
  protected:
diff --git a/components/invalidation/gcm_network_channel_unittest.cc b/components/invalidation/gcm_network_channel_unittest.cc
index 94cd3d2..4204535 100644
--- a/components/invalidation/gcm_network_channel_unittest.cc
+++ b/components/invalidation/gcm_network_channel_unittest.cc
@@ -17,25 +17,25 @@ class TestGCMNetworkChannelDelegate : public GCMNetworkChannelDelegate {
   TestGCMNetworkChannelDelegate()
       : register_call_count_(0) {}
 
-  virtual void Initialize(
+  void Initialize(
       GCMNetworkChannelDelegate::ConnectionStateCallback callback) override {
     connection_state_callback = callback;
   }
 
-  virtual void RequestToken(RequestTokenCallback callback) override {
+  void RequestToken(RequestTokenCallback callback) override {
     request_token_callback = callback;
   }
 
-  virtual void InvalidateToken(const std::string& token) override {
+  void InvalidateToken(const std::string& token) override {
     invalidated_token = token;
   }
 
-  virtual void Register(RegisterCallback callback) override {
+  void Register(RegisterCallback callback) override {
     ++register_call_count_;
     register_callback = callback;
   }
 
-  virtual void SetMessageReceiver(MessageCallback callback) override {
+  void SetMessageReceiver(MessageCallback callback) override {
     message_callback = callback;
   }
 
@@ -86,7 +86,7 @@ class TestGCMNetworkChannel : public GCMNetworkChannel {
  protected:
   // On Android GCMNetworkChannel::BuildUrl hits NOTREACHED(). I still want
   // tests to run.
-  virtual GURL BuildUrl(const std::string& registration_id) override {
+  GURL BuildUrl(const std::string& registration_id) override {
     return GURL("http://test.url.com");
   }
 };
@@ -110,7 +110,7 @@ class TestNetworkChannelURLFetcher : public net::FakeURLFetcher {
                             status),
         test_(test) {}
 
-  virtual void AddExtraRequestHeader(const std::string& header_line) override;
+  void AddExtraRequestHeader(const std::string& header_line) override;
 
  private:
   GCMNetworkChannelTest* test_;
@@ -166,7 +166,7 @@ class GCMNetworkChannelTest
     return GCMNetworkChannel::Base64DecodeURLSafe(input, output);
   }
 
-  virtual void OnNetworkChannelStateChanged(
+  void OnNetworkChannelStateChanged(
       InvalidatorState invalidator_state) override {
     last_invalidator_state_ = invalidator_state;
   }
diff --git a/components/invalidation/invalidation_logger_unittest.cc b/components/invalidation/invalidation_logger_unittest.cc
index 929b81d..28e5407 100644
--- a/components/invalidation/invalidation_logger_unittest.cc
+++ b/components/invalidation/invalidation_logger_unittest.cc
@@ -24,34 +24,33 @@ class InvalidationLoggerObserverTest : public InvalidationLoggerObserver {
     registered_handlers = std::multiset<std::string>();
   }
 
-  virtual void OnRegistrationChange(const std::multiset<std::string>& handlers)
-      override {
+  void OnRegistrationChange(
+      const std::multiset<std::string>& handlers) override {
     registered_handlers = handlers;
     registration_change_received = true;
   }
 
-  virtual void OnStateChange(const syncer::InvalidatorState& new_state,
-                             const base::Time& last_change_timestamp)
-      override {
+  void OnStateChange(const syncer::InvalidatorState& new_state,
+                     const base::Time& last_change_timestamp) override {
     state_received = true;
   }
 
-  virtual void OnUpdateIds(const std::string& handler,
-                           const syncer::ObjectIdCountMap& details) override {
+  void OnUpdateIds(const std::string& handler,
+                   const syncer::ObjectIdCountMap& details) override {
     update_id_received = true;
     update_id_replicated[handler] = details;
   }
 
-  virtual void OnDebugMessage(const base::DictionaryValue& details) override {
+  void OnDebugMessage(const base::DictionaryValue& details) override {
     debug_message_received = true;
   }
 
-  virtual void OnInvalidation(
+  void OnInvalidation(
       const syncer::ObjectIdInvalidationMap& new_invalidations) override {
     invalidation_received = true;
   }
 
-  virtual void OnDetailedStatus(const base::DictionaryValue& details) override {
+  void OnDetailedStatus(const base::DictionaryValue& details) override {
     detailed_status_received = true;
   }
 
diff --git a/components/invalidation/invalidation_notifier.h b/components/invalidation/invalidation_notifier.h
index bf7147d..1b0bbda 100644
--- a/components/invalidation/invalidation_notifier.h
+++ b/components/invalidation/invalidation_notifier.h
@@ -50,24 +50,22 @@ class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
           invalidation_state_tracker_task_runner,
       const std::string& client_info);
 
-  virtual ~InvalidationNotifier();
+  ~InvalidationNotifier() override;
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) override;
-  virtual void UpdateRegisteredIds(InvalidationHandler* handler,
-                                   const ObjectIdSet& ids) override;
-  virtual void UnregisterHandler(InvalidationHandler* handler) override;
-  virtual InvalidatorState GetInvalidatorState() const override;
-  virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) override;
-  virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) const
-      override;
+  void RegisterHandler(InvalidationHandler* handler) override;
+  void UpdateRegisteredIds(InvalidationHandler* handler,
+                           const ObjectIdSet& ids) override;
+  void UnregisterHandler(InvalidationHandler* handler) override;
+  InvalidatorState GetInvalidatorState() const override;
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override;
+  void RequestDetailedStatus(base::Callback<void(const base::DictionaryValue&)>
+                                 callback) const override;
 
   // SyncInvalidationListener::Delegate implementation.
-  virtual void OnInvalidate(
-      const ObjectIdInvalidationMap& invalidation_map) override;
-  virtual void OnInvalidatorStateChange(InvalidatorState state) override;
+  void OnInvalidate(const ObjectIdInvalidationMap& invalidation_map) override;
+  void OnInvalidatorStateChange(InvalidatorState state) override;
 
  private:
   // We start off in the STOPPED state.  When we get our initial
diff --git a/components/invalidation/invalidation_service_test_template.h b/components/invalidation/invalidation_service_test_template.h
index d6eb985..dc4a841 100644
--- a/components/invalidation/invalidation_service_test_template.h
+++ b/components/invalidation/invalidation_service_test_template.h
@@ -339,7 +339,7 @@ class BoundFakeInvalidationHandler : public syncer::FakeInvalidationHandler {
  public:
   explicit BoundFakeInvalidationHandler(
       const invalidation::InvalidationService& invalidator);
-  virtual ~BoundFakeInvalidationHandler();
+  ~BoundFakeInvalidationHandler() override;
 
   // Returns the last return value of GetInvalidatorState() on the
   // bound invalidator from the last time the invalidator state
@@ -347,8 +347,7 @@ class BoundFakeInvalidationHandler : public syncer::FakeInvalidationHandler {
   syncer::InvalidatorState GetLastRetrievedState() const;
 
   // InvalidationHandler implementation.
-  virtual void OnInvalidatorStateChange(
-      syncer::InvalidatorState state) override;
+  void OnInvalidatorStateChange(syncer::InvalidatorState state) override;
 
  private:
   const invalidation::InvalidationService& invalidator_;
diff --git a/components/invalidation/invalidator_registrar_unittest.cc b/components/invalidation/invalidator_registrar_unittest.cc
index 77b3746..729415c 100644
--- a/components/invalidation/invalidator_registrar_unittest.cc
+++ b/components/invalidation/invalidator_registrar_unittest.cc
@@ -22,36 +22,36 @@ namespace {
 class RegistrarInvalidator : public Invalidator {
  public:
   RegistrarInvalidator() {}
-  virtual ~RegistrarInvalidator() {}
+  ~RegistrarInvalidator() override {}
 
   InvalidatorRegistrar* GetRegistrar() {
     return &registrar_;
   }
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) override {
+  void RegisterHandler(InvalidationHandler* handler) override {
     registrar_.RegisterHandler(handler);
   }
 
-  virtual void UpdateRegisteredIds(InvalidationHandler* handler,
-                                   const ObjectIdSet& ids) override {
+  void UpdateRegisteredIds(InvalidationHandler* handler,
+                           const ObjectIdSet& ids) override {
     registrar_.UpdateRegisteredIds(handler, ids);
   }
 
-  virtual void UnregisterHandler(InvalidationHandler* handler) override {
+  void UnregisterHandler(InvalidationHandler* handler) override {
     registrar_.UnregisterHandler(handler);
   }
 
-  virtual InvalidatorState GetInvalidatorState() const override {
+  InvalidatorState GetInvalidatorState() const override {
     return registrar_.GetInvalidatorState();
   }
 
-  virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) override {
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override {
     // Do nothing.
   }
 
-  virtual void RequestDetailedStatus(
+  void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> call) const override {
     // Do nothing.
   }
diff --git a/components/invalidation/invalidator_storage.h b/components/invalidation/invalidator_storage.h
index 1c922bd..3606188 100644
--- a/components/invalidation/invalidator_storage.h
+++ b/components/invalidation/invalidator_storage.h
@@ -26,7 +26,7 @@ class InvalidatorStorage : public syncer::InvalidationStateTracker {
  public:
   // |pref_service| may not be NULL and must outlive |this|.
   explicit InvalidatorStorage(PrefService* pref_service);
-  virtual ~InvalidatorStorage();
+  ~InvalidatorStorage() override;
 
   // Register prefs to be used by per-Profile instances of this class which
   // store invalidation state in Profile prefs.
@@ -37,15 +37,14 @@ class InvalidatorStorage : public syncer::InvalidationStateTracker {
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // InvalidationStateTracker implementation.
-  virtual void ClearAndSetNewClientId(const std::string& client_id) override;
-  virtual std::string GetInvalidatorClientId() const override;
-  virtual void SetBootstrapData(const std::string& data) override;
-  virtual std::string GetBootstrapData() const override;
-  virtual void SetSavedInvalidations(
+  void ClearAndSetNewClientId(const std::string& client_id) override;
+  std::string GetInvalidatorClientId() const override;
+  void SetBootstrapData(const std::string& data) override;
+  std::string GetBootstrapData() const override;
+  void SetSavedInvalidations(
       const syncer::UnackedInvalidationsMap& map) override;
-  virtual syncer::UnackedInvalidationsMap GetSavedInvalidations()
-      const override;
-  virtual void Clear() override;
+  syncer::UnackedInvalidationsMap GetSavedInvalidations() const override;
+  void Clear() override;
 
  private:
   base::ThreadChecker thread_checker_;
diff --git a/components/invalidation/invalidator_test_template.h b/components/invalidation/invalidator_test_template.h
index 277d8b3..f6a8cef 100644
--- a/components/invalidation/invalidator_test_template.h
+++ b/components/invalidation/invalidator_test_template.h
@@ -332,7 +332,7 @@ namespace internal {
 class BoundFakeInvalidationHandler : public FakeInvalidationHandler {
  public:
   explicit BoundFakeInvalidationHandler(const Invalidator& invalidator);
-  virtual ~BoundFakeInvalidationHandler();
+  ~BoundFakeInvalidationHandler() override;
 
   // Returns the last return value of GetInvalidatorState() on the
   // bound invalidator from the last time the invalidator state
@@ -340,7 +340,7 @@ class BoundFakeInvalidationHandler : public FakeInvalidationHandler {
   InvalidatorState GetLastRetrievedState() const;
 
   // InvalidationHandler implementation.
-  virtual void OnInvalidatorStateChange(InvalidatorState state) override;
+  void OnInvalidatorStateChange(InvalidatorState state) override;
 
  private:
   const Invalidator& invalidator_;
diff --git a/components/invalidation/mock_ack_handler.h b/components/invalidation/mock_ack_handler.h
index ea4e622..8afcb4f 100644
--- a/components/invalidation/mock_ack_handler.h
+++ b/components/invalidation/mock_ack_handler.h
@@ -25,7 +25,7 @@ class INVALIDATION_EXPORT MockAckHandler
     public base::SupportsWeakPtr<MockAckHandler> {
  public:
   MockAckHandler();
-  virtual ~MockAckHandler();
+  ~MockAckHandler() override;
 
   // Sets up some internal state to track this invalidation, and modifies it so
   // that its Acknowledge() and Drop() methods will route back to us.
@@ -54,12 +54,9 @@ class INVALIDATION_EXPORT MockAckHandler
   bool AllInvalidationsAccountedFor() const;
 
   // Implementation of AckHandler.
-  virtual void Acknowledge(
-      const invalidation::ObjectId& id,
-      const AckHandle& handle) override;
-  virtual void Drop(
-      const invalidation::ObjectId& id,
-      const AckHandle& handle) override;
+  void Acknowledge(const invalidation::ObjectId& id,
+                   const AckHandle& handle) override;
+  void Drop(const invalidation::ObjectId& id, const AckHandle& handle) override;
 
  private:
   typedef std::vector<syncer::Invalidation> InvalidationVector;
diff --git a/components/invalidation/non_blocking_invalidator.cc b/components/invalidation/non_blocking_invalidator.cc
index ea99799..1d520b8 100644
--- a/components/invalidation/non_blocking_invalidator.cc
+++ b/components/invalidation/non_blocking_invalidator.cc
@@ -116,16 +116,16 @@ class NonBlockingInvalidator::Core
 
   // InvalidationHandler implementation (all called on I/O thread by
   // InvalidationNotifier).
-  virtual void OnInvalidatorStateChange(InvalidatorState reason) override;
-  virtual void OnIncomingInvalidation(
+  void OnInvalidatorStateChange(InvalidatorState reason) override;
+  void OnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) override;
-  virtual std::string GetOwnerName() const override;
+  std::string GetOwnerName() const override;
 
  private:
   friend class
       base::RefCountedThreadSafe<NonBlockingInvalidator::Core>;
   // Called on parent or I/O thread.
-  virtual ~Core();
+  ~Core() override;
 
   // The variables below should be used only on the I/O thread.
   const base::WeakPtr<NonBlockingInvalidator> delegate_observer_;
diff --git a/components/invalidation/non_blocking_invalidator.h b/components/invalidation/non_blocking_invalidator.h
index 853f093..0ca081a 100644
--- a/components/invalidation/non_blocking_invalidator.h
+++ b/components/invalidation/non_blocking_invalidator.h
@@ -51,19 +51,18 @@ class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
       const scoped_refptr<net::URLRequestContextGetter>&
           request_context_getter);
 
-  virtual ~NonBlockingInvalidator();
+  ~NonBlockingInvalidator() override;
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) override;
-  virtual void UpdateRegisteredIds(InvalidationHandler* handler,
-                                   const ObjectIdSet& ids) override;
-  virtual void UnregisterHandler(InvalidationHandler* handler) override;
-  virtual InvalidatorState GetInvalidatorState() const override;
-  virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) override;
-  virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) const
-      override;
+  void RegisterHandler(InvalidationHandler* handler) override;
+  void UpdateRegisteredIds(InvalidationHandler* handler,
+                           const ObjectIdSet& ids) override;
+  void UnregisterHandler(InvalidationHandler* handler) override;
+  InvalidatorState GetInvalidatorState() const override;
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override;
+  void RequestDetailedStatus(base::Callback<void(const base::DictionaryValue&)>
+                                 callback) const override;
 
   // Static functions to construct callback that creates network channel for
   // SyncSystemResources. The goal is to pass network channel to invalidator at
@@ -76,14 +75,13 @@ class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
       scoped_ptr<GCMNetworkChannelDelegate> delegate);
 
   // These methods are forwarded to the invalidation_state_tracker_.
-  virtual void ClearAndSetNewClientId(const std::string& data) override;
-  virtual std::string GetInvalidatorClientId() const override;
-  virtual void SetBootstrapData(const std::string& data) override;
-  virtual std::string GetBootstrapData() const override;
-  virtual void SetSavedInvalidations(
-      const UnackedInvalidationsMap& states) override;
-  virtual UnackedInvalidationsMap GetSavedInvalidations() const override;
-  virtual void Clear() override;
+  void ClearAndSetNewClientId(const std::string& data) override;
+  std::string GetInvalidatorClientId() const override;
+  void SetBootstrapData(const std::string& data) override;
+  std::string GetBootstrapData() const override;
+  void SetSavedInvalidations(const UnackedInvalidationsMap& states) override;
+  UnackedInvalidationsMap GetSavedInvalidations() const override;
+  void Clear() override;
 
  private:
   void OnInvalidatorStateChange(InvalidatorState state);
diff --git a/components/invalidation/p2p_invalidation_service.h b/components/invalidation/p2p_invalidation_service.h
index 65cd10f..741f165 100644
--- a/components/invalidation/p2p_invalidation_service.h
+++ b/components/invalidation/p2p_invalidation_service.h
@@ -34,23 +34,22 @@ class P2PInvalidationService : public base::NonThreadSafe,
       scoped_ptr<IdentityProvider> identity_provider,
       const scoped_refptr<net::URLRequestContextGetter>& request_context,
       syncer::P2PNotificationTarget notification_target);
-  virtual ~P2PInvalidationService();
+  ~P2PInvalidationService() override;
 
   // InvalidationService implementation.
   // It is an error to have registered handlers when the service is destroyed.
-  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 InvalidationLogger* GetInvalidationLogger() override;
-  virtual void RequestDetailedStatus(
+  syncer::InvalidatorState GetInvalidatorState() const override;
+  std::string GetInvalidatorClientId() const override;
+  InvalidationLogger* GetInvalidationLogger() override;
+  void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> caller) const override;
-  virtual IdentityProvider* GetIdentityProvider() override;
+  IdentityProvider* GetIdentityProvider() override;
 
   void UpdateCredentials(const std::string& username,
                          const std::string& password);
diff --git a/components/invalidation/p2p_invalidator.h b/components/invalidation/p2p_invalidator.h
index 932765a..3933d68 100644
--- a/components/invalidation/p2p_invalidator.h
+++ b/components/invalidation/p2p_invalidator.h
@@ -98,25 +98,24 @@ class INVALIDATION_EXPORT_PRIVATE P2PInvalidator
                  const std::string& invalidator_client_id,
                  P2PNotificationTarget send_notification_target);
 
-  virtual ~P2PInvalidator();
+  ~P2PInvalidator() override;
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) override;
-  virtual void UpdateRegisteredIds(InvalidationHandler* handler,
-                                   const ObjectIdSet& ids) override;
-  virtual void UnregisterHandler(InvalidationHandler* handler) override;
-  virtual InvalidatorState GetInvalidatorState() const override;
-  virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) override;
-  virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) const
-      override;
+  void RegisterHandler(InvalidationHandler* handler) override;
+  void UpdateRegisteredIds(InvalidationHandler* handler,
+                           const ObjectIdSet& ids) override;
+  void UnregisterHandler(InvalidationHandler* handler) override;
+  InvalidatorState GetInvalidatorState() const override;
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override;
+  void RequestDetailedStatus(base::Callback<void(const base::DictionaryValue&)>
+                                 callback) const override;
 
   // PushClientObserver implementation.
-  virtual void OnNotificationsEnabled() override;
-  virtual void OnNotificationsDisabled(
+  void OnNotificationsEnabled() override;
+  void OnNotificationsDisabled(
       notifier::NotificationsDisabledReason reason) override;
-  virtual void OnIncomingNotification(
+  void OnIncomingNotification(
       const notifier::Notification& notification) override;
 
   void SendInvalidation(const ObjectIdSet& ids);
diff --git a/components/invalidation/profile_invalidation_provider.h b/components/invalidation/profile_invalidation_provider.h
index ef73f12..8277926 100644
--- a/components/invalidation/profile_invalidation_provider.h
+++ b/components/invalidation/profile_invalidation_provider.h
@@ -19,12 +19,12 @@ class ProfileInvalidationProvider : public KeyedService {
  public:
   explicit ProfileInvalidationProvider(
       scoped_ptr<InvalidationService> invalidation_service);
-  virtual ~ProfileInvalidationProvider();
+  ~ProfileInvalidationProvider() override;
 
   InvalidationService* GetInvalidationService();
 
   // KeyedService:
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
  private:
   scoped_ptr<InvalidationService> invalidation_service_;
diff --git a/components/invalidation/push_client_channel.h b/components/invalidation/push_client_channel.h
index 7e3f002..51b0954 100644
--- a/components/invalidation/push_client_channel.h
+++ b/components/invalidation/push_client_channel.h
@@ -30,26 +30,26 @@ class INVALIDATION_EXPORT_PRIVATE PushClientChannel
   // is destroyed.
   explicit PushClientChannel(scoped_ptr<notifier::PushClient> push_client);
 
-  virtual ~PushClientChannel();
+  ~PushClientChannel() override;
 
   // invalidation::NetworkChannel implementation.
-  virtual void SendMessage(const std::string& message) override;
-  virtual void RequestDetailedStatus(
+  void SendMessage(const std::string& message) override;
+  void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> callback) override;
 
   // SyncNetworkChannel implementation.
   // If not connected, connects with the given credentials.  If
   // already connected, the next connection attempt will use the given
   // credentials.
-  virtual void UpdateCredentials(const std::string& email,
-      const std::string& token) override;
-  virtual int GetInvalidationClientType() override;
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override;
+  int GetInvalidationClientType() override;
 
   // notifier::PushClient::Observer implementation.
-  virtual void OnNotificationsEnabled() override;
-  virtual void OnNotificationsDisabled(
+  void OnNotificationsEnabled() override;
+  void OnNotificationsDisabled(
       notifier::NotificationsDisabledReason reason) override;
-  virtual void OnIncomingNotification(
+  void OnIncomingNotification(
       const notifier::Notification& notification) override;
 
   const std::string& GetServiceContextForTest() const;
diff --git a/components/invalidation/push_client_channel_unittest.cc b/components/invalidation/push_client_channel_unittest.cc
index dd474cb..6ffab4f 100644
--- a/components/invalidation/push_client_channel_unittest.cc
+++ b/components/invalidation/push_client_channel_unittest.cc
@@ -33,7 +33,7 @@ class PushClientChannelTest
     push_client_channel_.RemoveObserver(this);
   }
 
-  virtual void OnNetworkChannelStateChanged(
+  void OnNetworkChannelStateChanged(
       InvalidatorState invalidator_state) override {
     last_invalidator_state_ = invalidator_state;
   }
diff --git a/components/invalidation/registration_manager_unittest.cc b/components/invalidation/registration_manager_unittest.cc
index 30e5865..c7bd729 100644
--- a/components/invalidation/registration_manager_unittest.cc
+++ b/components/invalidation/registration_manager_unittest.cc
@@ -28,16 +28,14 @@ class FakeRegistrationManager : public RegistrationManager {
       : RegistrationManager(invalidation_client),
         jitter_(0.0) {}
 
-  virtual ~FakeRegistrationManager() {}
+  ~FakeRegistrationManager() override {}
 
   void SetJitter(double jitter) {
     jitter_ = jitter;
   }
 
  protected:
-  virtual double GetJitter() override {
-    return jitter_;
-  }
+  double GetJitter() override { return jitter_; }
 
  private:
   double jitter_;
@@ -51,7 +49,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
  public:
   FakeInvalidationClient() {}
 
-  virtual ~FakeInvalidationClient() {}
+  ~FakeInvalidationClient() override {}
 
   void LoseRegistration(const invalidation::ObjectId& oid) {
     EXPECT_TRUE(ContainsKey(registered_ids_, oid));
@@ -64,27 +62,25 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
 
   // invalidation::InvalidationClient implementation.
 
-  virtual void Start() override {}
-  virtual void Stop() override {}
-  virtual void Acknowledge(const invalidation::AckHandle& handle) override {}
+  void Start() override {}
+  void Stop() override {}
+  void Acknowledge(const invalidation::AckHandle& handle) override {}
 
-  virtual void Register(const invalidation::ObjectId& oid) override {
+  void Register(const invalidation::ObjectId& oid) override {
     EXPECT_FALSE(ContainsKey(registered_ids_, oid));
     registered_ids_.insert(oid);
   }
 
-  virtual void Register(
-      const std::vector<invalidation::ObjectId>& oids) override {
+  void Register(const std::vector<invalidation::ObjectId>& oids) override {
     // Unused for now.
   }
 
-  virtual void Unregister(const invalidation::ObjectId& oid) override {
+  void Unregister(const invalidation::ObjectId& oid) override {
     EXPECT_TRUE(ContainsKey(registered_ids_, oid));
     registered_ids_.erase(oid);
   }
 
-  virtual void Unregister(
-      const std::vector<invalidation::ObjectId>& oids) override {
+  void Unregister(const std::vector<invalidation::ObjectId>& oids) override {
     // Unused for now.
   }
 
diff --git a/components/invalidation/sync_invalidation_listener.h b/components/invalidation/sync_invalidation_listener.h
index 2f22773..37fa7f1 100644
--- a/components/invalidation/sync_invalidation_listener.h
+++ b/components/invalidation/sync_invalidation_listener.h
@@ -68,7 +68,7 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
       scoped_ptr<SyncNetworkChannel> network_channel);
 
   // Calls Stop().
-  virtual ~SyncInvalidationListener();
+  ~SyncInvalidationListener() override;
 
   // Does not take ownership of |delegate| or |state_writer|.
   // |invalidation_state_tracker| must be initialized.
@@ -91,49 +91,41 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
   void UpdateRegisteredIds(const ObjectIdSet& ids);
 
   // invalidation::InvalidationListener implementation.
-  virtual void Ready(
-      invalidation::InvalidationClient* client) override;
-  virtual void Invalidate(
-      invalidation::InvalidationClient* client,
-      const invalidation::Invalidation& invalidation,
-      const invalidation::AckHandle& ack_handle) override;
-  virtual void InvalidateUnknownVersion(
+  void Ready(invalidation::InvalidationClient* client) override;
+  void Invalidate(invalidation::InvalidationClient* client,
+                  const invalidation::Invalidation& invalidation,
+                  const invalidation::AckHandle& ack_handle) override;
+  void InvalidateUnknownVersion(
       invalidation::InvalidationClient* client,
       const invalidation::ObjectId& object_id,
       const invalidation::AckHandle& ack_handle) override;
-  virtual void InvalidateAll(
-      invalidation::InvalidationClient* client,
-      const invalidation::AckHandle& ack_handle) override;
-  virtual void InformRegistrationStatus(
+  void InvalidateAll(invalidation::InvalidationClient* client,
+                     const invalidation::AckHandle& ack_handle) override;
+  void InformRegistrationStatus(
       invalidation::InvalidationClient* client,
       const invalidation::ObjectId& object_id,
       invalidation::InvalidationListener::RegistrationState reg_state) override;
-  virtual void InformRegistrationFailure(
-      invalidation::InvalidationClient* client,
-      const invalidation::ObjectId& object_id,
-      bool is_transient,
-      const std::string& error_message) override;
-  virtual void ReissueRegistrations(
-      invalidation::InvalidationClient* client,
-      const std::string& prefix,
-      int prefix_length) override;
-  virtual void InformError(
-      invalidation::InvalidationClient* client,
-      const invalidation::ErrorInfo& error_info) override;
+  void InformRegistrationFailure(invalidation::InvalidationClient* client,
+                                 const invalidation::ObjectId& object_id,
+                                 bool is_transient,
+                                 const std::string& error_message) override;
+  void ReissueRegistrations(invalidation::InvalidationClient* client,
+                            const std::string& prefix,
+                            int prefix_length) override;
+  void InformError(invalidation::InvalidationClient* client,
+                   const invalidation::ErrorInfo& error_info) override;
 
   // AckHandler implementation.
-  virtual void Acknowledge(
-      const invalidation::ObjectId& id,
-      const syncer::AckHandle& handle) override;
-  virtual void Drop(
-      const invalidation::ObjectId& id,
-      const syncer::AckHandle& handle) override;
+  void Acknowledge(const invalidation::ObjectId& id,
+                   const syncer::AckHandle& handle) override;
+  void Drop(const invalidation::ObjectId& id,
+            const syncer::AckHandle& handle) override;
 
   // StateWriter implementation.
-  virtual void WriteState(const std::string& state) override;
+  void WriteState(const std::string& state) override;
 
   // SyncNetworkChannel::Observer implementation.
-  virtual void OnNetworkChannelStateChanged(
+  void OnNetworkChannelStateChanged(
       InvalidatorState invalidator_state) override;
 
   void DoRegistrationUpdate();
diff --git a/components/invalidation/sync_invalidation_listener_unittest.cc b/components/invalidation/sync_invalidation_listener_unittest.cc
index 7231b19..3e1caf1 100644
--- a/components/invalidation/sync_invalidation_listener_unittest.cc
+++ b/components/invalidation/sync_invalidation_listener_unittest.cc
@@ -56,7 +56,7 @@ typedef std::set<AckHandle, AckHandleLessThan> AckHandleSet;
 class FakeInvalidationClient : public invalidation::InvalidationClient {
  public:
   FakeInvalidationClient() : started_(false) {}
-  virtual ~FakeInvalidationClient() {}
+  ~FakeInvalidationClient() override {}
 
   const ObjectIdSet& GetRegisteredIds() const {
     return registered_ids_;
@@ -72,15 +72,11 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
 
   // invalidation::InvalidationClient implementation.
 
-  virtual void Start() override {
-    started_ = true;
-  }
+  void Start() override { started_ = true; }
 
-  virtual void Stop() override {
-    started_ = false;
-  }
+  void Stop() override { started_ = false; }
 
-  virtual void Register(const ObjectId& object_id) override {
+  void Register(const ObjectId& object_id) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -88,8 +84,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     registered_ids_.insert(object_id);
   }
 
-  virtual void Register(
-      const invalidation::vector<ObjectId>& object_ids) override {
+  void Register(const invalidation::vector<ObjectId>& object_ids) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -97,7 +92,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     registered_ids_.insert(object_ids.begin(), object_ids.end());
   }
 
-  virtual void Unregister(const ObjectId& object_id) override {
+  void Unregister(const ObjectId& object_id) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -105,8 +100,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     registered_ids_.erase(object_id);
   }
 
-  virtual void Unregister(
-      const invalidation::vector<ObjectId>& object_ids) override {
+  void Unregister(const invalidation::vector<ObjectId>& object_ids) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -117,7 +111,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     }
   }
 
-  virtual void Acknowledge(const AckHandle& ack_handle) override {
+  void Acknowledge(const AckHandle& ack_handle) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -137,7 +131,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
  public:
   explicit FakeDelegate(SyncInvalidationListener* listener)
       : state_(TRANSIENT_INVALIDATION_ERROR) {}
-  virtual ~FakeDelegate() {}
+  ~FakeDelegate() override {}
 
   size_t GetInvalidationCount(const ObjectId& id) const {
     Map::const_iterator it = invalidations_.find(id);
@@ -222,8 +216,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
   }
 
   // SyncInvalidationListener::Delegate implementation.
-  virtual void OnInvalidate(
-      const ObjectIdInvalidationMap& invalidation_map) override {
+  void OnInvalidate(const ObjectIdInvalidationMap& invalidation_map) override {
     ObjectIdSet ids = invalidation_map.GetObjectIds();
     for (ObjectIdSet::iterator it = ids.begin(); it != ids.end(); ++it) {
       const SingleObjectInvalidationSet& incoming =
@@ -233,7 +226,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
     }
   }
 
-  virtual void OnInvalidatorStateChange(InvalidatorState state) override {
+  void OnInvalidatorStateChange(InvalidatorState state) override {
     state_ = state;
   }
 
diff --git a/components/invalidation/sync_system_resources.h b/components/invalidation/sync_system_resources.h
index b4b4a34..6aaac89 100644
--- a/components/invalidation/sync_system_resources.h
+++ b/components/invalidation/sync_system_resources.h
@@ -33,36 +33,37 @@ class SyncLogger : public invalidation::Logger {
  public:
   SyncLogger();
 
-  virtual ~SyncLogger();
+  ~SyncLogger() override;
 
   // invalidation::Logger implementation.
-  virtual void Log(LogLevel level, const char* file, int line,
-                   const char* format, ...) override;
+  void Log(LogLevel level,
+           const char* file,
+           int line,
+           const char* format,
+           ...) override;
 
-  virtual void SetSystemResources(
-      invalidation::SystemResources* resources) override;
+  void SetSystemResources(invalidation::SystemResources* resources) override;
 };
 
 class SyncInvalidationScheduler : public invalidation::Scheduler {
  public:
   SyncInvalidationScheduler();
 
-  virtual ~SyncInvalidationScheduler();
+  ~SyncInvalidationScheduler() override;
 
   // Start and stop the scheduler.
   void Start();
   void Stop();
 
   // invalidation::Scheduler implementation.
-  virtual void Schedule(invalidation::TimeDelta delay,
-                        invalidation::Closure* task) override;
+  void Schedule(invalidation::TimeDelta delay,
+                invalidation::Closure* task) override;
 
-  virtual bool IsRunningOnThread() const override;
+  bool IsRunningOnThread() const override;
 
-  virtual invalidation::Time GetCurrentTime() const override;
+  invalidation::Time GetCurrentTime() const override;
 
-  virtual void SetSystemResources(
-      invalidation::SystemResources* resources) override;
+  void SetSystemResources(invalidation::SystemResources* resources) override;
 
  private:
   // Runs the task, deletes it, and removes it from |posted_tasks_|.
@@ -99,17 +100,16 @@ class INVALIDATION_EXPORT_PRIVATE SyncNetworkChannel
 
   SyncNetworkChannel();
 
-  virtual ~SyncNetworkChannel();
+  ~SyncNetworkChannel() override;
 
   // invalidation::NetworkChannel implementation.
   // SyncNetworkChannel doesn't implement SendMessage. It is responsibility of
   // subclass to implement it.
-  virtual void SetMessageReceiver(
+  void SetMessageReceiver(
       invalidation::MessageCallback* incoming_receiver) override;
-  virtual void AddNetworkStatusReceiver(
+  void AddNetworkStatusReceiver(
       invalidation::NetworkStatusCallback* network_status_receiver) override;
-  virtual void SetSystemResources(
-      invalidation::SystemResources* resources) override;
+  void SetSystemResources(invalidation::SystemResources* resources) override;
 
   // Subclass should implement UpdateCredentials to pass new token to channel
   // library.
@@ -178,27 +178,26 @@ class SyncStorage : public invalidation::Storage {
  public:
   SyncStorage(StateWriter* state_writer, invalidation::Scheduler* scheduler);
 
-  virtual ~SyncStorage();
+  ~SyncStorage() override;
 
   void SetInitialState(const std::string& value) {
     cached_state_ = value;
   }
 
   // invalidation::Storage implementation.
-  virtual void WriteKey(const std::string& key, const std::string& value,
-                        invalidation::WriteKeyCallback* done) override;
+  void WriteKey(const std::string& key,
+                const std::string& value,
+                invalidation::WriteKeyCallback* done) override;
 
-  virtual void ReadKey(const std::string& key,
-                       invalidation::ReadKeyCallback* done) override;
+  void ReadKey(const std::string& key,
+               invalidation::ReadKeyCallback* done) override;
 
-  virtual void DeleteKey(const std::string& key,
-                         invalidation::DeleteKeyCallback* done) override;
+  void DeleteKey(const std::string& key,
+                 invalidation::DeleteKeyCallback* done) override;
 
-  virtual void ReadAllKeys(
-      invalidation::ReadAllKeysCallback* key_callback) override;
+  void ReadAllKeys(invalidation::ReadAllKeysCallback* key_callback) override;
 
-  virtual void SetSystemResources(
-      invalidation::SystemResources* resources) override;
+  void SetSystemResources(invalidation::SystemResources* resources) override;
 
  private:
   // Runs the given storage callback with SUCCESS status and deletes it.
@@ -220,19 +219,19 @@ class INVALIDATION_EXPORT_PRIVATE SyncSystemResources
   SyncSystemResources(SyncNetworkChannel* sync_network_channel,
                       StateWriter* state_writer);
 
-  virtual ~SyncSystemResources();
+  ~SyncSystemResources() override;
 
   // invalidation::SystemResources implementation.
-  virtual void Start() override;
-  virtual void Stop() override;
-  virtual bool IsStarted() const override;
+  void Start() override;
+  void Stop() override;
+  bool IsStarted() const override;
   virtual void set_platform(const std::string& platform);
-  virtual std::string platform() const override;
-  virtual SyncLogger* logger() override;
-  virtual SyncStorage* storage() override;
-  virtual SyncNetworkChannel* network() override;
-  virtual SyncInvalidationScheduler* internal_scheduler() override;
-  virtual SyncInvalidationScheduler* listener_scheduler() override;
+  std::string platform() const override;
+  SyncLogger* logger() override;
+  SyncStorage* storage() override;
+  SyncNetworkChannel* network() override;
+  SyncInvalidationScheduler* internal_scheduler() override;
+  SyncInvalidationScheduler* listener_scheduler() override;
 
  private:
   bool is_started_;
diff --git a/components/invalidation/sync_system_resources_unittest.cc b/components/invalidation/sync_system_resources_unittest.cc
index 0956b34..ea2fb52 100644
--- a/components/invalidation/sync_system_resources_unittest.cc
+++ b/components/invalidation/sync_system_resources_unittest.cc
@@ -179,24 +179,20 @@ TEST_F(SyncSystemResourcesTest, WriteState) {
 class TestSyncNetworkChannel : public SyncNetworkChannel {
  public:
   TestSyncNetworkChannel() {}
-  virtual ~TestSyncNetworkChannel() {}
+  ~TestSyncNetworkChannel() override {}
 
   using SyncNetworkChannel::NotifyNetworkStatusChange;
   using SyncNetworkChannel::NotifyChannelStateChange;
   using SyncNetworkChannel::DeliverIncomingMessage;
 
-  virtual void SendMessage(const std::string& message) override {
-  }
+  void SendMessage(const std::string& message) override {}
 
-  virtual void UpdateCredentials(const std::string& email,
-      const std::string& token) override {
-  }
+  void UpdateCredentials(const std::string& email,
+                         const std::string& token) override {}
 
-  virtual int GetInvalidationClientType() override {
-    return 0;
-  }
+  int GetInvalidationClientType() override { return 0; }
 
-  virtual void RequestDetailedStatus(
+  void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> callback) override {
     base::DictionaryValue value;
     callback.Run(value);
@@ -220,7 +216,7 @@ class SyncNetworkChannelTest
     network_channel_.RemoveObserver(this);
   }
 
-  virtual void OnNetworkChannelStateChanged(
+  void OnNetworkChannelStateChanged(
       InvalidatorState invalidator_state) override {
     last_invalidator_state_ = invalidator_state;
   }
diff --git a/components/invalidation/ticl_invalidation_service.h b/components/invalidation/ticl_invalidation_service.h
index d935d7b..2d385e6 100644
--- a/components/invalidation/ticl_invalidation_service.h
+++ b/components/invalidation/ticl_invalidation_service.h
@@ -65,54 +65,50 @@ class TiclInvalidationService : public base::NonThreadSafe,
       scoped_ptr<TiclSettingsProvider> settings_provider,
       gcm::GCMDriver* gcm_driver,
       const scoped_refptr<net::URLRequestContextGetter>& request_context);
-  virtual ~TiclInvalidationService();
+  ~TiclInvalidationService() override;
 
   void Init(
       scoped_ptr<syncer::InvalidationStateTracker> invalidation_state_tracker);
 
   // InvalidationService implementation.
   // It is an error to have registered handlers when the service is destroyed.
-  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 InvalidationLogger* GetInvalidationLogger() override;
-  virtual void RequestDetailedStatus(
+  syncer::InvalidatorState GetInvalidatorState() const override;
+  std::string GetInvalidatorClientId() const override;
+  InvalidationLogger* GetInvalidationLogger() override;
+  void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> caller) const override;
-  virtual IdentityProvider* GetIdentityProvider() override;
+  IdentityProvider* GetIdentityProvider() override;
 
   void RequestAccessToken();
 
   // OAuth2TokenService::Consumer implementation
-  virtual void OnGetTokenSuccess(
-      const OAuth2TokenService::Request* request,
-      const std::string& access_token,
-      const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(
-      const OAuth2TokenService::Request* request,
-      const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // OAuth2TokenService::Observer implementation
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
+  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void OnRefreshTokenRevoked(const std::string& account_id) override;
 
   // IdentityProvider::Observer implementation.
-  virtual void OnActiveAccountLogout() override;
+  void OnActiveAccountLogout() override;
 
   // TiclSettingsProvider::Observer implementation.
-  virtual void OnUseGCMChannelChanged() override;
+  void OnUseGCMChannelChanged() override;
 
   // syncer::InvalidationHandler implementation.
-  virtual void OnInvalidatorStateChange(
-      syncer::InvalidatorState state) override;
-  virtual void OnIncomingInvalidation(
+  void OnInvalidatorStateChange(syncer::InvalidatorState state) override;
+  void OnIncomingInvalidation(
       const syncer::ObjectIdInvalidationMap& invalidation_map) override;
-  virtual std::string GetOwnerName() const override;
+  std::string GetOwnerName() const override;
 
  protected:
   // Initializes with an injected invalidator.
diff --git a/components/invalidation/ticl_invalidation_service_unittest.cc b/components/invalidation/ticl_invalidation_service_unittest.cc
index 059071d..fe2a995 100644
--- a/components/invalidation/ticl_invalidation_service_unittest.cc
+++ b/components/invalidation/ticl_invalidation_service_unittest.cc
@@ -27,10 +27,10 @@ namespace {
 class FakeTiclSettingsProvider : public TiclSettingsProvider {
  public:
   FakeTiclSettingsProvider();
-  virtual ~FakeTiclSettingsProvider();
+  ~FakeTiclSettingsProvider() override;
 
   // TiclSettingsProvider:
-  virtual bool UseGCMChannel() const override;
+  bool UseGCMChannel() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeTiclSettingsProvider);
diff --git a/components/json_schema/json_schema_validator_unittest.cc b/components/json_schema/json_schema_validator_unittest.cc
index 134e5fc..ebd48c0 100644
--- a/components/json_schema/json_schema_validator_unittest.cc
+++ b/components/json_schema/json_schema_validator_unittest.cc
@@ -12,10 +12,10 @@ class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase {
   JSONSchemaValidatorCPPTest() : JSONSchemaValidatorTestBase() {}
 
  protected:
-  virtual void ExpectValid(const std::string& test_source,
-                           base::Value* instance,
-                           base::DictionaryValue* schema,
-                           base::ListValue* types) override {
+  void ExpectValid(const std::string& test_source,
+                   base::Value* instance,
+                   base::DictionaryValue* schema,
+                   base::ListValue* types) override {
     JSONSchemaValidator validator(schema, types);
     if (validator.Validate(instance))
       return;
@@ -27,12 +27,12 @@ class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase {
     }
   }
 
-  virtual void ExpectNotValid(
-      const std::string& test_source,
-      base::Value* instance, base::DictionaryValue* schema,
-      base::ListValue* types,
-      const std::string& expected_error_path,
-      const std::string& expected_error_message) override {
+  void ExpectNotValid(const std::string& test_source,
+                      base::Value* instance,
+                      base::DictionaryValue* schema,
+                      base::ListValue* types,
+                      const std::string& expected_error_path,
+                      const std::string& expected_error_message) override {
     JSONSchemaValidator validator(schema, types);
     if (validator.Validate(instance)) {
       ADD_FAILURE() << test_source;
diff --git a/components/keyed_service/content/browser_context_dependency_manager_unittest.cc b/components/keyed_service/content/browser_context_dependency_manager_unittest.cc
index e3bbdc1..fe8e088 100644
--- a/components/keyed_service/content/browser_context_dependency_manager_unittest.cc
+++ b/components/keyed_service/content/browser_context_dependency_manager_unittest.cc
@@ -33,14 +33,13 @@ class TestService : public BrowserContextKeyedServiceFactory {
         name_(name),
         fill_on_shutdown_(fill_on_shutdown) {}
 
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override {
     ADD_FAILURE() << "This isn't part of the tests!";
     return NULL;
   }
 
-  virtual void BrowserContextShutdown(content::BrowserContext* context)
-      override {
+  void BrowserContextShutdown(content::BrowserContext* context) override {
     fill_on_shutdown_->push_back(name_);
   }
 
diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.h b/components/keyed_service/content/browser_context_keyed_service_factory.h
index 8ad8e13..29637d4 100644
--- a/components/keyed_service/content/browser_context_keyed_service_factory.h
+++ b/components/keyed_service/content/browser_context_keyed_service_factory.h
@@ -56,7 +56,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory
   //   {}
   BrowserContextKeyedServiceFactory(const char* name,
                                     BrowserContextDependencyManager* manager);
-  virtual ~BrowserContextKeyedServiceFactory();
+  ~BrowserContextKeyedServiceFactory() override;
 
   // Common implementation that maps |context| to some service object. Deals
   // with incognito contexts per subclass instructions with
@@ -91,15 +91,12 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory
   // Secondly, BrowserContextDestroyed() is called on every ServiceFactory
   // and the default implementation removes it from |mapping_| and deletes
   // the pointer.
-  virtual void BrowserContextShutdown(content::BrowserContext* context)
-      override;
-  virtual void BrowserContextDestroyed(content::BrowserContext* context)
-      override;
-
-  virtual void SetEmptyTestingFactory(content::BrowserContext* context)
-      override;
-  virtual bool HasTestingFactory(content::BrowserContext* context) override;
-  virtual void CreateServiceNow(content::BrowserContext* context) override;
+  void BrowserContextShutdown(content::BrowserContext* context) override;
+  void BrowserContextDestroyed(content::BrowserContext* context) override;
+
+  void SetEmptyTestingFactory(content::BrowserContext* context) override;
+  bool HasTestingFactory(content::BrowserContext* context) override;
+  void CreateServiceNow(content::BrowserContext* context) override;
 
  private:
   friend class BrowserContextDependencyManager;
diff --git a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h
index 729b49b..f6f49ca 100644
--- a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h
+++ b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h
@@ -55,7 +55,7 @@ class KEYED_SERVICE_EXPORT RefcountedBrowserContextKeyedServiceFactory
   RefcountedBrowserContextKeyedServiceFactory(
       const char* name,
       BrowserContextDependencyManager* manager);
-  virtual ~RefcountedBrowserContextKeyedServiceFactory();
+  ~RefcountedBrowserContextKeyedServiceFactory() override;
 
   scoped_refptr<RefcountedKeyedService> GetServiceForBrowserContext(
       content::BrowserContext* context,
@@ -71,14 +71,11 @@ class KEYED_SERVICE_EXPORT RefcountedBrowserContextKeyedServiceFactory
   virtual scoped_refptr<RefcountedKeyedService> BuildServiceInstanceFor(
       content::BrowserContext* context) const = 0;
 
-  virtual void BrowserContextShutdown(content::BrowserContext* context)
-      override;
-  virtual void BrowserContextDestroyed(content::BrowserContext* context)
-      override;
-  virtual void SetEmptyTestingFactory(content::BrowserContext* context)
-      override;
-  virtual bool HasTestingFactory(content::BrowserContext* context) override;
-  virtual void CreateServiceNow(content::BrowserContext* context) override;
+  void BrowserContextShutdown(content::BrowserContext* context) override;
+  void BrowserContextDestroyed(content::BrowserContext* context) override;
+  void SetEmptyTestingFactory(content::BrowserContext* context) override;
+  bool HasTestingFactory(content::BrowserContext* context) override;
+  void CreateServiceNow(content::BrowserContext* context) override;
 
  private:
   typedef std::map<content::BrowserContext*,
diff --git a/components/metrics/daily_event_unittest.cc b/components/metrics/daily_event_unittest.cc
index a43b60b..d15def1 100644
--- a/components/metrics/daily_event_unittest.cc
+++ b/components/metrics/daily_event_unittest.cc
@@ -20,9 +20,7 @@ class TestDailyObserver : public DailyEvent::Observer {
 
   bool fired() const { return fired_; }
 
-  virtual void OnDailyEvent() override {
-    fired_ = true;
-  }
+  void OnDailyEvent() override { fired_ = true; }
 
   void Reset() {
     fired_ = false;
diff --git a/components/metrics/gpu/gpu_metrics_provider.h b/components/metrics/gpu/gpu_metrics_provider.h
index 810ef6e..06bbba3 100644
--- a/components/metrics/gpu/gpu_metrics_provider.h
+++ b/components/metrics/gpu/gpu_metrics_provider.h
@@ -15,10 +15,10 @@ namespace metrics {
 class GPUMetricsProvider : public MetricsProvider {
  public:
   GPUMetricsProvider();
-  virtual ~GPUMetricsProvider();
+  ~GPUMetricsProvider() override;
 
   // MetricsProvider:
-  virtual void ProvideSystemProfileMetrics(
+  void ProvideSystemProfileMetrics(
       SystemProfileProto* system_profile_proto) override;
 
  protected:
diff --git a/components/metrics/gpu/gpu_metrics_provider_unittest.cc b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
index c7eb31b..6624922 100644
--- a/components/metrics/gpu/gpu_metrics_provider_unittest.cc
+++ b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
@@ -21,20 +21,18 @@ const float kScreenScaleFactor = 2;
 class TestGPUMetricsProvider : public GPUMetricsProvider {
  public:
   TestGPUMetricsProvider() {}
-  virtual ~TestGPUMetricsProvider() {}
+  ~TestGPUMetricsProvider() override {}
 
  private:
-  virtual gfx::Size GetScreenSize() const override {
+  gfx::Size GetScreenSize() const override {
     return gfx::Size(kScreenWidth, kScreenHeight);
   }
 
-  virtual float GetScreenDeviceScaleFactor() const override {
+  float GetScreenDeviceScaleFactor() const override {
     return kScreenScaleFactor;
   }
 
-  virtual int GetScreenCount() const override {
-    return kScreenCount;
-  }
+  int GetScreenCount() const override { return kScreenCount; }
 
   DISALLOW_COPY_AND_ASSIGN(TestGPUMetricsProvider);
 };
diff --git a/components/metrics/metrics_log_unittest.cc b/components/metrics/metrics_log_unittest.cc
index eb85227..da38382 100644
--- a/components/metrics/metrics_log_unittest.cc
+++ b/components/metrics/metrics_log_unittest.cc
@@ -53,7 +53,7 @@ class TestMetricsLog : public MetricsLog {
     InitPrefs();
   }
 
-  virtual ~TestMetricsLog() {}
+  ~TestMetricsLog() override {}
 
   const ChromeUserMetricsExtension& uma_proto() const {
     return *MetricsLog::uma_proto();
@@ -69,9 +69,8 @@ class TestMetricsLog : public MetricsLog {
                       base::Int64ToString(kEnabledDate));
   }
 
-  virtual void GetFieldTrialIds(
-      std::vector<variations::ActiveGroupId>* field_trial_ids) const
-      override {
+  void GetFieldTrialIds(
+      std::vector<variations::ActiveGroupId>* field_trial_ids) const override {
     ASSERT_TRUE(field_trial_ids->empty());
 
     for (size_t i = 0; i < arraysize(kFieldTrialIds); ++i) {
diff --git a/components/metrics/metrics_service.h b/components/metrics/metrics_service.h
index 5263a01..eae44f3 100644
--- a/components/metrics/metrics_service.h
+++ b/components/metrics/metrics_service.h
@@ -98,7 +98,7 @@ class MetricsService : public base::HistogramFlattener {
   MetricsService(MetricsStateManager* state_manager,
                  MetricsServiceClient* client,
                  PrefService* local_state);
-  virtual ~MetricsService();
+  ~MetricsService() override;
 
   // Initializes metrics recording state. Updates various bookkeeping values in
   // prefs and sets up the scheduler. This is a separate function rather than
@@ -152,13 +152,13 @@ class MetricsService : public base::HistogramFlattener {
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // HistogramFlattener:
-  virtual void RecordDelta(const base::HistogramBase& histogram,
-                           const base::HistogramSamples& snapshot) override;
-  virtual void InconsistencyDetected(
+  void RecordDelta(const base::HistogramBase& histogram,
+                   const base::HistogramSamples& snapshot) override;
+  void InconsistencyDetected(
       base::HistogramBase::Inconsistency problem) override;
-  virtual void UniqueInconsistencyDetected(
+  void UniqueInconsistencyDetected(
       base::HistogramBase::Inconsistency problem) override;
-  virtual void InconsistencyDetectedInLoggedCount(int amount) override;
+  void InconsistencyDetectedInLoggedCount(int amount) override;
 
   // This should be called when the application is not idle, i.e. the user seems
   // to be interacting with the application.
diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc
index 8bfbd54..2389060 100644
--- a/components/metrics/metrics_service_unittest.cc
+++ b/components/metrics/metrics_service_unittest.cc
@@ -38,8 +38,8 @@ class TestMetricsProvider : public metrics::MetricsProvider {
       provide_stability_metrics_called_(false) {
   }
 
-  virtual bool HasStabilityMetrics() override { return has_stability_metrics_; }
-  virtual void ProvideStabilityMetrics(
+  bool HasStabilityMetrics() override { return has_stability_metrics_; }
+  void ProvideStabilityMetrics(
       SystemProfileProto* system_profile_proto) override {
     provide_stability_metrics_called_ = true;
   }
@@ -61,7 +61,7 @@ class TestMetricsService : public MetricsService {
                      MetricsServiceClient* client,
                      PrefService* local_state)
       : MetricsService(state_manager, client, local_state) {}
-  virtual ~TestMetricsService() {}
+  ~TestMetricsService() override {}
 
   using MetricsService::log_manager;
 
@@ -81,7 +81,7 @@ class TestMetricsLog : public MetricsLog {
                    client,
                    local_state) {}
 
-  virtual ~TestMetricsLog() {}
+  ~TestMetricsLog() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestMetricsLog);
diff --git a/components/metrics/net/net_metrics_log_uploader.h b/components/metrics/net/net_metrics_log_uploader.h
index e011430..278a619 100644
--- a/components/metrics/net/net_metrics_log_uploader.h
+++ b/components/metrics/net/net_metrics_log_uploader.h
@@ -30,15 +30,15 @@ class NetMetricsLogUploader : public MetricsLogUploader,
                         const std::string& server_url,
                         const std::string& mime_type,
                         const base::Callback<void(int)>& on_upload_complete);
-  virtual ~NetMetricsLogUploader();
+  ~NetMetricsLogUploader() override;
 
   // MetricsLogUploader:
-  virtual bool UploadLog(const std::string& compressed_log_data,
-                         const std::string& log_hash) override;
+  bool UploadLog(const std::string& compressed_log_data,
+                 const std::string& log_hash) override;
 
  private:
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // The request context for fetches done using the network stack.
   net::URLRequestContextGetter* const request_context_getter_;
diff --git a/components/metrics/net/network_metrics_provider.h b/components/metrics/net/network_metrics_provider.h
index 2d03544..9ddb3f8 100644
--- a/components/metrics/net/network_metrics_provider.h
+++ b/components/metrics/net/network_metrics_provider.h
@@ -23,16 +23,16 @@ class NetworkMetricsProvider
   // Creates a NetworkMetricsProvider, where |io_task_runner| is used to post
   // network info collection tasks.
   explicit NetworkMetricsProvider(base::TaskRunner* io_task_runner);
-  virtual ~NetworkMetricsProvider();
+  ~NetworkMetricsProvider() override;
 
  private:
   // metrics::MetricsProvider:
-  virtual void OnDidCreateMetricsLog() override;
-  virtual void ProvideSystemProfileMetrics(
+  void OnDidCreateMetricsLog() override;
+  void ProvideSystemProfileMetrics(
       metrics::SystemProfileProto* system_profile) override;
 
   // ConnectionTypeObserver:
-  virtual void OnConnectionTypeChanged(
+  void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   metrics::SystemProfileProto::Network::ConnectionType
diff --git a/components/metrics/profiler/profiler_metrics_provider.h b/components/metrics/profiler/profiler_metrics_provider.h
index d8bdff3..f83bd41 100644
--- a/components/metrics/profiler/profiler_metrics_provider.h
+++ b/components/metrics/profiler/profiler_metrics_provider.h
@@ -20,11 +20,10 @@ namespace metrics {
 class ProfilerMetricsProvider : public MetricsProvider {
  public:
   ProfilerMetricsProvider();
-  virtual ~ProfilerMetricsProvider();
+  ~ProfilerMetricsProvider() override;
 
   // MetricsDataProvider:
-  virtual void ProvideGeneralMetrics(
-      ChromeUserMetricsExtension* uma_proto) override;
+  void ProvideGeneralMetrics(ChromeUserMetricsExtension* uma_proto) override;
 
   // Records the passed profiled data, which should be a snapshot of the
   // browser's profiled performance during startup for a single process.
diff --git a/components/metrics/profiler/tracking_synchronizer.h b/components/metrics/profiler/tracking_synchronizer.h
index 2bc08e7..fefe8d9 100644
--- a/components/metrics/profiler/tracking_synchronizer.h
+++ b/components/metrics/profiler/tracking_synchronizer.h
@@ -57,22 +57,22 @@ class TrackingSynchronizer
 
   // Update the number of pending processes for the given |sequence_number|.
   // This is called on UI thread.
-  virtual void OnPendingProcesses(int sequence_number,
-                                  int pending_processes,
-                                  bool end) override;
+  void OnPendingProcesses(int sequence_number,
+                          int pending_processes,
+                          bool end) override;
 
  private:
   friend class base::RefCountedThreadSafe<TrackingSynchronizer>;
 
   class RequestContext;
 
-  virtual ~TrackingSynchronizer();
+  ~TrackingSynchronizer() override;
 
   // Send profiler_data back to callback_object_ by calling
   // DecrementPendingProcessesAndSendData which records that we are waiting
   // for one less profiler data from renderer or browser child process for the
   // given sequence number. This method is accessible on UI thread.
-  virtual void OnProfilerDataCollected(
+  void OnProfilerDataCollected(
       int sequence_number,
       const tracked_objects::ProcessDataSnapshot& profiler_data,
       int process_type) override;
diff --git a/components/metrics/test_metrics_service_client.h b/components/metrics/test_metrics_service_client.h
index 8565ca9..c46ac4e 100644
--- a/components/metrics/test_metrics_service_client.h
+++ b/components/metrics/test_metrics_service_client.h
@@ -18,22 +18,20 @@ class TestMetricsServiceClient : public MetricsServiceClient {
   static const char kBrandForTesting[];
 
   TestMetricsServiceClient();
-  virtual ~TestMetricsServiceClient();
+  ~TestMetricsServiceClient() override;
 
   // MetricsServiceClient:
-  virtual void SetMetricsClientId(const std::string& client_id) override;
-  virtual bool IsOffTheRecordSessionActive() override;
-  virtual int32_t GetProduct() override;
-  virtual std::string GetApplicationLocale() override;
-  virtual bool GetBrand(std::string* brand_code) override;
-  virtual SystemProfileProto::Channel GetChannel() override;
-  virtual std::string GetVersionString() override;
-  virtual void OnLogUploadComplete() override;
-  virtual void StartGatheringMetrics(
-      const base::Closure& done_callback) override;
-  virtual void CollectFinalMetrics(const base::Closure& done_callback)
-      override;
-  virtual scoped_ptr<MetricsLogUploader> CreateUploader(
+  void SetMetricsClientId(const std::string& client_id) override;
+  bool IsOffTheRecordSessionActive() override;
+  int32_t GetProduct() override;
+  std::string GetApplicationLocale() override;
+  bool GetBrand(std::string* brand_code) override;
+  SystemProfileProto::Channel GetChannel() override;
+  std::string GetVersionString() override;
+  void OnLogUploadComplete() override;
+  void StartGatheringMetrics(const base::Closure& done_callback) override;
+  void CollectFinalMetrics(const base::Closure& done_callback) override;
+  scoped_ptr<MetricsLogUploader> CreateUploader(
       const std::string& server_url,
       const std::string& mime_type,
       const base::Callback<void(int)>& on_upload_complete) override;
diff --git a/components/nacl/browser/nacl_file_host_unittest.cc b/components/nacl/browser/nacl_file_host_unittest.cc
index c3da2de..292ac46 100644
--- a/components/nacl/browser/nacl_file_host_unittest.cc
+++ b/components/nacl/browser/nacl_file_host_unittest.cc
@@ -19,7 +19,7 @@ class FileHostTestNaClBrowserDelegate : public TestNaClBrowserDelegate {
  public:
   FileHostTestNaClBrowserDelegate() {}
 
-  virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) override {
+  bool GetPnaclDirectory(base::FilePath* pnacl_dir) override {
     *pnacl_dir = pnacl_path_;
     return true;
   }
diff --git a/components/nacl/browser/nacl_host_message_filter.h b/components/nacl/browser/nacl_host_message_filter.h
index 93ea0d4..1de3ab3 100644
--- a/components/nacl/browser/nacl_host_message_filter.h
+++ b/components/nacl/browser/nacl_host_message_filter.h
@@ -35,8 +35,8 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
                         net::URLRequestContextGetter* request_context);
 
   // content::BrowserMessageFilter methods:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnChannelClosing() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnChannelClosing() override;
 
   int render_process_id() { return render_process_id_; }
   bool off_the_record() { return off_the_record_; }
@@ -47,7 +47,7 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
   friend class content::BrowserThread;
   friend class base::DeleteHelper<NaClHostMessageFilter>;
 
-  virtual ~NaClHostMessageFilter();
+  ~NaClHostMessageFilter() override;
 
   void OnLaunchNaCl(const NaClLaunchParams& launch_params,
                     IPC::Message* reply_msg);
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 00c1201..1fdb09b 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -160,7 +160,7 @@ class NaClSandboxedProcessLauncherDelegate
 #endif
   {}
 
-  virtual ~NaClSandboxedProcessLauncherDelegate() {}
+  ~NaClSandboxedProcessLauncherDelegate() override {}
 
 #if defined(OS_WIN)
   virtual void PostSpawnTarget(base::ProcessHandle process) {
@@ -176,12 +176,8 @@ class NaClSandboxedProcessLauncherDelegate
     }
   }
 #elif defined(OS_POSIX)
-  virtual bool ShouldUseZygote() override {
-    return true;
-  }
-  virtual base::ScopedFD TakeIpcFd() override {
-    return ipc_fd_.Pass();
-  }
+  bool ShouldUseZygote() override { return true; }
+  base::ScopedFD TakeIpcFd() override { return ipc_fd_.Pass(); }
 #endif  // OS_WIN
 
  private:
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index 1bb5288..eb138b6 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -67,9 +67,9 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
                   bool off_the_record,
                   NaClAppProcessType process_type,
                   const base::FilePath& profile_directory);
-  virtual ~NaClProcessHost();
+  ~NaClProcessHost() override;
 
-  virtual void OnProcessCrashed(int exit_status) override;
+  void OnProcessCrashed(int exit_status) override;
 
   // Do any minimal work that must be done at browser startup.
   static void EarlyStartup();
@@ -83,7 +83,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
               IPC::Message* reply_msg,
               const base::FilePath& manifest_path);
 
-  virtual void OnChannelConnected(int32 peer_pid) override;
+  void OnChannelConnected(int32 peer_pid) override;
 
 #if defined(OS_WIN)
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
@@ -117,8 +117,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   bool LaunchSelLdr();
 
   // BrowserChildProcessHostDelegate implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg) override;
-  virtual void OnProcessLaunched() override;
+  bool OnMessageReceived(const IPC::Message& msg) override;
+  void OnProcessLaunched() override;
 
   void OnResourcesReady();
 
diff --git a/components/nacl/browser/test_nacl_browser_delegate.h b/components/nacl/browser/test_nacl_browser_delegate.h
index 9aa5784..b7aef2a 100644
--- a/components/nacl/browser/test_nacl_browser_delegate.h
+++ b/components/nacl/browser/test_nacl_browser_delegate.h
@@ -21,27 +21,27 @@
 class TestNaClBrowserDelegate : public NaClBrowserDelegate {
  public:
   TestNaClBrowserDelegate();
-  virtual ~TestNaClBrowserDelegate();
-  virtual void ShowMissingArchInfobar(int render_process_id,
-                                      int render_view_id) override;
-  virtual bool DialogsAreSuppressed() override;
-  virtual bool GetCacheDirectory(base::FilePath* cache_dir) override;
-  virtual bool GetPluginDirectory(base::FilePath* plugin_dir) override;
-  virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) override;
-  virtual bool GetUserDirectory(base::FilePath* user_dir) override;
-  virtual std::string GetVersionString() const override;
-  virtual ppapi::host::HostFactory* CreatePpapiHostFactory(
+  ~TestNaClBrowserDelegate() override;
+  void ShowMissingArchInfobar(int render_process_id,
+                              int render_view_id) override;
+  bool DialogsAreSuppressed() override;
+  bool GetCacheDirectory(base::FilePath* cache_dir) override;
+  bool GetPluginDirectory(base::FilePath* plugin_dir) override;
+  bool GetPnaclDirectory(base::FilePath* pnacl_dir) override;
+  bool GetUserDirectory(base::FilePath* user_dir) override;
+  std::string GetVersionString() const override;
+  ppapi::host::HostFactory* CreatePpapiHostFactory(
       content::BrowserPpapiHost* ppapi_host) override;
-  virtual bool MapUrlToLocalFilePath(const GURL& url,
-                                     bool use_blocking_api,
-                                     const base::FilePath& profile_directory,
-                                     base::FilePath* file_path) override;
-  virtual void SetDebugPatterns(std::string debug_patterns) override;
-  virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) override;
-  virtual content::BrowserPpapiHost::OnKeepaliveCallback
-      GetOnKeepaliveCallback() override;
-  virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory,
-                                   const GURL& manifest_url) override;
+  bool MapUrlToLocalFilePath(const GURL& url,
+                             bool use_blocking_api,
+                             const base::FilePath& profile_directory,
+                             base::FilePath* file_path) override;
+  void SetDebugPatterns(std::string debug_patterns) override;
+  bool URLMatchesDebugPatterns(const GURL& manifest_url) override;
+  content::BrowserPpapiHost::OnKeepaliveCallback GetOnKeepaliveCallback()
+      override;
+  bool IsNonSfiModeAllowed(const base::FilePath& profile_directory,
+                           const GURL& manifest_url) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestNaClBrowserDelegate);
diff --git a/components/nacl/loader/nacl_ipc_adapter.h b/components/nacl/loader/nacl_ipc_adapter.h
index a18aed7..4a0a4b7 100644
--- a/components/nacl/loader/nacl_ipc_adapter.h
+++ b/components/nacl/loader/nacl_ipc_adapter.h
@@ -111,9 +111,9 @@ class NaClIPCAdapter : public base::RefCountedThreadSafe<NaClIPCAdapter>,
 #endif
 
   // Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnChannelConnected(int32 peer_pid) override;
-  virtual void OnChannelError() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnChannelConnected(int32 peer_pid) override;
+  void OnChannelError() override;
 
   typedef base::Callback<void(IPC::PlatformFileForTransit, base::FilePath)>
       ResolveFileTokenReplyCallback;
@@ -175,7 +175,7 @@ class NaClIPCAdapter : public base::RefCountedThreadSafe<NaClIPCAdapter>,
     PendingSyncMsgMap pending_sync_msgs_;
   };
 
-  virtual ~NaClIPCAdapter();
+  ~NaClIPCAdapter() override;
 
   void OnFileTokenResolved(const IPC::Message& orig_msg,
                            IPC::PlatformFileForTransit ipc_fd,
diff --git a/components/nacl/loader/nacl_ipc_adapter_unittest.cc b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
index fc812a6..99f4638 100644
--- a/components/nacl/loader/nacl_ipc_adapter_unittest.cc
+++ b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
@@ -279,7 +279,7 @@ TEST_F(NaClIPCAdapterTest, ReadWithChannelError) {
     explicit MyThread(NaClIPCAdapter* adapter)
         : SimpleThread("NaClIPCAdapterThread"),
           adapter_(adapter) {}
-    virtual void Run() override {
+    void Run() override {
       base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
       adapter_->OnChannelError();
     }
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index 6eb3c14..8562a28 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -163,7 +163,7 @@ class BrowserValidationDBProxy : public NaClValidationDB {
       : listener_(listener) {
   }
 
-  virtual bool QueryKnownToValidate(const std::string& signature) override {
+  bool QueryKnownToValidate(const std::string& signature) override {
     // Initialize to false so that if the Send fails to write to the return
     // value we're safe.  For example if the message is (for some reason)
     // dispatched as an async message the return parameter will not be written.
@@ -176,7 +176,7 @@ class BrowserValidationDBProxy : public NaClValidationDB {
     return result;
   }
 
-  virtual void SetKnownToValidate(const std::string& signature) override {
+  void SetKnownToValidate(const std::string& signature) override {
     // Caching is optional: NaCl will still work correctly if the IPC fails.
     if (!listener_->Send(new NaClProcessMsg_SetKnownToValidate(signature))) {
       LOG(ERROR) << "Failed to update NaCl validation cache.";
@@ -186,8 +186,9 @@ class BrowserValidationDBProxy : public NaClValidationDB {
   // This is the "old" code path for resolving file tokens. It's only
   // used for resolving the main nexe.
   // TODO(teravest): Remove this.
-  virtual bool ResolveFileToken(struct NaClFileToken* file_token,
-                                int32* fd, std::string* path) override {
+  bool ResolveFileToken(struct NaClFileToken* file_token,
+                        int32* fd,
+                        std::string* path) override {
     *fd = -1;
     *path = "";
     if (!NaClFileTokenIsValid(file_token)) {
@@ -262,7 +263,7 @@ bool NaClListener::Send(IPC::Message* msg) {
 // NaClChromeMainAppStart(), so it can't be used for servicing messages.
 class FileTokenMessageFilter : public IPC::MessageFilter {
  public:
-  virtual bool OnMessageReceived(const IPC::Message& msg) override {
+  bool OnMessageReceived(const IPC::Message& msg) override {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FileTokenMessageFilter, msg)
       IPC_MESSAGE_HANDLER(NaClProcessMsg_ResolveFileTokenAsyncReply,
@@ -281,7 +282,7 @@ class FileTokenMessageFilter : public IPC::MessageFilter {
     g_listener->OnFileTokenResolved(token_lo, token_hi, ipc_fd, file_path);
   }
  private:
-  virtual ~FileTokenMessageFilter() { }
+  ~FileTokenMessageFilter() override {}
 };
 
 void NaClListener::Listen() {
diff --git a/components/nacl/loader/nacl_listener.h b/components/nacl/loader/nacl_listener.h
index 6a6e8c2..9e8d67b 100644
--- a/components/nacl/loader/nacl_listener.h
+++ b/components/nacl/loader/nacl_listener.h
@@ -29,7 +29,7 @@ class SyncMessageFilter;
 class NaClListener : public IPC::Listener {
  public:
   NaClListener();
-  virtual ~NaClListener();
+  ~NaClListener() override;
   // Listen for a request to launch a NaCl module.
   void Listen();
 
@@ -59,7 +59,7 @@ class NaClListener : public IPC::Listener {
                            base::FilePath file_path);
 
  private:
-  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  bool OnMessageReceived(const IPC::Message& msg) override;
 
   void OnStart(const nacl::NaClStartParams& params);
 
diff --git a/components/nacl/loader/nacl_trusted_listener.h b/components/nacl/loader/nacl_trusted_listener.h
index 497dd68..a430e49 100644
--- a/components/nacl/loader/nacl_trusted_listener.h
+++ b/components/nacl/loader/nacl_trusted_listener.h
@@ -24,14 +24,14 @@ class NaClTrustedListener : public base::RefCounted<NaClTrustedListener>,
   IPC::ChannelHandle TakeClientChannelHandle();
 
   // Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnChannelError() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnChannelError() override;
 
   bool Send(IPC::Message* msg);
 
  private:
   friend class base::RefCounted<NaClTrustedListener>;
-  virtual ~NaClTrustedListener();
+  ~NaClTrustedListener() override;
   IPC::ChannelHandle channel_handle_;
   scoped_ptr<IPC::SyncChannel> channel_;
 
diff --git a/components/nacl/loader/nacl_validation_query_unittest.cc b/components/nacl/loader/nacl_validation_query_unittest.cc
index 288f1c4..6c2dfa8 100644
--- a/components/nacl/loader/nacl_validation_query_unittest.cc
+++ b/components/nacl/loader/nacl_validation_query_unittest.cc
@@ -39,7 +39,7 @@ class MockValidationDB : public NaClValidationDB {
       status_(true) {
   }
 
-  virtual bool QueryKnownToValidate(const std::string& signature) override {
+  bool QueryKnownToValidate(const std::string& signature) override {
     // The typecast is needed to work around gtest trying to take the address
     // of a constant.
     EXPECT_EQ((int) NaClValidationQuery::kDigestLength,
@@ -52,7 +52,7 @@ class MockValidationDB : public NaClValidationDB {
     return status_;
   }
 
-  virtual void SetKnownToValidate(const std::string& signature) override {
+  void SetKnownToValidate(const std::string& signature) override {
     // The typecast is needed to work around gtest trying to take the address
     // of a constant.
     ASSERT_EQ((int) NaClValidationQuery::kDigestLength,
@@ -67,8 +67,9 @@ class MockValidationDB : public NaClValidationDB {
                         NaClValidationQuery::kDigestLength));
   }
 
-  virtual bool ResolveFileToken(struct NaClFileToken* file_token, int32* fd,
-                                std::string* path) override {
+  bool ResolveFileToken(struct NaClFileToken* file_token,
+                        int32* fd,
+                        std::string* path) override {
     *fd = -1;
     *path = "";
     return false;
diff --git a/components/nacl/renderer/manifest_service_channel.h b/components/nacl/renderer/manifest_service_channel.h
index c62dd23..dd77bc5 100644
--- a/components/nacl/renderer/manifest_service_channel.h
+++ b/components/nacl/renderer/manifest_service_channel.h
@@ -50,14 +50,14 @@ class ManifestServiceChannel : public IPC::Listener {
       const base::Callback<void(int32_t)>& connected_callback,
       scoped_ptr<Delegate> delegate,
       base::WaitableEvent* waitable_event);
-  virtual ~ManifestServiceChannel();
+  ~ManifestServiceChannel() override;
 
   void Send(IPC::Message* message);
 
   // Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnChannelConnected(int32 peer_pid) override;
-  virtual void OnChannelError() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnChannelConnected(int32 peer_pid) override;
+  void OnChannelError() override;
 
  private:
   void OnStartupInitializationComplete();
diff --git a/components/nacl/renderer/nacl_helper.h b/components/nacl/renderer/nacl_helper.h
index 4c28bf7..d76a84e 100644
--- a/components/nacl/renderer/nacl_helper.h
+++ b/components/nacl/renderer/nacl_helper.h
@@ -17,10 +17,10 @@ namespace nacl {
 class NaClHelper : public content::RenderFrameObserver {
  public:
   explicit NaClHelper(content::RenderFrame* render_frame);
-  virtual ~NaClHelper();
+  ~NaClHelper() override;
 
   // RenderFrameObserver.
-  virtual void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
+  void DidCreatePepperPlugin(content::RendererPpapiHost* host) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NaClHelper);
diff --git a/components/nacl/renderer/pnacl_translation_resource_host.h b/components/nacl/renderer/pnacl_translation_resource_host.h
index 94d1e45..2548f1d 100644
--- a/components/nacl/renderer/pnacl_translation_resource_host.h
+++ b/components/nacl/renderer/pnacl_translation_resource_host.h
@@ -39,7 +39,7 @@ class PnaclTranslationResourceHost : public IPC::MessageFilter {
   void ReportTranslationFinished(PP_Instance instance, PP_Bool success);
 
  protected:
-  virtual ~PnaclTranslationResourceHost();
+  ~PnaclTranslationResourceHost() override;
 
  private:
   // Maps the instance with an outstanding cache request to the info
@@ -47,10 +47,10 @@ class PnaclTranslationResourceHost : public IPC::MessageFilter {
   typedef std::map<PP_Instance, RequestNexeFdCallback> CacheRequestInfoMap;
 
   // IPC::MessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnFilterAdded(IPC::Sender* sender) override;
-  virtual void OnFilterRemoved() override;
-  virtual void OnChannelClosing() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnFilterAdded(IPC::Sender* sender) override;
+  void OnFilterRemoved() override;
+  void OnChannelClosing() override;
 
   void SendRequestNexeFd(int render_view_id,
                          PP_Instance instance,
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 5af4c17..2df50bb 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -165,9 +165,9 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
       : pp_instance_(pp_instance) {
   }
 
-  virtual ~ManifestServiceProxy() { }
+  ~ManifestServiceProxy() override {}
 
-  virtual void StartupInitializationComplete() override {
+  void StartupInitializationComplete() override {
     if (StartPpapiProxy(pp_instance_) == PP_TRUE) {
       JsonManifest* manifest = GetJsonManifest(pp_instance_);
       NexeLoadManager* load_manager = NexeLoadManager::Get(pp_instance_);
@@ -187,7 +187,7 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
     }
   }
 
-  virtual void OpenResource(
+  void OpenResource(
       const std::string& key,
       const ManifestServiceChannel::OpenResourceCallback& callback) override {
     DCHECK(ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->
diff --git a/components/nacl/renderer/trusted_plugin_channel.h b/components/nacl/renderer/trusted_plugin_channel.h
index dfc92c0..efeb5e8 100644
--- a/components/nacl/renderer/trusted_plugin_channel.h
+++ b/components/nacl/renderer/trusted_plugin_channel.h
@@ -29,13 +29,13 @@ class TrustedPluginChannel : public IPC::Listener {
                        const IPC::ChannelHandle& handle,
                        base::WaitableEvent* shutdown_event,
                        bool report_exit_status);
-  virtual ~TrustedPluginChannel();
+  ~TrustedPluginChannel() override;
 
   bool Send(IPC::Message* message);
 
   // Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnChannelError() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnChannelError() override;
 
   void OnReportExitStatus(int exit_status);
 
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle.h b/components/navigation_interception/intercept_navigation_resource_throttle.h
index b77a5f7..062a05f 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle.h
+++ b/components/navigation_interception/intercept_navigation_resource_throttle.h
@@ -37,12 +37,12 @@ class InterceptNavigationResourceThrottle : public content::ResourceThrottle {
   InterceptNavigationResourceThrottle(
       net::URLRequest* request,
       CheckOnUIThreadCallback should_ignore_callback);
-  virtual ~InterceptNavigationResourceThrottle();
+  ~InterceptNavigationResourceThrottle() override;
 
   // content::ResourceThrottle implementation:
-  virtual void WillStartRequest(bool* defer) override;
-  virtual void WillRedirectRequest(const GURL& new_url, bool* defer) override;
-  virtual const char* GetNameForLogging() const override;
+  void WillStartRequest(bool* defer) override;
+  void WillRedirectRequest(const GURL& new_url, bool* defer) override;
+  const char* GetNameForLogging() const override;
 
  private:
   std::string GetMethodAfterRedirect();
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
index b39078ed..a55cda3 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
+++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
@@ -86,16 +86,10 @@ class MockResourceController : public content::ResourceController {
   Status status() const { return status_; }
 
   // ResourceController:
-  virtual void Cancel() override {
-    NOTREACHED();
-  }
-  virtual void CancelAndIgnore() override {
-    status_ = CANCELLED;
-  }
-  virtual void CancelWithError(int error_code) override {
-    NOTREACHED();
-  }
-  virtual void Resume() override {
+  void Cancel() override { NOTREACHED(); }
+  void CancelAndIgnore() override { status_ = CANCELLED; }
+  void CancelWithError(int error_code) override { NOTREACHED(); }
+  void Resume() override {
     DCHECK(status_ == UNKNOWN);
     status_ = RESUMED;
   }
diff --git a/components/network_time/network_time_tracker_unittest.cc b/components/network_time/network_time_tracker_unittest.cc
index 60d316e..a401fff 100644
--- a/components/network_time/network_time_tracker_unittest.cc
+++ b/components/network_time/network_time_tracker_unittest.cc
@@ -30,11 +30,9 @@ const int64 kPseudoSleepTime2 = 1888;
 class TestTickClock : public base::TickClock {
  public:
   explicit TestTickClock(base::TimeTicks* ticks_now) : ticks_now_(ticks_now) {}
-  virtual ~TestTickClock() {}
+  ~TestTickClock() override {}
 
-  virtual base::TimeTicks NowTicks() override {
-    return *ticks_now_;
-  }
+  base::TimeTicks NowTicks() override { return *ticks_now_; }
 
  private:
   base::TimeTicks* ticks_now_;
diff --git a/components/omaha_query_params/omaha_query_params_unittest.cc b/components/omaha_query_params/omaha_query_params_unittest.cc
index dd4055d..cfaf667 100644
--- a/components/omaha_query_params/omaha_query_params_unittest.cc
+++ b/components/omaha_query_params/omaha_query_params_unittest.cc
@@ -18,7 +18,7 @@ bool Contains(const std::string& source, const std::string& target) {
 }
 
 class TestOmahaQueryParamsDelegate : public OmahaQueryParamsDelegate {
-  virtual std::string GetExtraParams() override { return "&cat=dog"; }
+  std::string GetExtraParams() override { return "&cat=dog"; }
 };
 
 }  // namespace
diff --git a/components/omnibox/base_search_provider.cc b/components/omnibox/base_search_provider.cc
index 5f054ad..cb3654c 100644
--- a/components/omnibox/base_search_provider.cc
+++ b/components/omnibox/base_search_provider.cc
@@ -36,11 +36,11 @@ class SuggestionDeletionHandler : public net::URLFetcherDelegate {
       net::URLRequestContextGetter* request_context,
       const DeletionCompletedCallback& callback);
 
-  virtual ~SuggestionDeletionHandler();
+  ~SuggestionDeletionHandler() override;
 
  private:
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   scoped_ptr<net::URLFetcher> deletion_fetcher_;
   DeletionCompletedCallback callback_;
diff --git a/components/omnibox/base_search_provider.h b/components/omnibox/base_search_provider.h
index 0ec9d1d..a709e8c 100644
--- a/components/omnibox/base_search_provider.h
+++ b/components/omnibox/base_search_provider.h
@@ -69,8 +69,8 @@ class BaseSearchProvider : public AutocompleteProvider {
       const SearchTermsData& search_terms_data);
 
   // AutocompleteProvider:
-  virtual void DeleteMatch(const AutocompleteMatch& match) override;
-  virtual void AddProviderInfo(ProvidersInfo* provider_info) const override;
+  void DeleteMatch(const AutocompleteMatch& match) override;
+  void AddProviderInfo(ProvidersInfo* provider_info) const override;
 
   bool field_trial_triggered_in_session() const {
     return field_trial_triggered_in_session_;
@@ -97,7 +97,7 @@ class BaseSearchProvider : public AutocompleteProvider {
   static const char kTrue[];
   static const char kFalse[];
 
-  virtual ~BaseSearchProvider();
+  ~BaseSearchProvider() override;
 
   typedef std::pair<base::string16, std::string> MatchKey;
   typedef std::map<MatchKey, AutocompleteMatch> MatchMap;
diff --git a/components/omnibox/keyword_provider.h b/components/omnibox/keyword_provider.h
index aa7c44a..f0dfed2 100644
--- a/components/omnibox/keyword_provider.h
+++ b/components/omnibox/keyword_provider.h
@@ -94,14 +94,13 @@ class KeywordProvider : public AutocompleteProvider {
                                         const AutocompleteInput& input);
 
   // AutocompleteProvider:
-  virtual void Start(const AutocompleteInput& input,
-                     bool minimal_changes) override;
-  virtual void Stop(bool clear_cached_results) override;
+  void Start(const AutocompleteInput& input, bool minimal_changes) override;
+  void Stop(bool clear_cached_results) override;
 
  private:
   friend class KeywordExtensionsDelegateImpl;
 
-  virtual ~KeywordProvider();
+  ~KeywordProvider() override;
 
   // Extracts the keyword from |input| into |keyword|. Any remaining characters
   // after the keyword are placed in |remaining_input|. Returns true if |input|
diff --git a/components/omnibox/keyword_provider_unittest.cc b/components/omnibox/keyword_provider_unittest.cc
index 5c398a5..fef9a6c 100644
--- a/components/omnibox/keyword_provider_unittest.cc
+++ b/components/omnibox/keyword_provider_unittest.cc
@@ -21,7 +21,7 @@ namespace {
 
 class TestingSchemeClassifier : public AutocompleteSchemeClassifier {
  public:
-  virtual metrics::OmniboxInputType::Type GetInputTypeForScheme(
+  metrics::OmniboxInputType::Type GetInputTypeForScheme(
       const std::string& scheme) const override {
     if (net::URLRequest::IsHandledProtocol(scheme))
       return metrics::OmniboxInputType::URL;
diff --git a/components/omnibox/search_provider.h b/components/omnibox/search_provider.h
index 83eeaa3..19696bc 100644
--- a/components/omnibox/search_provider.h
+++ b/components/omnibox/search_provider.h
@@ -65,7 +65,7 @@ class SearchProvider : public BaseSearchProvider,
   void RegisterDisplayedAnswers(const AutocompleteResult& result);
 
   // AutocompleteProvider:
-  virtual void ResetSession() override;
+  void ResetSession() override;
 
   // This URL may be sent with suggest requests; see comments on CanSendURL().
   void set_current_page_url(const GURL& current_page_url) {
@@ -73,7 +73,7 @@ class SearchProvider : public BaseSearchProvider,
   }
 
  protected:
-  virtual ~SearchProvider();
+  ~SearchProvider() override;
 
  private:
   friend class SearchProviderTest;
@@ -158,19 +158,18 @@ class SearchProvider : public BaseSearchProvider,
   static ACMatches::iterator FindTopMatch(ACMatches* matches);
 
   // AutocompleteProvider:
-  virtual void Start(const AutocompleteInput& input,
-                     bool minimal_changes) override;
-  virtual void Stop(bool clear_cached_results) override;
+  void Start(const AutocompleteInput& input, bool minimal_changes) override;
+  void Stop(bool clear_cached_results) override;
 
   // BaseSearchProvider:
-  virtual const TemplateURL* GetTemplateURL(bool is_keyword) const override;
-  virtual const AutocompleteInput GetInput(bool is_keyword) const override;
-  virtual bool ShouldAppendExtraParams(
+  const TemplateURL* GetTemplateURL(bool is_keyword) const override;
+  const AutocompleteInput GetInput(bool is_keyword) const override;
+  bool ShouldAppendExtraParams(
       const SearchSuggestionParser::SuggestResult& result) const override;
-  virtual void RecordDeletionResult(bool success) override;
+  void RecordDeletionResult(bool success) override;
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Stops the suggest query.
   // NOTE: This does not update |done_|.  Callers must do so.
diff --git a/components/omnibox/search_suggestion_parser.h b/components/omnibox/search_suggestion_parser.h
index f5493f1..c66de34 100644
--- a/components/omnibox/search_suggestion_parser.h
+++ b/components/omnibox/search_suggestion_parser.h
@@ -125,7 +125,7 @@ class SearchSuggestionParser {
                   bool relevance_from_server,
                   bool should_prefetch,
                   const base::string16& input_text);
-    virtual ~SuggestResult();
+    ~SuggestResult() override;
 
     const base::string16& suggestion() const { return suggestion_; }
     const base::string16& match_contents_prefix() const {
@@ -149,9 +149,8 @@ class SearchSuggestionParser {
                                const base::string16& input_text);
 
     // Result:
-    virtual int CalculateRelevance(
-        const AutocompleteInput& input,
-        bool keyword_provider_requested) const override;
+    int CalculateRelevance(const AutocompleteInput& input,
+                           bool keyword_provider_requested) const override;
 
    private:
     // The search terms to be used for this suggestion.
@@ -193,7 +192,7 @@ class SearchSuggestionParser {
                      bool relevance_from_server,
                      const base::string16& input_text,
                      const std::string& languages);
-    virtual ~NavigationResult();
+    ~NavigationResult() override;
 
     const GURL& url() const { return url_; }
     const base::string16& description() const { return description_; }
@@ -209,9 +208,8 @@ class SearchSuggestionParser {
                                            const std::string& languages);
 
     // Result:
-    virtual int CalculateRelevance(
-        const AutocompleteInput& input,
-        bool keyword_provider_requested) const override;
+    int CalculateRelevance(const AutocompleteInput& input,
+                           bool keyword_provider_requested) const override;
 
    private:
     // The suggested url for navigation.
diff --git a/components/omnibox/test_scheme_classifier.h b/components/omnibox/test_scheme_classifier.h
index 3217950..5c7701b 100644
--- a/components/omnibox/test_scheme_classifier.h
+++ b/components/omnibox/test_scheme_classifier.h
@@ -12,10 +12,10 @@
 class TestSchemeClassifier : public AutocompleteSchemeClassifier {
  public:
   TestSchemeClassifier();
-  virtual ~TestSchemeClassifier();
+  ~TestSchemeClassifier() override;
 
   // Overridden from AutocompleteInputSchemeChecker:
-  virtual metrics::OmniboxInputType::Type GetInputTypeForScheme(
+  metrics::OmniboxInputType::Type GetInputTypeForScheme(
       const std::string& scheme) const override;
 
  private:
diff --git a/components/ownership/mock_owner_key_util.h b/components/ownership/mock_owner_key_util.h
index 79e071b..7c4f9cd 100644
--- a/components/ownership/mock_owner_key_util.h
+++ b/components/ownership/mock_owner_key_util.h
@@ -23,13 +23,13 @@ class OWNERSHIP_EXPORT MockOwnerKeyUtil : public OwnerKeyUtil {
   MockOwnerKeyUtil();
 
   // OwnerKeyUtil implementation:
-  virtual bool ImportPublicKey(std::vector<uint8>* output) override;
+  bool ImportPublicKey(std::vector<uint8>* output) override;
 #if defined(USE_NSS)
   virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
       const std::vector<uint8>& key,
       PK11SlotInfo* slot) override;
 #endif  // defined(USE_NSS)
-  virtual bool IsPublicKeyPresent() override;
+  bool IsPublicKeyPresent() override;
 
   // Clears the public and private keys.
   void Clear();
@@ -45,7 +45,7 @@ class OWNERSHIP_EXPORT MockOwnerKeyUtil : public OwnerKeyUtil {
   void SetPrivateKey(scoped_ptr<crypto::RSAPrivateKey> key);
 
  private:
-  virtual ~MockOwnerKeyUtil();
+  ~MockOwnerKeyUtil() override;
 
   std::vector<uint8> public_key_;
   scoped_ptr<crypto::RSAPrivateKey> private_key_;
diff --git a/components/ownership/owner_key_util_impl.h b/components/ownership/owner_key_util_impl.h
index 1bd8c23..b6f18a7 100644
--- a/components/ownership/owner_key_util_impl.h
+++ b/components/ownership/owner_key_util_impl.h
@@ -20,16 +20,16 @@ class OWNERSHIP_EXPORT OwnerKeyUtilImpl : public OwnerKeyUtil {
   explicit OwnerKeyUtilImpl(const base::FilePath& public_key_file);
 
   // OwnerKeyUtil implementation:
-  virtual bool ImportPublicKey(std::vector<uint8>* output) override;
+  bool ImportPublicKey(std::vector<uint8>* output) override;
 #if defined(USE_NSS)
   virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
       const std::vector<uint8>& key,
       PK11SlotInfo* slot) override;
 #endif  // defined(USE_NSS)
-  virtual bool IsPublicKeyPresent() override;
+  bool IsPublicKeyPresent() override;
 
  private:
-  virtual ~OwnerKeyUtilImpl();
+  ~OwnerKeyUtilImpl() override;
 
   // The file that holds the public key.
   base::FilePath public_key_file_;
diff --git a/components/ownership/owner_settings_service.h b/components/ownership/owner_settings_service.h
index ed4a1b5..1961975 100644
--- a/components/ownership/owner_settings_service.h
+++ b/components/ownership/owner_settings_service.h
@@ -38,7 +38,7 @@ class OWNERSHIP_EXPORT OwnerSettingsService : public KeyedService {
 
   explicit OwnerSettingsService(
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
-  virtual ~OwnerSettingsService();
+  ~OwnerSettingsService() override;
 
   base::WeakPtr<OwnerSettingsService> as_weak_ptr() {
     return weak_factory_.GetWeakPtr();
diff --git a/components/password_manager/content/browser/content_credential_manager_dispatcher.h b/components/password_manager/content/browser/content_credential_manager_dispatcher.h
index 2a8597e..195cbe0 100644
--- a/components/password_manager/content/browser/content_credential_manager_dispatcher.h
+++ b/components/password_manager/content/browser/content_credential_manager_dispatcher.h
@@ -35,28 +35,25 @@ class ContentCredentialManagerDispatcher : public CredentialManagerDispatcher,
   // wiring this up as a subclass of PasswordStoreConsumer.
   ContentCredentialManagerDispatcher(content::WebContents* web_contents,
                                      PasswordManagerClient* client);
-  virtual ~ContentCredentialManagerDispatcher();
+  ~ContentCredentialManagerDispatcher() override;
 
   void OnProvisionalSaveComplete();
 
   // CredentialManagerDispatcher implementation.
-  virtual void OnNotifyFailedSignIn(
-      int request_id,
-      const password_manager::CredentialInfo&) override;
-  virtual void OnNotifySignedIn(
-      int request_id,
-      const password_manager::CredentialInfo&) override;
-  virtual void OnNotifySignedOut(int request_id) override;
-  virtual void OnRequestCredential(
-      int request_id,
-      bool zero_click_only,
-      const std::vector<GURL>& federations) override;
+  void OnNotifyFailedSignIn(int request_id,
+                            const password_manager::CredentialInfo&) override;
+  void OnNotifySignedIn(int request_id,
+                        const password_manager::CredentialInfo&) override;
+  void OnNotifySignedOut(int request_id) override;
+  void OnRequestCredential(int request_id,
+                           bool zero_click_only,
+                           const std::vector<GURL>& federations) override;
 
   // content::WebContentsObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // PasswordStoreConsumer implementation.
-  virtual void OnGetPasswordStoreResults(
+  void OnGetPasswordStoreResults(
       const std::vector<autofill::PasswordForm*>& results) override;
 
  private:
diff --git a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
index 3cff966..2b16656 100644
--- a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
+++ b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
@@ -33,17 +33,17 @@ class TestPasswordManagerClient
  public:
   TestPasswordManagerClient(password_manager::PasswordStore* store)
       : did_prompt_user_to_save_(false), store_(store) {}
-  virtual ~TestPasswordManagerClient() {}
+  ~TestPasswordManagerClient() override {}
 
-  virtual password_manager::PasswordStore* GetPasswordStore() override {
+  password_manager::PasswordStore* GetPasswordStore() override {
     return store_;
   }
 
-  virtual password_manager::PasswordManagerDriver* GetDriver() override {
+  password_manager::PasswordManagerDriver* GetDriver() override {
     return &driver_;
   }
 
-  virtual bool PromptUserToSavePassword(
+  bool PromptUserToSavePassword(
       scoped_ptr<password_manager::PasswordFormManager> manager) override {
     did_prompt_user_to_save_ = true;
     manager_.reset(manager.release());
diff --git a/components/password_manager/content/browser/content_password_manager_driver.h b/components/password_manager/content/browser/content_password_manager_driver.h
index 264f814..c6b64f6 100644
--- a/components/password_manager/content/browser/content_password_manager_driver.h
+++ b/components/password_manager/content/browser/content_password_manager_driver.h
@@ -30,31 +30,31 @@ class ContentPasswordManagerDriver : public PasswordManagerDriver,
   ContentPasswordManagerDriver(content::WebContents* web_contents,
                                PasswordManagerClient* client,
                                autofill::AutofillClient* autofill_client);
-  virtual ~ContentPasswordManagerDriver();
+  ~ContentPasswordManagerDriver() override;
 
   // PasswordManagerDriver implementation.
-  virtual void FillPasswordForm(const autofill::PasswordFormFillData& form_data)
-      override;
-  virtual bool DidLastPageLoadEncounterSSLErrors() override;
-  virtual bool IsOffTheRecord() override;
-  virtual void AllowPasswordGenerationForForm(
+  void FillPasswordForm(
+      const autofill::PasswordFormFillData& form_data) override;
+  bool DidLastPageLoadEncounterSSLErrors() override;
+  bool IsOffTheRecord() override;
+  void AllowPasswordGenerationForForm(
       const autofill::PasswordForm& form) override;
-  virtual void AccountCreationFormsFound(
+  void AccountCreationFormsFound(
       const std::vector<autofill::FormData>& forms) override;
-  virtual void FillSuggestion(const base::string16& username,
-                              const base::string16& password) override;
-  virtual void PreviewSuggestion(const base::string16& username,
-                                 const base::string16& password) override;
-  virtual void ClearPreviewedForm() override;
+  void FillSuggestion(const base::string16& username,
+                      const base::string16& password) override;
+  void PreviewSuggestion(const base::string16& username,
+                         const base::string16& password) override;
+  void ClearPreviewedForm() override;
 
-  virtual PasswordGenerationManager* GetPasswordGenerationManager() override;
-  virtual PasswordManager* GetPasswordManager() override;
-  virtual autofill::AutofillManager* GetAutofillManager() override;
-  virtual PasswordAutofillManager* GetPasswordAutofillManager() override;
+  PasswordGenerationManager* GetPasswordGenerationManager() override;
+  PasswordManager* GetPasswordManager() override;
+  autofill::AutofillManager* GetAutofillManager() override;
+  PasswordAutofillManager* GetPasswordAutofillManager() 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/password_manager/content/browser/credential_manager_password_form_manager.h b/components/password_manager/content/browser/credential_manager_password_form_manager.h
index 9be4010..a7b2ebe 100644
--- a/components/password_manager/content/browser/credential_manager_password_form_manager.h
+++ b/components/password_manager/content/browser/credential_manager_password_form_manager.h
@@ -35,9 +35,9 @@ class CredentialManagerPasswordFormManager : public PasswordFormManager {
       PasswordManagerClient* client,
       const autofill::PasswordForm& observed_form,
       ContentCredentialManagerDispatcher* dispatcher);
-  virtual ~CredentialManagerPasswordFormManager();
+  ~CredentialManagerPasswordFormManager() override;
 
-  virtual void OnGetPasswordStoreResults(
+  void OnGetPasswordStoreResults(
       const std::vector<autofill::PasswordForm*>& results) override;
 
  private:
diff --git a/components/password_manager/content/browser/password_manager_internals_service_factory.h b/components/password_manager/content/browser/password_manager_internals_service_factory.h
index 406fd8d..883a636 100644
--- a/components/password_manager/content/browser/password_manager_internals_service_factory.h
+++ b/components/password_manager/content/browser/password_manager_internals_service_factory.h
@@ -29,10 +29,10 @@ class PasswordManagerInternalsServiceFactory
   friend struct DefaultSingletonTraits<PasswordManagerInternalsServiceFactory>;
 
   PasswordManagerInternalsServiceFactory();
-  virtual ~PasswordManagerInternalsServiceFactory();
+  ~PasswordManagerInternalsServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerInternalsServiceFactory);
diff --git a/components/password_manager/content/renderer/credential_manager_client.h b/components/password_manager/content/renderer/credential_manager_client.h
index d88b5c0..a37c1d5 100644
--- a/components/password_manager/content/renderer/credential_manager_client.h
+++ b/components/password_manager/content/renderer/credential_manager_client.h
@@ -49,10 +49,10 @@ class CredentialManagerClient : public blink::WebCredentialManagerClient,
                                 public content::RenderViewObserver {
  public:
   explicit CredentialManagerClient(content::RenderView* render_view);
-  virtual ~CredentialManagerClient();
+  ~CredentialManagerClient() override;
 
   // RenderViewObserver:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // Message handlers for messages from the browser process:
   virtual void OnAcknowledgeFailedSignIn(int request_id);
diff --git a/components/password_manager/core/browser/browser_save_password_progress_logger.h b/components/password_manager/core/browser/browser_save_password_progress_logger.h
index 1e3b344..883461c 100644
--- a/components/password_manager/core/browser/browser_save_password_progress_logger.h
+++ b/components/password_manager/core/browser/browser_save_password_progress_logger.h
@@ -19,11 +19,11 @@ class BrowserSavePasswordProgressLogger
     : public autofill::SavePasswordProgressLogger {
  public:
   explicit BrowserSavePasswordProgressLogger(PasswordManagerClient* client);
-  virtual ~BrowserSavePasswordProgressLogger();
+  ~BrowserSavePasswordProgressLogger() override;
 
  protected:
   // autofill::SavePasswordProgressLogger:
-  virtual void SendLog(const std::string& log) override;
+  void SendLog(const std::string& log) override;
 
  private:
   // The PasswordManagerClient to which logs can be sent for display. The client
diff --git a/components/password_manager/core/browser/password_autofill_manager.h b/components/password_manager/core/browser/password_autofill_manager.h
index 8172877..88420c9 100644
--- a/components/password_manager/core/browser/password_autofill_manager.h
+++ b/components/password_manager/core/browser/password_autofill_manager.h
@@ -28,15 +28,14 @@ class PasswordAutofillManager : public autofill::AutofillPopupDelegate {
   virtual ~PasswordAutofillManager();
 
   // AutofillPopupDelegate implementation.
-  virtual void OnPopupShown() override;
-  virtual void OnPopupHidden() override;
-  virtual void DidSelectSuggestion(const base::string16& value,
-                                   int identifier) override;
-  virtual void DidAcceptSuggestion(const base::string16& value,
-                                   int identifier) override;
-  virtual void RemoveSuggestion(const base::string16& value,
-                                int identifier) override;
-  virtual void ClearPreviewedForm() override;
+  void OnPopupShown() override;
+  void OnPopupHidden() override;
+  void DidSelectSuggestion(const base::string16& value,
+                           int identifier) override;
+  void DidAcceptSuggestion(const base::string16& value,
+                           int identifier) override;
+  void RemoveSuggestion(const base::string16& value, int identifier) override;
+  void ClearPreviewedForm() override;
 
   // Invoked when a password mapping is added.
   void OnAddPasswordFormMapping(
diff --git a/components/password_manager/core/browser/password_autofill_manager_unittest.cc b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
index 7963486..99e43c2 100644
--- a/components/password_manager/core/browser/password_autofill_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
@@ -43,7 +43,7 @@ class MockPasswordManagerDriver : public StubPasswordManagerDriver {
 
 class TestPasswordManagerClient : public StubPasswordManagerClient {
  public:
-  virtual PasswordManagerDriver* GetDriver() override { return &driver_; }
+  PasswordManagerDriver* GetDriver() override { return &driver_; }
 
   MockPasswordManagerDriver* mock_driver() { return &driver_; }
 
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h
index fce6f9c..67ac2ea 100644
--- a/components/password_manager/core/browser/password_form_manager.h
+++ b/components/password_manager/core/browser/password_form_manager.h
@@ -39,7 +39,7 @@ class PasswordFormManager : public PasswordStoreConsumer {
                       PasswordManagerDriver* driver,
                       const autofill::PasswordForm& observed_form,
                       bool ssl_valid);
-  virtual ~PasswordFormManager();
+  ~PasswordFormManager() override;
 
   // Flags describing the result of comparing two forms as performed by
   // DoesMatch. Individual flags are only relevant for HTML forms, but
@@ -113,7 +113,7 @@ class PasswordFormManager : public PasswordStoreConsumer {
   // Takes ownership of the elements in |result|.
   void OnRequestDone(const std::vector<autofill::PasswordForm*>& result);
 
-  virtual void OnGetPasswordStoreResults(
+  void OnGetPasswordStoreResults(
       const std::vector<autofill::PasswordForm*>& results) override;
 
   // A user opted to 'never remember' passwords for this form.
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index 6a81025..a5a324e 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -127,10 +127,10 @@ class TestPasswordManager : public PasswordManager {
   explicit TestPasswordManager(PasswordManagerClient* client)
       : PasswordManager(client) {}
 
-  virtual void Autofill(const autofill::PasswordForm& form_for_autofill,
-                        const autofill::PasswordFormMap& best_matches,
-                        const autofill::PasswordForm& preferred_match,
-                        bool wait_for_username) const override {
+  void Autofill(const autofill::PasswordForm& form_for_autofill,
+                const autofill::PasswordFormMap& best_matches,
+                const autofill::PasswordForm& preferred_match,
+                bool wait_for_username) const override {
     best_matches_ = best_matches;
   }
 
diff --git a/components/password_manager/core/browser/password_generation_manager_unittest.cc b/components/password_manager/core/browser/password_generation_manager_unittest.cc
index 867293e4..044b575 100644
--- a/components/password_manager/core/browser/password_generation_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_generation_manager_unittest.cc
@@ -35,20 +35,18 @@ class TestPasswordManagerDriver : public StubPasswordManagerDriver {
         password_generation_manager_(client),
         password_autofill_manager_(client, NULL),
         is_off_the_record_(false) {}
-  virtual ~TestPasswordManagerDriver() {}
+  ~TestPasswordManagerDriver() override {}
 
   // PasswordManagerDriver implementation.
-  virtual bool IsOffTheRecord() override { return is_off_the_record_; }
-  virtual PasswordGenerationManager* GetPasswordGenerationManager() override {
+  bool IsOffTheRecord() override { return is_off_the_record_; }
+  PasswordGenerationManager* GetPasswordGenerationManager() override {
     return &password_generation_manager_;
   }
-  virtual PasswordManager* GetPasswordManager() override {
-    return &password_manager_;
-  }
-  virtual PasswordAutofillManager* GetPasswordAutofillManager() override {
+  PasswordManager* GetPasswordManager() override { return &password_manager_; }
+  PasswordAutofillManager* GetPasswordAutofillManager() override {
     return &password_autofill_manager_;
   }
-  virtual void AccountCreationFormsFound(
+  void AccountCreationFormsFound(
       const std::vector<autofill::FormData>& forms) override {
     found_account_creation_forms_.insert(
         found_account_creation_forms_.begin(), forms.begin(), forms.end());
@@ -74,10 +72,10 @@ class TestPasswordManagerClient : public StubPasswordManagerClient {
   TestPasswordManagerClient(scoped_ptr<PrefService> prefs)
       : prefs_(prefs.Pass()), driver_(this), is_sync_enabled_(false) {}
 
-  virtual PasswordStore* GetPasswordStore() override { return NULL; }
-  virtual PrefService* GetPrefs() override { return prefs_.get(); }
-  virtual PasswordManagerDriver* GetDriver() override { return &driver_; }
-  virtual bool IsPasswordSyncEnabled() override { return is_sync_enabled_; }
+  PasswordStore* GetPasswordStore() override { return NULL; }
+  PrefService* GetPrefs() override { return prefs_.get(); }
+  PasswordManagerDriver* GetDriver() override { return &driver_; }
+  bool IsPasswordSyncEnabled() override { return is_sync_enabled_; }
 
   void set_is_password_sync_enabled(bool enabled) {
     is_sync_enabled_ = enabled;
@@ -95,7 +93,7 @@ class TestPasswordManagerClient : public StubPasswordManagerClient {
 class TestAutofillMetrics : public autofill::AutofillMetrics {
  public:
   TestAutofillMetrics() {}
-  virtual ~TestAutofillMetrics() {}
+  ~TestAutofillMetrics() override {}
 };
 
 }  // anonymous namespace
diff --git a/components/password_manager/core/browser/password_manager.h b/components/password_manager/core/browser/password_manager.h
index 88e6b67..b7de06f 100644
--- a/components/password_manager/core/browser/password_manager.h
+++ b/components/password_manager/core/browser/password_manager.h
@@ -50,7 +50,7 @@ class PasswordManager : public LoginModel {
   static void RegisterLocalPrefs(PrefRegistrySimple* registry);
 #endif
   explicit PasswordManager(PasswordManagerClient* client);
-  virtual ~PasswordManager();
+  ~PasswordManager() override;
 
   typedef base::Callback<void(const autofill::PasswordForm&)>
       PasswordSubmittedCallback;
@@ -74,8 +74,8 @@ class PasswordManager : public LoginModel {
                         bool wait_for_username) const;
 
   // LoginModel implementation.
-  virtual void AddObserver(LoginModelObserver* observer) override;
-  virtual void RemoveObserver(LoginModelObserver* observer) override;
+  void AddObserver(LoginModelObserver* observer) override;
+  void RemoveObserver(LoginModelObserver* observer) override;
 
   // Mark this form as having a generated password.
   void SetFormHasGeneratedPassword(const autofill::PasswordForm& form);
diff --git a/components/password_manager/core/browser/password_manager_internals_service.h b/components/password_manager/core/browser/password_manager_internals_service.h
index b0d5f7a..bc7b311 100644
--- a/components/password_manager/core/browser/password_manager_internals_service.h
+++ b/components/password_manager/core/browser/password_manager_internals_service.h
@@ -27,7 +27,7 @@ class PasswordManagerInternalsService : public KeyedService,
   // Both properties are guarantied by the BrowserContextKeyedFactory framework,
   // so the service itself does not need the context on creation.
   PasswordManagerInternalsService();
-  virtual ~PasswordManagerInternalsService();
+  ~PasswordManagerInternalsService() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerInternalsService);
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc
index cb07e52..6b7a480 100644
--- a/components/password_manager/core/browser/password_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -81,7 +81,7 @@ class TestPasswordManager : public PasswordManager {
  public:
   explicit TestPasswordManager(PasswordManagerClient* client)
       : PasswordManager(client) {}
-  virtual ~TestPasswordManager() {}
+  ~TestPasswordManager() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestPasswordManager);
diff --git a/components/password_manager/core/browser/password_store.h b/components/password_manager/core/browser/password_store.h
index 9afb529..d93c660 100644
--- a/components/password_manager/core/browser/password_store.h
+++ b/components/password_manager/core/browser/password_store.h
@@ -196,7 +196,7 @@ class PasswordStore : protected PasswordStoreSync,
 
   typedef base::Callback<PasswordStoreChangeList(void)> ModificationTask;
 
-  virtual ~PasswordStore();
+  ~PasswordStore() override;
 
   // Get the TaskRunner to use for PasswordStore background tasks.
   // By default, a SingleThreadTaskRunner on the DB thread is used, but
@@ -255,8 +255,7 @@ class PasswordStore : protected PasswordStoreSync,
   // Called by WrapModificationTask() once the underlying data-modifying
   // operation has been performed. Notifies observers that password store data
   // may have been changed.
-  virtual void NotifyLoginsChanged(
-      const PasswordStoreChangeList& changes) override;
+  void NotifyLoginsChanged(const PasswordStoreChangeList& changes) override;
 
   // TaskRunner for tasks that run on the main thread (usually the UI thread).
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner_;
diff --git a/components/password_manager/core/browser/password_store_default.h b/components/password_manager/core/browser/password_store_default.h
index f60183f..7dcf4fb 100644
--- a/components/password_manager/core/browser/password_store_default.h
+++ b/components/password_manager/core/browser/password_store_default.h
@@ -24,31 +24,30 @@ class PasswordStoreDefault : public PasswordStore {
       LoginDatabase* login_db);
 
  protected:
-  virtual ~PasswordStoreDefault();
+  ~PasswordStoreDefault() override;
 
   // Implements PasswordStore interface.
-  virtual void ReportMetricsImpl(const std::string& sync_username) override;
-  virtual PasswordStoreChangeList AddLoginImpl(
+  void ReportMetricsImpl(const std::string& sync_username) override;
+  PasswordStoreChangeList AddLoginImpl(
       const autofill::PasswordForm& form) override;
-  virtual PasswordStoreChangeList UpdateLoginImpl(
+  PasswordStoreChangeList UpdateLoginImpl(
       const autofill::PasswordForm& form) override;
-  virtual PasswordStoreChangeList RemoveLoginImpl(
+  PasswordStoreChangeList RemoveLoginImpl(
       const autofill::PasswordForm& form) override;
-  virtual PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(
+  PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(
       base::Time delete_begin,
       base::Time delete_end) override;
-  virtual PasswordStoreChangeList RemoveLoginsSyncedBetweenImpl(
+  PasswordStoreChangeList RemoveLoginsSyncedBetweenImpl(
       base::Time delete_begin,
       base::Time delete_end) override;
-  virtual void GetLoginsImpl(
-      const autofill::PasswordForm& form,
-      AuthorizationPromptPolicy prompt_policy,
-      const ConsumerCallbackRunner& callback_runner) override;
-  virtual void GetAutofillableLoginsImpl(GetLoginsRequest* request) override;
-  virtual void GetBlacklistLoginsImpl(GetLoginsRequest* request) override;
-  virtual bool FillAutofillableLogins(
+  void GetLoginsImpl(const autofill::PasswordForm& form,
+                     AuthorizationPromptPolicy prompt_policy,
+                     const ConsumerCallbackRunner& callback_runner) override;
+  void GetAutofillableLoginsImpl(GetLoginsRequest* request) override;
+  void GetBlacklistLoginsImpl(GetLoginsRequest* request) override;
+  bool FillAutofillableLogins(
       std::vector<autofill::PasswordForm*>* forms) override;
-  virtual bool FillBlacklistLogins(
+  bool FillBlacklistLogins(
       std::vector<autofill::PasswordForm*>* forms) override;
 
  protected:
diff --git a/components/password_manager/core/browser/password_syncable_service.h b/components/password_manager/core/browser/password_syncable_service.h
index afec988..24ad460 100644
--- a/components/password_manager/core/browser/password_syncable_service.h
+++ b/components/password_manager/core/browser/password_syncable_service.h
@@ -42,18 +42,17 @@ class PasswordSyncableService : public syncer::SyncableService,
   // |password_store|, the constructor doesn't take ownership of the
   // |password_store|.
   explicit PasswordSyncableService(PasswordStoreSync* password_store);
-  virtual ~PasswordSyncableService();
+  ~PasswordSyncableService() override;
 
   // syncer::SyncableService:
-  virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+  syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
-  virtual void StopSyncing(syncer::ModelType type) override;
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const override;
-  virtual syncer::SyncError ProcessSyncChanges(
+  void StopSyncing(syncer::ModelType type) override;
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
 
diff --git a/components/password_manager/core/browser/stub_password_manager_client.h b/components/password_manager/core/browser/stub_password_manager_client.h
index 4193979..4d126ce 100644
--- a/components/password_manager/core/browser/stub_password_manager_client.h
+++ b/components/password_manager/core/browser/stub_password_manager_client.h
@@ -15,20 +15,19 @@ namespace password_manager {
 class StubPasswordManagerClient : public PasswordManagerClient {
  public:
   StubPasswordManagerClient();
-  virtual ~StubPasswordManagerClient();
+  ~StubPasswordManagerClient() override;
 
   // PasswordManagerClient:
-  virtual bool IsSyncAccountCredential(
-      const std::string& username, const std::string& origin) const override;
-  virtual bool ShouldFilterAutofillResult(
-      const autofill::PasswordForm& form) override;
-  virtual bool PromptUserToSavePassword(
+  bool IsSyncAccountCredential(const std::string& username,
+                               const std::string& origin) const override;
+  bool ShouldFilterAutofillResult(const autofill::PasswordForm& form) override;
+  bool PromptUserToSavePassword(
       scoped_ptr<PasswordFormManager> form_to_save) override;
-  virtual void AutomaticPasswordSave(
+  void AutomaticPasswordSave(
       scoped_ptr<PasswordFormManager> saved_manager) override;
-  virtual PrefService* GetPrefs() override;
-  virtual PasswordStore* GetPasswordStore() override;
-  virtual PasswordManagerDriver* GetDriver() override;
+  PrefService* GetPrefs() override;
+  PasswordStore* GetPasswordStore() override;
+  PasswordManagerDriver* GetDriver() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StubPasswordManagerClient);
diff --git a/components/password_manager/core/browser/stub_password_manager_driver.h b/components/password_manager/core/browser/stub_password_manager_driver.h
index 7ad562b..09ae441 100644
--- a/components/password_manager/core/browser/stub_password_manager_driver.h
+++ b/components/password_manager/core/browser/stub_password_manager_driver.h
@@ -15,26 +15,26 @@ namespace password_manager {
 class StubPasswordManagerDriver : public PasswordManagerDriver {
  public:
   StubPasswordManagerDriver();
-  virtual ~StubPasswordManagerDriver();
+  ~StubPasswordManagerDriver() override;
 
   // PasswordManagerDriver:
-  virtual void FillPasswordForm(
+  void FillPasswordForm(
       const autofill::PasswordFormFillData& form_data) override;
-  virtual bool DidLastPageLoadEncounterSSLErrors() override;
-  virtual bool IsOffTheRecord() override;
-  virtual void AllowPasswordGenerationForForm(
+  bool DidLastPageLoadEncounterSSLErrors() override;
+  bool IsOffTheRecord() override;
+  void AllowPasswordGenerationForForm(
       const autofill::PasswordForm& form) override;
-  virtual void AccountCreationFormsFound(
+  void AccountCreationFormsFound(
       const std::vector<autofill::FormData>& forms) override;
-  virtual void FillSuggestion(const base::string16& username,
-                              const base::string16& password) override;
-  virtual void PreviewSuggestion(const base::string16& username,
-                                 const base::string16& password) override;
-  virtual void ClearPreviewedForm() override;
-  virtual PasswordGenerationManager* GetPasswordGenerationManager() override;
-  virtual PasswordManager* GetPasswordManager() override;
-  virtual PasswordAutofillManager* GetPasswordAutofillManager() override;
-  virtual autofill::AutofillManager* GetAutofillManager() override;
+  void FillSuggestion(const base::string16& username,
+                      const base::string16& password) override;
+  void PreviewSuggestion(const base::string16& username,
+                         const base::string16& password) override;
+  void ClearPreviewedForm() override;
+  PasswordGenerationManager* GetPasswordGenerationManager() override;
+  PasswordManager* GetPasswordManager() override;
+  PasswordAutofillManager* GetPasswordAutofillManager() override;
+  autofill::AutofillManager* GetAutofillManager() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StubPasswordManagerDriver);
diff --git a/components/password_manager/core/browser/test_password_store.h b/components/password_manager/core/browser/test_password_store.h
index 7c44b0b..f759d48 100644
--- a/components/password_manager/core/browser/test_password_store.h
+++ b/components/password_manager/core/browser/test_password_store.h
@@ -38,40 +38,39 @@ class TestPasswordStore : public PasswordStore {
   bool IsEmpty() const;
 
  protected:
-  virtual ~TestPasswordStore();
+  ~TestPasswordStore() override;
 
   // Helper function to determine if forms are considered equivalent.
   bool FormsAreEquivalent(const autofill::PasswordForm& lhs,
                           const autofill::PasswordForm& rhs);
 
   // PasswordStore interface
-  virtual PasswordStoreChangeList AddLoginImpl(
+  PasswordStoreChangeList AddLoginImpl(
       const autofill::PasswordForm& form) override;
-  virtual PasswordStoreChangeList UpdateLoginImpl(
+  PasswordStoreChangeList UpdateLoginImpl(
       const autofill::PasswordForm& form) override;
-  virtual PasswordStoreChangeList RemoveLoginImpl(
+  PasswordStoreChangeList RemoveLoginImpl(
       const autofill::PasswordForm& form) override;
-  virtual void GetLoginsImpl(
-      const autofill::PasswordForm& form,
-      PasswordStore::AuthorizationPromptPolicy prompt_policy,
-      const ConsumerCallbackRunner& runner) override;
-  virtual void WrapModificationTask(ModificationTask task) override;
+  void GetLoginsImpl(const autofill::PasswordForm& form,
+                     PasswordStore::AuthorizationPromptPolicy prompt_policy,
+                     const ConsumerCallbackRunner& runner) override;
+  void WrapModificationTask(ModificationTask task) override;
 
   // Unused portions of PasswordStore interface
-  virtual void ReportMetricsImpl(const std::string& sync_username) override {}
-  virtual PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(
+  void ReportMetricsImpl(const std::string& sync_username) override {}
+  PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(
       base::Time begin,
       base::Time end) override;
-  virtual PasswordStoreChangeList RemoveLoginsSyncedBetweenImpl(
+  PasswordStoreChangeList RemoveLoginsSyncedBetweenImpl(
       base::Time delete_begin,
       base::Time delete_end) override;
-  virtual void GetAutofillableLoginsImpl(
+  void GetAutofillableLoginsImpl(
       PasswordStore::GetLoginsRequest* request) override {}
-  virtual void GetBlacklistLoginsImpl(
+  void GetBlacklistLoginsImpl(
       PasswordStore::GetLoginsRequest* request) override {}
-  virtual bool FillAutofillableLogins(
+  bool FillAutofillableLogins(
       std::vector<autofill::PasswordForm*>* forms) override;
-  virtual bool FillBlacklistLogins(
+  bool FillBlacklistLogins(
       std::vector<autofill::PasswordForm*>* forms) override;
 
  private:
diff --git a/components/password_manager/core/browser/webdata/logins_table.h b/components/password_manager/core/browser/webdata/logins_table.h
index 20b6e9f..55c40a3 100644
--- a/components/password_manager/core/browser/webdata/logins_table.h
+++ b/components/password_manager/core/browser/webdata/logins_table.h
@@ -23,16 +23,15 @@ class WebDatabase;
 class LoginsTable : public WebDatabaseTable {
  public:
   LoginsTable() {}
-  virtual ~LoginsTable() {}
+  ~LoginsTable() override {}
 
   // Retrieves the LoginsTable* owned by |database|.
   static LoginsTable* FromWebDatabase(WebDatabase* db);
 
-  virtual WebDatabaseTable::TypeKey GetTypeKey() const override;
-  virtual bool CreateTablesIfNecessary() override;
-  virtual bool IsSyncable() override;
-  virtual bool MigrateToVersion(int version,
-                                bool* update_compatible_version) override;
+  WebDatabaseTable::TypeKey GetTypeKey() const override;
+  bool CreateTablesIfNecessary() override;
+  bool IsSyncable() override;
+  bool MigrateToVersion(int version, bool* update_compatible_version) override;
 
 #if defined(OS_WIN)
   // Adds |info| to the list of imported passwords from ie7/ie8.
diff --git a/components/plugins/renderer/mobile_youtube_plugin.h b/components/plugins/renderer/mobile_youtube_plugin.h
index 9e68277..99a6213 100644
--- a/components/plugins/renderer/mobile_youtube_plugin.h
+++ b/components/plugins/renderer/mobile_youtube_plugin.h
@@ -26,16 +26,16 @@ class MobileYouTubePlugin : public PluginPlaceholder {
   static bool IsYouTubeURL(const GURL& url, const std::string& mime_type);
 
  private:
-  virtual ~MobileYouTubePlugin();
+  ~MobileYouTubePlugin() override;
 
   // Opens a youtube app in the current tab.
   void OpenYoutubeUrlCallback();
 
   // WebViewPlugin::Delegate (via PluginPlaceholder) method
-  virtual void BindWebFrame(blink::WebFrame* frame) override;
+  void BindWebFrame(blink::WebFrame* frame) override;
 
   // gin::Wrappable (via PluginPlaceholder) method
-  virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
+  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
       v8::Isolate* isolate) override;
 
   DISALLOW_COPY_AND_ASSIGN(MobileYouTubePlugin);
diff --git a/components/plugins/renderer/plugin_placeholder.h b/components/plugins/renderer/plugin_placeholder.h
index 2d3733f..a5f2564 100644
--- a/components/plugins/renderer/plugin_placeholder.h
+++ b/components/plugins/renderer/plugin_placeholder.h
@@ -43,7 +43,7 @@ class PluginPlaceholder : public content::RenderFrameObserver,
                     const std::string& html_data,
                     GURL placeholderDataUrl);
 
-  virtual ~PluginPlaceholder();
+  ~PluginPlaceholder() override;
 
   void OnLoadBlockedPlugins(const std::string& identifier);
   void OnSetIsPrerendering(bool is_prerendering);
@@ -67,16 +67,16 @@ class PluginPlaceholder : public content::RenderFrameObserver,
   void LoadPlugin();
 
   // gin::Wrappable method:
-  virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
+  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
       v8::Isolate* isolate) override;
 
  private:
   // WebViewPlugin::Delegate methods:
-  virtual void ShowContextMenu(const blink::WebMouseEvent&) override;
-  virtual void PluginDestroyed() override;
+  void ShowContextMenu(const blink::WebMouseEvent&) override;
+  void PluginDestroyed() override;
 
   // RenderFrameObserver methods:
-  virtual void OnDestruct() override;
+  void OnDestruct() override;
 
   // Javascript callbacks:
 
diff --git a/components/policy/core/browser/autofill_policy_handler.h b/components/policy/core/browser/autofill_policy_handler.h
index 67b90be..f96aa07 100644
--- a/components/policy/core/browser/autofill_policy_handler.h
+++ b/components/policy/core/browser/autofill_policy_handler.h
@@ -14,11 +14,11 @@ namespace policy {
 class POLICY_EXPORT AutofillPolicyHandler : public TypeCheckingPolicyHandler {
  public:
   AutofillPolicyHandler();
-  virtual ~AutofillPolicyHandler();
+  ~AutofillPolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutofillPolicyHandler);
diff --git a/components/policy/core/browser/configuration_policy_handler.h b/components/policy/core/browser/configuration_policy_handler.h
index 16cf7f4..c8101d7 100644
--- a/components/policy/core/browser/configuration_policy_handler.h
+++ b/components/policy/core/browser/configuration_policy_handler.h
@@ -78,11 +78,11 @@ class POLICY_EXPORT TypeCheckingPolicyHandler
  public:
   TypeCheckingPolicyHandler(const char* policy_name,
                             base::Value::Type value_type);
-  virtual ~TypeCheckingPolicyHandler();
+  ~TypeCheckingPolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
 
   const char* policy_name() const;
 
@@ -114,11 +114,11 @@ class POLICY_EXPORT IntRangePolicyHandlerBase
                             bool clamp);
 
   // ConfigurationPolicyHandler:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
 
  protected:
-  virtual ~IntRangePolicyHandlerBase();
+  ~IntRangePolicyHandlerBase() override;
 
   // Ensures that the value is in the allowed range. Returns false if the value
   // cannot be parsed or lies outside the allowed range and clamping is
@@ -147,11 +147,11 @@ class POLICY_EXPORT SimplePolicyHandler : public TypeCheckingPolicyHandler {
   SimplePolicyHandler(const char* policy_name,
                       const char* pref_path,
                       base::Value::Type value_type);
-  virtual ~SimplePolicyHandler();
+  ~SimplePolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   // The DictionaryValue path of the preference the policy maps to.
@@ -182,13 +182,13 @@ class POLICY_EXPORT StringMappingListPolicyHandler
   StringMappingListPolicyHandler(const char* policy_name,
                                  const char* pref_path,
                                  const GenerateMapCallback& map_generator);
-  virtual ~StringMappingListPolicyHandler();
+  ~StringMappingListPolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   // Attempts to convert the list in |input| to |output| according to the table,
@@ -223,11 +223,11 @@ class POLICY_EXPORT IntRangePolicyHandler : public IntRangePolicyHandlerBase {
                         int min,
                         int max,
                         bool clamp);
-  virtual ~IntRangePolicyHandler();
+  ~IntRangePolicyHandler() override;
 
   // ConfigurationPolicyHandler:
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   // Name of the pref to write.
@@ -246,11 +246,11 @@ class POLICY_EXPORT IntPercentageToDoublePolicyHandler
                                      int min,
                                      int max,
                                      bool clamp);
-  virtual ~IntPercentageToDoublePolicyHandler();
+  ~IntPercentageToDoublePolicyHandler() override;
 
   // ConfigurationPolicyHandler:
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   // Name of the pref to write.
@@ -268,11 +268,11 @@ class POLICY_EXPORT SchemaValidatingPolicyHandler
   SchemaValidatingPolicyHandler(const char* policy_name,
                                 Schema schema,
                                 SchemaOnErrorStrategy strategy);
-  virtual ~SchemaValidatingPolicyHandler();
+  ~SchemaValidatingPolicyHandler() override;
 
   // ConfigurationPolicyHandler:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
 
   const char* policy_name() const;
 
@@ -309,13 +309,13 @@ class POLICY_EXPORT SimpleSchemaValidatingPolicyHandler
       SchemaOnErrorStrategy strategy,
       RecommendedPermission recommended_permission,
       MandatoryPermission mandatory_permission);
-  virtual ~SimpleSchemaValidatingPolicyHandler();
+  ~SimpleSchemaValidatingPolicyHandler() override;
 
   // ConfigurationPolicyHandler:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   const char* pref_path_;
@@ -334,13 +334,13 @@ class POLICY_EXPORT LegacyPoliciesDeprecatingPolicyHandler
   LegacyPoliciesDeprecatingPolicyHandler(
       ScopedVector<ConfigurationPolicyHandler> legacy_policy_handlers,
       scoped_ptr<SchemaValidatingPolicyHandler> new_policy_handler);
-  virtual ~LegacyPoliciesDeprecatingPolicyHandler();
+  ~LegacyPoliciesDeprecatingPolicyHandler() override;
 
   // ConfigurationPolicyHandler:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   ScopedVector<ConfigurationPolicyHandler> legacy_policy_handlers_;
diff --git a/components/policy/core/browser/configuration_policy_handler_unittest.cc b/components/policy/core/browser/configuration_policy_handler_unittest.cc
index 83861ab..832dd71 100644
--- a/components/policy/core/browser/configuration_policy_handler_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc
@@ -34,11 +34,9 @@ class TestSchemaValidatingPolicyHandler : public SchemaValidatingPolicyHandler {
   TestSchemaValidatingPolicyHandler(const Schema& schema,
                                     SchemaOnErrorStrategy strategy)
       : SchemaValidatingPolicyHandler("PolicyForTesting", schema, strategy) {}
-  virtual ~TestSchemaValidatingPolicyHandler() {}
+  ~TestSchemaValidatingPolicyHandler() override {}
 
-  virtual void ApplyPolicySettings(const policy::PolicyMap&,
-                                   PrefValueMap*) override {
-  }
+  void ApplyPolicySettings(const policy::PolicyMap&, PrefValueMap*) override {}
 
   bool CheckAndGetValueForTest(const PolicyMap& policies,
                                scoped_ptr<base::Value>* value) {
diff --git a/components/policy/core/browser/configuration_policy_pref_store.h b/components/policy/core/browser/configuration_policy_pref_store.h
index 6ebdcbd..6722bba 100644
--- a/components/policy/core/browser/configuration_policy_pref_store.h
+++ b/components/policy/core/browser/configuration_policy_pref_store.h
@@ -38,21 +38,21 @@ class POLICY_EXPORT ConfigurationPolicyPrefStore
       PolicyLevel level);
 
   // PrefStore methods:
-  virtual void AddObserver(PrefStore::Observer* observer) override;
-  virtual void RemoveObserver(PrefStore::Observer* observer) override;
-  virtual bool HasObservers() const override;
-  virtual bool IsInitializationComplete() const override;
-  virtual bool GetValue(const std::string& key,
-                        const base::Value** result) const override;
+  void AddObserver(PrefStore::Observer* observer) override;
+  void RemoveObserver(PrefStore::Observer* observer) override;
+  bool HasObservers() const override;
+  bool IsInitializationComplete() const override;
+  bool GetValue(const std::string& key,
+                const base::Value** result) const override;
 
   // PolicyService::Observer methods:
-  virtual void OnPolicyUpdated(const PolicyNamespace& ns,
-                               const PolicyMap& previous,
-                               const PolicyMap& current) override;
-  virtual void OnPolicyServiceInitialized(PolicyDomain domain) override;
+  void OnPolicyUpdated(const PolicyNamespace& ns,
+                       const PolicyMap& previous,
+                       const PolicyMap& current) override;
+  void OnPolicyServiceInitialized(PolicyDomain domain) override;
 
  private:
-  virtual ~ConfigurationPolicyPrefStore();
+  ~ConfigurationPolicyPrefStore() override;
 
   // Refreshes policy information, rereading policy from the policy service and
   // sending out change notifications as appropriate.
diff --git a/components/policy/core/browser/policy_error_map.cc b/components/policy/core/browser/policy_error_map.cc
index 4d9c59d..60ec875 100644
--- a/components/policy/core/browser/policy_error_map.cc
+++ b/components/policy/core/browser/policy_error_map.cc
@@ -41,9 +41,9 @@ class SimplePendingError : public PolicyErrorMap::PendingError {
       : PendingError(policy_name),
         message_id_(message_id),
         replacement_(replacement) {}
-  virtual ~SimplePendingError() {}
+  ~SimplePendingError() override {}
 
-  virtual base::string16 GetMessage() const override {
+  base::string16 GetMessage() const override {
     if (message_id_ >= 0) {
       if (replacement_.empty())
         return l10n_util::GetStringUTF16(message_id_);
@@ -68,9 +68,9 @@ class DictSubkeyPendingError : public SimplePendingError {
                          const std::string& replacement)
       : SimplePendingError(policy_name, message_id, replacement),
         subkey_(subkey) {}
-  virtual ~DictSubkeyPendingError() {}
+  ~DictSubkeyPendingError() override {}
 
-  virtual base::string16 GetMessage() const override {
+  base::string16 GetMessage() const override {
     return l10n_util::GetStringFUTF16(IDS_POLICY_SUBKEY_ERROR,
                                       base::ASCIIToUTF16(subkey_),
                                       SimplePendingError::GetMessage());
@@ -90,9 +90,9 @@ class ListItemPendingError : public SimplePendingError {
                        const std::string& replacement)
       : SimplePendingError(policy_name, message_id, replacement),
         index_(index) {}
-  virtual ~ListItemPendingError() {}
+  ~ListItemPendingError() override {}
 
-  virtual base::string16 GetMessage() const override {
+  base::string16 GetMessage() const override {
     return l10n_util::GetStringFUTF16(IDS_POLICY_LIST_ENTRY_ERROR,
                                       base::IntToString16(index_),
                                       SimplePendingError::GetMessage());
@@ -111,9 +111,9 @@ class SchemaValidatingPendingError : public SimplePendingError {
                                const std::string& replacement)
       : SimplePendingError(policy_name, -1, replacement),
         error_path_(error_path) {};
-  virtual ~SchemaValidatingPendingError() {}
+  ~SchemaValidatingPendingError() override {}
 
-  virtual base::string16 GetMessage() const override {
+  base::string16 GetMessage() const override {
     return l10n_util::GetStringFUTF16(IDS_POLICY_SCHEMA_VALIDATION_ERROR,
                                       base::ASCIIToUTF16(error_path_),
                                       SimplePendingError::GetMessage());
diff --git a/components/policy/core/browser/url_blacklist_policy_handler.h b/components/policy/core/browser/url_blacklist_policy_handler.h
index bf399d6..b5d0709b 100644
--- a/components/policy/core/browser/url_blacklist_policy_handler.h
+++ b/components/policy/core/browser/url_blacklist_policy_handler.h
@@ -17,13 +17,13 @@ class POLICY_EXPORT URLBlacklistPolicyHandler
     : public ConfigurationPolicyHandler {
  public:
   URLBlacklistPolicyHandler();
-  virtual ~URLBlacklistPolicyHandler();
+  ~URLBlacklistPolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(URLBlacklistPolicyHandler);
diff --git a/components/policy/core/common/async_policy_provider.h b/components/policy/core/common/async_policy_provider.h
index 88fbeea..4b51004 100644
--- a/components/policy/core/common/async_policy_provider.h
+++ b/components/policy/core/common/async_policy_provider.h
@@ -34,12 +34,12 @@ class POLICY_EXPORT AsyncPolicyProvider : public ConfigurationPolicyProvider,
   // should be passed later to Init().
   AsyncPolicyProvider(SchemaRegistry* registry,
                       scoped_ptr<AsyncPolicyLoader> loader);
-  virtual ~AsyncPolicyProvider();
+  ~AsyncPolicyProvider() override;
 
   // ConfigurationPolicyProvider implementation.
-  virtual void Init(SchemaRegistry* registry) override;
-  virtual void Shutdown() override;
-  virtual void RefreshPolicies() override;
+  void Init(SchemaRegistry* registry) override;
+  void Shutdown() override;
+  void RefreshPolicies() override;
 
  private:
   // Helper for RefreshPolicies().
diff --git a/components/policy/core/common/cloud/cloud_policy_client_registration_helper.cc b/components/policy/core/common/cloud/cloud_policy_client_registration_helper.cc
index 46ddb17..9a5b103 100644
--- a/components/policy/core/common/cloud/cloud_policy_client_registration_helper.cc
+++ b/components/policy/core/common/cloud/cloud_policy_client_registration_helper.cc
@@ -44,11 +44,11 @@ class CloudPolicyClientRegistrationHelper::TokenServiceHelper
 
  private:
   // OAuth2TokenService::Consumer implementation:
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   StringCallback callback_;
   scoped_ptr<OAuth2TokenService::Request> token_request_;
@@ -107,10 +107,9 @@ class CloudPolicyClientRegistrationHelper::LoginTokenHelper
 
  private:
   // OAuth2AccessTokenConsumer implementation:
-  virtual void OnGetTokenSuccess(const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(
-      const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const GoogleServiceAuthError& error) override;
 
   StringCallback callback_;
   scoped_ptr<OAuth2AccessTokenFetcher> oauth2_access_token_fetcher_;
diff --git a/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h b/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h
index 26d8b53..9b7e464 100644
--- a/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h
+++ b/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h
@@ -37,7 +37,7 @@ class POLICY_EXPORT CloudPolicyClientRegistrationHelper
   CloudPolicyClientRegistrationHelper(
       CloudPolicyClient* client,
       enterprise_management::DeviceRegisterRequest::Type registration_type);
-  virtual ~CloudPolicyClientRegistrationHelper();
+  ~CloudPolicyClientRegistrationHelper() override;
 
   // Starts the client registration process. This version uses the
   // supplied OAuth2TokenService to mint the new token for the userinfo
@@ -74,15 +74,13 @@ class POLICY_EXPORT CloudPolicyClientRegistrationHelper
   void OnTokenFetched(const std::string& oauth_access_token);
 
   // UserInfoFetcher::Delegate implementation:
-  virtual void OnGetUserInfoSuccess(
-      const base::DictionaryValue* response) override;
-  virtual void OnGetUserInfoFailure(
-      const GoogleServiceAuthError& error) override;
+  void OnGetUserInfoSuccess(const base::DictionaryValue* response) override;
+  void OnGetUserInfoFailure(const GoogleServiceAuthError& error) override;
 
   // CloudPolicyClient::Observer implementation:
-  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
-  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
-  virtual void OnClientError(CloudPolicyClient* client) override;
+  void OnPolicyFetched(CloudPolicyClient* client) override;
+  void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  void OnClientError(CloudPolicyClient* client) override;
 
   // Invoked when the registration request has been completed.
   void RequestCompleted();
diff --git a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
index db09083..186cce6 100644
--- a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
@@ -39,7 +39,7 @@ class CloudPolicyCoreTest : public testing::Test,
     core_.RemoveObserver(this);
   }
 
-  virtual void OnCoreConnected(CloudPolicyCore* core) override {
+  void OnCoreConnected(CloudPolicyCore* core) override {
     // Make sure core is connected at callback time.
     if (core_.client())
       core_connected_callback_count_++;
@@ -47,7 +47,7 @@ class CloudPolicyCoreTest : public testing::Test,
       bad_callback_count_++;
   }
 
-  virtual void OnRefreshSchedulerStarted(CloudPolicyCore* core) override {
+  void OnRefreshSchedulerStarted(CloudPolicyCore* core) override {
     // Make sure refresh scheduler is started at callback time.
     if (core_.refresh_scheduler())
       refresh_scheduler_started_callback_count_++;
@@ -55,7 +55,7 @@ class CloudPolicyCoreTest : public testing::Test,
       bad_callback_count_++;
   }
 
-  virtual void OnCoreDisconnecting(CloudPolicyCore* core) override {
+  void OnCoreDisconnecting(CloudPolicyCore* core) override {
     // Make sure core is still connected at callback time.
     if (core_.client())
       core_disconnecting_callback_count_++;
diff --git a/components/policy/core/common/cloud/cloud_policy_manager.h b/components/policy/core/common/cloud/cloud_policy_manager.h
index f655916..95efe6a 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager.h
+++ b/components/policy/core/common/cloud/cloud_policy_manager.h
@@ -55,22 +55,22 @@ class POLICY_EXPORT CloudPolicyManager
       const scoped_refptr<base::SequencedTaskRunner>& task_runner,
       const scoped_refptr<base::SequencedTaskRunner>& file_task_runner,
       const scoped_refptr<base::SequencedTaskRunner>& io_task_runner);
-  virtual ~CloudPolicyManager();
+  ~CloudPolicyManager() override;
 
   CloudPolicyCore* core() { return &core_; }
   const CloudPolicyCore* core() const { return &core_; }
 
   // ConfigurationPolicyProvider:
-  virtual void Shutdown() override;
-  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
-  virtual void RefreshPolicies() override;
+  void Shutdown() override;
+  bool IsInitializationComplete(PolicyDomain domain) const override;
+  void RefreshPolicies() override;
 
   // CloudPolicyStore::Observer:
-  virtual void OnStoreLoaded(CloudPolicyStore* cloud_policy_store) override;
-  virtual void OnStoreError(CloudPolicyStore* cloud_policy_store) override;
+  void OnStoreLoaded(CloudPolicyStore* cloud_policy_store) override;
+  void OnStoreError(CloudPolicyStore* cloud_policy_store) override;
 
   // ComponentCloudPolicyService::Delegate:
-  virtual void OnComponentCloudPolicyUpdated() override;
+  void OnComponentCloudPolicyUpdated() override;
 
  protected:
   // Check whether fully initialized and if so, publish policy by calling
diff --git a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
index 41d7a90..1d6f053 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
@@ -31,25 +31,24 @@ namespace {
 class TestHarness : public PolicyProviderTestHarness {
  public:
   explicit TestHarness(PolicyLevel level);
-  virtual ~TestHarness();
+  ~TestHarness() override;
 
-  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;
 
@@ -156,7 +155,7 @@ class TestCloudPolicyManager : public CloudPolicyManager {
                            task_runner,
                            task_runner,
                            task_runner) {}
-  virtual ~TestCloudPolicyManager() {}
+  ~TestCloudPolicyManager() override {}
 
   // Publish the protected members for testing.
   using CloudPolicyManager::client;
diff --git a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h
index 0febc48..9a1eb75 100644
--- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h
+++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h
@@ -43,7 +43,7 @@ class POLICY_EXPORT CloudPolicyRefreshScheduler
       CloudPolicyClient* client,
       CloudPolicyStore* store,
       const scoped_refptr<base::SequencedTaskRunner>& task_runner);
-  virtual ~CloudPolicyRefreshScheduler();
+  ~CloudPolicyRefreshScheduler() override;
 
   base::Time last_refresh() const { return last_refresh_; }
   int64 refresh_delay() const { return refresh_delay_ms_; }
@@ -68,16 +68,16 @@ class POLICY_EXPORT CloudPolicyRefreshScheduler
   }
 
   // CloudPolicyClient::Observer:
-  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
-  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
-  virtual void OnClientError(CloudPolicyClient* client) override;
+  void OnPolicyFetched(CloudPolicyClient* client) override;
+  void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  void OnClientError(CloudPolicyClient* client) override;
 
   // CloudPolicyStore::Observer:
-  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
-  virtual void OnStoreError(CloudPolicyStore* store) override;
+  void OnStoreLoaded(CloudPolicyStore* store) override;
+  void OnStoreError(CloudPolicyStore* store) override;
 
   // net::NetworkChangeNotifier::IPAddressObserver:
-  virtual void OnIPAddressChanged() override;
+  void OnIPAddressChanged() override;
 
  private:
   // Initializes |last_refresh_| to the policy timestamp from |store_| in case
diff --git a/components/policy/core/common/cloud/cloud_policy_service.h b/components/policy/core/common/cloud/cloud_policy_service.h
index 3a68fd9..efcbb3f 100644
--- a/components/policy/core/common/cloud/cloud_policy_service.h
+++ b/components/policy/core/common/cloud/cloud_policy_service.h
@@ -42,7 +42,7 @@ class POLICY_EXPORT CloudPolicyService : public CloudPolicyClient::Observer,
   CloudPolicyService(const PolicyNamespaceKey& policy_ns_key,
                      CloudPolicyClient* client,
                      CloudPolicyStore* store);
-  virtual ~CloudPolicyService();
+  ~CloudPolicyService() override;
 
   // Returns the domain that manages this user/device, according to the current
   // policy blob. Empty if not managed/not available.
@@ -57,13 +57,13 @@ class POLICY_EXPORT CloudPolicyService : public CloudPolicyClient::Observer,
   void RemoveObserver(Observer* observer);
 
   // CloudPolicyClient::Observer:
-  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
-  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
-  virtual void OnClientError(CloudPolicyClient* client) override;
+  void OnPolicyFetched(CloudPolicyClient* client) override;
+  void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  void OnClientError(CloudPolicyClient* client) override;
 
   // CloudPolicyStore::Observer:
-  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
-  virtual void OnStoreError(CloudPolicyStore* store) override;
+  void OnStoreLoaded(CloudPolicyStore* store) override;
+  void OnStoreError(CloudPolicyStore* store) override;
 
   bool IsInitializationComplete() const { return initialization_complete_; }
 
diff --git a/components/policy/core/common/cloud/component_cloud_policy_service.cc b/components/policy/core/common/cloud/component_cloud_policy_service.cc
index 7cb6335..0ba5db1 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_service.cc
@@ -62,7 +62,7 @@ class ComponentCloudPolicyService::Backend
           scoped_ptr<ResourceCache> cache,
           scoped_ptr<ExternalPolicyDataFetcher> external_policy_data_fetcher);
 
-  virtual ~Backend();
+  ~Backend() override;
 
   // |username| and |dm_token| will be  used to validate the cached policies.
   void SetCredentials(const std::string& username, const std::string& dm_token);
@@ -75,7 +75,7 @@ class ComponentCloudPolicyService::Backend
   void UpdateExternalPolicy(scoped_ptr<em::PolicyFetchResponse> response);
 
   // ComponentCloudPolicyStore::Delegate implementation:
-  virtual void OnComponentCloudPolicyStoreUpdated() override;
+  void OnComponentCloudPolicyStoreUpdated() override;
 
   // Passes the current SchemaMap so that the disk cache can purge components
   // that aren't being tracked anymore.
diff --git a/components/policy/core/common/cloud/component_cloud_policy_service.h b/components/policy/core/common/cloud/component_cloud_policy_service.h
index 7358cc5..6112cbe 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service.h
+++ b/components/policy/core/common/cloud/component_cloud_policy_service.h
@@ -82,7 +82,7 @@ class POLICY_EXPORT ComponentCloudPolicyService
       scoped_refptr<net::URLRequestContextGetter> request_context,
       scoped_refptr<base::SequencedTaskRunner> backend_task_runner,
       scoped_refptr<base::SequencedTaskRunner> io_task_runner);
-  virtual ~ComponentCloudPolicyService();
+  ~ComponentCloudPolicyService() override;
 
   // Returns true if |domain| is supported by the service.
   static bool SupportsDomain(PolicyDomain domain);
@@ -98,22 +98,22 @@ class POLICY_EXPORT ComponentCloudPolicyService
   void ClearCache();
 
   // SchemaRegistry::Observer implementation:
-  virtual void OnSchemaRegistryReady() override;
-  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  void OnSchemaRegistryReady() override;
+  void OnSchemaRegistryUpdated(bool has_new_schemas) override;
 
   // CloudPolicyCore::Observer implementation:
-  virtual void OnCoreConnected(CloudPolicyCore* core) override;
-  virtual void OnCoreDisconnecting(CloudPolicyCore* core) override;
-  virtual void OnRefreshSchedulerStarted(CloudPolicyCore* core) override;
+  void OnCoreConnected(CloudPolicyCore* core) override;
+  void OnCoreDisconnecting(CloudPolicyCore* core) override;
+  void OnRefreshSchedulerStarted(CloudPolicyCore* core) override;
 
   // CloudPolicyStore::Observer implementation:
-  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
-  virtual void OnStoreError(CloudPolicyStore* store) override;
+  void OnStoreLoaded(CloudPolicyStore* store) override;
+  void OnStoreError(CloudPolicyStore* store) override;
 
   // CloudPolicyClient::Observer implementation:
-  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
-  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
-  virtual void OnClientError(CloudPolicyClient* client) override;
+  void OnPolicyFetched(CloudPolicyClient* client) override;
+  void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  void OnClientError(CloudPolicyClient* client) override;
 
  private:
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
diff --git a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
index 61ce1c4..7eca8c8 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
@@ -89,16 +89,14 @@ class TestURLRequestContextGetter : public net::URLRequestContextGetter {
   explicit TestURLRequestContextGetter(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner)
       : task_runner_(task_runner) {}
-  virtual net::URLRequestContext* GetURLRequestContext() override {
-    return NULL;
-  }
-  virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const override {
+  net::URLRequestContext* GetURLRequestContext() override { return NULL; }
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override {
     return task_runner_;
   }
 
  private:
-  virtual ~TestURLRequestContextGetter() {}
+  ~TestURLRequestContextGetter() override {}
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 };
diff --git a/components/policy/core/common/cloud/device_management_service.cc b/components/policy/core/common/cloud/device_management_service.cc
index b05cda7..50aa706 100644
--- a/components/policy/core/common/cloud/device_management_service.cc
+++ b/components/policy/core/common/cloud/device_management_service.cc
@@ -142,7 +142,7 @@ class DeviceManagementRequestJobImpl : public DeviceManagementRequestJob {
       const std::string& platform_parameter,
       DeviceManagementService* service,
       const scoped_refptr<net::URLRequestContextGetter>& request_context);
-  virtual ~DeviceManagementRequestJobImpl();
+  ~DeviceManagementRequestJobImpl() override;
 
   // Handles the URL request response.
   void HandleResponse(const net::URLRequestStatus& status,
@@ -166,7 +166,7 @@ class DeviceManagementRequestJobImpl : public DeviceManagementRequestJob {
 
  protected:
   // DeviceManagementRequestJob:
-  virtual void Run() override;
+  void Run() override;
 
  private:
   // Invokes the callback with the given error code.
diff --git a/components/policy/core/common/cloud/device_management_service.h b/components/policy/core/common/cloud/device_management_service.h
index 56fe07d..16cd6cc 100644
--- a/components/policy/core/common/cloud/device_management_service.h
+++ b/components/policy/core/common/cloud/device_management_service.h
@@ -124,7 +124,7 @@ class POLICY_EXPORT DeviceManagementService : public net::URLFetcherDelegate {
   };
 
   explicit DeviceManagementService(scoped_ptr<Configuration> configuration);
-  virtual ~DeviceManagementService();
+  ~DeviceManagementService() override;
 
   // The ID of URLFetchers created by the DeviceManagementService. This can be
   // used by tests that use a TestURLFetcherFactory to get the pending fetchers
@@ -154,7 +154,7 @@ class POLICY_EXPORT DeviceManagementService : public net::URLFetcherDelegate {
   friend class DeviceManagementRequestJobImpl;
 
   // net::URLFetcherDelegate override.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Starts processing any queued jobs.
   void Initialize();
diff --git a/components/policy/core/common/cloud/external_policy_data_fetcher.h b/components/policy/core/common/cloud/external_policy_data_fetcher.h
index 5f9fc45..b492768 100644
--- a/components/policy/core/common/cloud/external_policy_data_fetcher.h
+++ b/components/policy/core/common/cloud/external_policy_data_fetcher.h
@@ -139,7 +139,7 @@ class POLICY_EXPORT ExternalPolicyDataFetcherBackend
   ExternalPolicyDataFetcherBackend(
       scoped_refptr<base::SequencedTaskRunner> io_task_runner,
       scoped_refptr<net::URLRequestContextGetter> request_context);
-  virtual ~ExternalPolicyDataFetcherBackend();
+  ~ExternalPolicyDataFetcherBackend() override;
 
   // Create an ExternalPolicyDataFetcher that allows fetch jobs to be started
   // from the thread represented by |task_runner|.
@@ -156,10 +156,10 @@ class POLICY_EXPORT ExternalPolicyDataFetcherBackend
                  const base::Closure& callback);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
-  virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                          int64 current,
-                                          int64 total) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchDownloadProgress(const net::URLFetcher* source,
+                                  int64 current,
+                                  int64 total) override;
 
  private:
   scoped_refptr<base::SequencedTaskRunner> io_task_runner_;
diff --git a/components/policy/core/common/cloud/mock_device_management_service.cc b/components/policy/core/common/cloud/mock_device_management_service.cc
index b8c0421..970dd01 100644
--- a/components/policy/core/common/cloud/mock_device_management_service.cc
+++ b/components/policy/core/common/cloud/mock_device_management_service.cc
@@ -26,10 +26,10 @@ class MockRequestJobBase : public DeviceManagementRequestJob {
                      MockDeviceManagementService* service)
       : DeviceManagementRequestJob(type, std::string(), std::string()),
         service_(service) {}
-  virtual ~MockRequestJobBase() {}
+  ~MockRequestJobBase() override {}
 
  protected:
-  virtual void Run() override {
+  void Run() override {
     service_->StartJob(ExtractParameter(dm_protocol::kParamRequest),
                        gaia_token_,
                        ExtractParameter(dm_protocol::kParamOAuthToken),
@@ -67,10 +67,10 @@ class SyncRequestJob : public MockRequestJobBase {
       : MockRequestJobBase(type, service),
         status_(status),
         response_(response) {}
-  virtual ~SyncRequestJob() {}
+  ~SyncRequestJob() override {}
 
  protected:
-  virtual void Run() override {
+  void Run() override {
     MockRequestJobBase::Run();
     callback_.Run(status_, net::OK, response_);
   }
@@ -88,18 +88,17 @@ class AsyncRequestJob : public MockRequestJobBase,
  public:
   AsyncRequestJob(JobType type, MockDeviceManagementService* service)
       : MockRequestJobBase(type, service) {}
-  virtual ~AsyncRequestJob() {}
+  ~AsyncRequestJob() override {}
 
  protected:
-  virtual void RetryJob() override {
+  void RetryJob() override {
     if (!retry_callback_.is_null())
       retry_callback_.Run(this);
     Run();
   }
 
-  virtual void SendResponse(
-      DeviceManagementStatus status,
-      const em::DeviceManagementResponse& response) override {
+  void SendResponse(DeviceManagementStatus status,
+                    const em::DeviceManagementResponse& response) override {
     callback_.Run(status, net::OK, response);
   }
 
diff --git a/components/policy/core/common/cloud/mock_device_management_service.h b/components/policy/core/common/cloud/mock_device_management_service.h
index 84e3e83..7cc6449 100644
--- a/components/policy/core/common/cloud/mock_device_management_service.h
+++ b/components/policy/core/common/cloud/mock_device_management_service.h
@@ -29,11 +29,11 @@ class MockDeviceManagementServiceConfiguration
   MockDeviceManagementServiceConfiguration();
   explicit MockDeviceManagementServiceConfiguration(
       const std::string& server_url);
-  virtual ~MockDeviceManagementServiceConfiguration();
+  ~MockDeviceManagementServiceConfiguration() override;
 
-  virtual std::string GetServerUrl() override;
-  virtual std::string GetAgentParameter() override;
-  virtual std::string GetPlatformParameter() override;
+  std::string GetServerUrl() override;
+  std::string GetAgentParameter() override;
+  std::string GetPlatformParameter() override;
 
  private:
   const std::string server_url_;
diff --git a/components/policy/core/common/cloud/policy_header_service.h b/components/policy/core/common/cloud/policy_header_service.h
index c786533..f0bc4a9 100644
--- a/components/policy/core/common/cloud/policy_header_service.h
+++ b/components/policy/core/common/cloud/policy_header_service.h
@@ -33,7 +33,7 @@ class POLICY_EXPORT PolicyHeaderService : public CloudPolicyStore::Observer {
                       const std::string& verification_key_hash,
                       CloudPolicyStore* user_policy_store,
                       CloudPolicyStore* device_policy_store);
-  virtual ~PolicyHeaderService();
+  ~PolicyHeaderService() override;
 
   // Creates a PolicyHeaderIOHelper object to be run on the IO thread and
   // add policy headers to outgoing requests. The caller takes ownership of
@@ -44,8 +44,8 @@ class POLICY_EXPORT PolicyHeaderService : public CloudPolicyStore::Observer {
       scoped_refptr<base::SequencedTaskRunner> task_runner);
 
   // Overridden CloudPolicyStore::Observer methods:
-  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
-  virtual void OnStoreError(CloudPolicyStore* store) override;
+  void OnStoreLoaded(CloudPolicyStore* store) override;
+  void OnStoreError(CloudPolicyStore* store) override;
 
   // Returns a list of all PolicyHeaderIOHelpers created by this object.
   std::vector<PolicyHeaderIOHelper*> GetHelpersForTest();
diff --git a/components/policy/core/common/cloud/system_policy_request_context.h b/components/policy/core/common/cloud/system_policy_request_context.h
index 7c0a288..8fd6598 100644
--- a/components/policy/core/common/cloud/system_policy_request_context.h
+++ b/components/policy/core/common/cloud/system_policy_request_context.h
@@ -24,12 +24,12 @@ class POLICY_EXPORT SystemPolicyRequestContext
       const std::string& user_agent);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() override;
-  virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const override;
+  net::URLRequestContext* GetURLRequestContext() override;
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override;
 
  protected:
-  virtual ~SystemPolicyRequestContext();
+  ~SystemPolicyRequestContext() override;
 
  private:
   scoped_refptr<net::URLRequestContextGetter> system_context_getter_;
diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager.h b/components/policy/core/common/cloud/user_cloud_policy_manager.h
index a7cf584..ed428d9 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_manager.h
+++ b/components/policy/core/common/cloud/user_cloud_policy_manager.h
@@ -46,10 +46,10 @@ class POLICY_EXPORT UserCloudPolicyManager : public CloudPolicyManager {
       const scoped_refptr<base::SequencedTaskRunner>& task_runner,
       const scoped_refptr<base::SequencedTaskRunner>& file_task_runner,
       const scoped_refptr<base::SequencedTaskRunner>& io_task_runner);
-  virtual ~UserCloudPolicyManager();
+  ~UserCloudPolicyManager() override;
 
   // ConfigurationPolicyProvider overrides:
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   void SetSigninUsername(const std::string& username);
 
diff --git a/components/policy/core/common/cloud/user_cloud_policy_store.h b/components/policy/core/common/cloud/user_cloud_policy_store.h
index 0862ba47..163f2ee 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store.h
+++ b/components/policy/core/common/cloud/user_cloud_policy_store.h
@@ -33,7 +33,7 @@ class POLICY_EXPORT UserCloudPolicyStore : public UserCloudPolicyStoreBase {
       const base::FilePath& key_file,
       const std::string& verification_key,
       scoped_refptr<base::SequencedTaskRunner> background_task_runner);
-  virtual ~UserCloudPolicyStore();
+  ~UserCloudPolicyStore() override;
 
   // Factory method for creating a UserCloudPolicyStore for a profile with path
   // |profile_path|.
@@ -53,9 +53,8 @@ class POLICY_EXPORT UserCloudPolicyStore : public UserCloudPolicyStoreBase {
   virtual void Clear();
 
   // CloudPolicyStore implementation.
-  virtual void Load() override;
-  virtual void Store(
-      const enterprise_management::PolicyFetchResponse& policy) override;
+  void Load() override;
+  void Store(const enterprise_management::PolicyFetchResponse& policy) override;
 
   // The key used to sign the current policy (empty if there either is no
   // loaded policy yet, or if the policy is unsigned).
diff --git a/components/policy/core/common/cloud/user_cloud_policy_store_base.h b/components/policy/core/common/cloud/user_cloud_policy_store_base.h
index 1dd9743..5670ba9 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store_base.h
+++ b/components/policy/core/common/cloud/user_cloud_policy_store_base.h
@@ -27,7 +27,7 @@ class POLICY_EXPORT UserCloudPolicyStoreBase : public CloudPolicyStore {
  public:
   explicit UserCloudPolicyStoreBase(
       scoped_refptr<base::SequencedTaskRunner> background_task_runner);
-  virtual ~UserCloudPolicyStoreBase();
+  ~UserCloudPolicyStoreBase() override;
 
  protected:
   // Creates a validator configured to validate a user policy. The caller owns
diff --git a/components/policy/core/common/cloud/user_info_fetcher.h b/components/policy/core/common/cloud/user_info_fetcher.h
index 927799e..632e692 100644
--- a/components/policy/core/common/cloud/user_info_fetcher.h
+++ b/components/policy/core/common/cloud/user_info_fetcher.h
@@ -43,13 +43,13 @@ class POLICY_EXPORT UserInfoFetcher : public net::URLFetcherDelegate {
 
   // Create a new UserInfoFetcher. |context| can be NULL for unit tests.
   UserInfoFetcher(Delegate* delegate, net::URLRequestContextGetter* context);
-  virtual ~UserInfoFetcher();
+  ~UserInfoFetcher() override;
 
   // Starts the UserInfo request, using the passed OAuth2 |access_token|.
   void Start(const std::string& access_token);
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   Delegate* delegate_;
diff --git a/components/policy/core/common/cloud/user_policy_request_context.h b/components/policy/core/common/cloud/user_policy_request_context.h
index 2f249d6..9826807 100644
--- a/components/policy/core/common/cloud/user_policy_request_context.h
+++ b/components/policy/core/common/cloud/user_policy_request_context.h
@@ -25,12 +25,12 @@ class POLICY_EXPORT UserPolicyRequestContext
       const std::string& user_agent);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() override;
-  virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const override;
+  net::URLRequestContext* GetURLRequestContext() override;
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override;
 
  protected:
-  virtual ~UserPolicyRequestContext();
+  ~UserPolicyRequestContext() override;
 
  private:
   scoped_refptr<net::URLRequestContextGetter> user_context_getter_;
diff --git a/components/policy/core/common/config_dir_policy_loader.h b/components/policy/core/common/config_dir_policy_loader.h
index 8defe4a..ab1ccb4 100644
--- a/components/policy/core/common/config_dir_policy_loader.h
+++ b/components/policy/core/common/config_dir_policy_loader.h
@@ -27,12 +27,12 @@ class POLICY_EXPORT ConfigDirPolicyLoader : public AsyncPolicyLoader {
   ConfigDirPolicyLoader(scoped_refptr<base::SequencedTaskRunner> task_runner,
                         const base::FilePath& config_dir,
                         PolicyScope scope);
-  virtual ~ConfigDirPolicyLoader();
+  ~ConfigDirPolicyLoader() override;
 
   // AsyncPolicyLoader implementation.
-  virtual void InitOnBackgroundThread() override;
-  virtual scoped_ptr<PolicyBundle> Load() override;
-  virtual base::Time LastModificationTime() override;
+  void InitOnBackgroundThread() override;
+  scoped_ptr<PolicyBundle> Load() override;
+  base::Time LastModificationTime() override;
 
  private:
   // Loads the policy files at |path| into the |bundle|, with the given |level|.
diff --git a/components/policy/core/common/config_dir_policy_loader_unittest.cc b/components/policy/core/common/config_dir_policy_loader_unittest.cc
index 2d2e2c7..fe1f506 100644
--- a/components/policy/core/common/config_dir_policy_loader_unittest.cc
+++ b/components/policy/core/common/config_dir_policy_loader_unittest.cc
@@ -28,29 +28,27 @@ const base::FilePath::CharType kMandatoryPath[] = FILE_PATH_LITERAL("managed");
 class TestHarness : public PolicyProviderTestHarness {
  public:
   TestHarness();
-  virtual ~TestHarness();
+  ~TestHarness() override;
 
-  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;
 
   const base::FilePath& test_dir() { return test_dir_.path(); }
 
diff --git a/components/policy/core/common/configuration_policy_provider.h b/components/policy/core/common/configuration_policy_provider.h
index b01be0a..73a5d1d 100644
--- a/components/policy/core/common/configuration_policy_provider.h
+++ b/components/policy/core/common/configuration_policy_provider.h
@@ -34,7 +34,7 @@ class POLICY_EXPORT ConfigurationPolicyProvider
   // and it's not guaranteed that the message loops will still be running when
   // this is invoked. Override Shutdown() instead for cleanup code that needs
   // to post to the FILE thread, for example.
-  virtual ~ConfigurationPolicyProvider();
+  ~ConfigurationPolicyProvider() override;
 
   // Invoked as soon as the main message loops are spinning. Policy providers
   // are created early during startup to provide the initial policies; the
@@ -71,8 +71,8 @@ class POLICY_EXPORT ConfigurationPolicyProvider
   virtual void RemoveObserver(Observer* observer);
 
   // SchemaRegistry::Observer:
-  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
-  virtual void OnSchemaRegistryReady() override;
+  void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  void OnSchemaRegistryReady() override;
 
  protected:
   // Subclasses must invoke this to update the policies currently served by
diff --git a/components/policy/core/common/forwarding_policy_provider.h b/components/policy/core/common/forwarding_policy_provider.h
index 7ca47c2..8ea4172 100644
--- a/components/policy/core/common/forwarding_policy_provider.h
+++ b/components/policy/core/common/forwarding_policy_provider.h
@@ -24,7 +24,7 @@ class POLICY_EXPORT ForwardingPolicyProvider
  public:
   // The |delegate| must outlive this provider.
   explicit ForwardingPolicyProvider(ConfigurationPolicyProvider* delegate);
-  virtual ~ForwardingPolicyProvider();
+  ~ForwardingPolicyProvider() override;
 
   // ConfigurationPolicyProvider:
   //
@@ -43,14 +43,14 @@ class POLICY_EXPORT ForwardingPolicyProvider
   // except POLICY_DOMAIN_CHROME, whose status is always queried from the
   // |delegate_|. RefreshPolicies() calls are also forwarded, since this
   // provider doesn't have a "real" policy source of its own.
-  virtual void Init(SchemaRegistry* registry) override;
-  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
-  virtual void RefreshPolicies() override;
-  virtual void OnSchemaRegistryReady() override;
-  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  void Init(SchemaRegistry* registry) override;
+  bool IsInitializationComplete(PolicyDomain domain) const override;
+  void RefreshPolicies() override;
+  void OnSchemaRegistryReady() override;
+  void OnSchemaRegistryUpdated(bool has_new_schemas) override;
 
   // ConfigurationPolicyProvider::Observer:
-  virtual void OnUpdatePolicy(ConfigurationPolicyProvider* provider) override;
+  void OnUpdatePolicy(ConfigurationPolicyProvider* provider) override;
 
  private:
   enum InitializationState {
diff --git a/components/policy/core/common/policy_loader_mac.h b/components/policy/core/common/policy_loader_mac.h
index e86a565..b7471e8 100644
--- a/components/policy/core/common/policy_loader_mac.h
+++ b/components/policy/core/common/policy_loader_mac.h
@@ -33,12 +33,12 @@ class POLICY_EXPORT PolicyLoaderMac : public AsyncPolicyLoader {
   PolicyLoaderMac(scoped_refptr<base::SequencedTaskRunner> task_runner,
                   const base::FilePath& managed_policy_path,
                   MacPreferences* preferences);
-  virtual ~PolicyLoaderMac();
+  ~PolicyLoaderMac() override;
 
   // AsyncPolicyLoader implementation.
-  virtual void InitOnBackgroundThread() override;
-  virtual scoped_ptr<PolicyBundle> Load() override;
-  virtual base::Time LastModificationTime() override;
+  void InitOnBackgroundThread() override;
+  scoped_ptr<PolicyBundle> Load() override;
+  base::Time LastModificationTime() override;
 
  private:
   // Callback for the FilePathWatcher.
diff --git a/components/policy/core/common/policy_loader_mac_unittest.cc b/components/policy/core/common/policy_loader_mac_unittest.cc
index db22e74..a840724 100644
--- a/components/policy/core/common/policy_loader_mac_unittest.cc
+++ b/components/policy/core/common/policy_loader_mac_unittest.cc
@@ -29,25 +29,24 @@ namespace {
 class TestHarness : public PolicyProviderTestHarness {
  public:
   TestHarness();
-  virtual ~TestHarness();
+  ~TestHarness() override;
 
-  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;
 
diff --git a/components/policy/core/common/policy_service.h b/components/policy/core/common/policy_service.h
index a9e3b81..eae58d5 100644
--- a/components/policy/core/common/policy_service.h
+++ b/components/policy/core/common/policy_service.h
@@ -88,7 +88,7 @@ class POLICY_EXPORT PolicyChangeRegistrar : public PolicyService::Observer {
   PolicyChangeRegistrar(PolicyService* policy_service,
                         const PolicyNamespace& ns);
 
-  virtual ~PolicyChangeRegistrar();
+  ~PolicyChangeRegistrar() override;
 
   // Will invoke |callback| whenever |policy_name| changes its value, as long
   // as this registrar exists.
@@ -97,9 +97,9 @@ class POLICY_EXPORT PolicyChangeRegistrar : public PolicyService::Observer {
   void Observe(const std::string& policy_name, const UpdateCallback& callback);
 
   // Implementation of PolicyService::Observer:
-  virtual void OnPolicyUpdated(const PolicyNamespace& ns,
-                               const PolicyMap& previous,
-                               const PolicyMap& current) override;
+  void OnPolicyUpdated(const PolicyNamespace& ns,
+                       const PolicyMap& previous,
+                       const PolicyMap& current) override;
 
  private:
   typedef std::map<std::string, UpdateCallback> CallbackMap;
diff --git a/components/policy/core/common/policy_service_impl.h b/components/policy/core/common/policy_service_impl.h
index 96a50cd..e74141a 100644
--- a/components/policy/core/common/policy_service_impl.h
+++ b/components/policy/core/common/policy_service_impl.h
@@ -35,24 +35,23 @@ class POLICY_EXPORT PolicyServiceImpl
   // the providers, and they must outlive the PolicyServiceImpl.
   explicit PolicyServiceImpl(const Providers& providers);
 
-  virtual ~PolicyServiceImpl();
+  ~PolicyServiceImpl() override;
 
   // PolicyService overrides:
-  virtual void AddObserver(PolicyDomain domain,
-                           PolicyService::Observer* observer) override;
-  virtual void RemoveObserver(PolicyDomain domain,
-                              PolicyService::Observer* observer) override;
-  virtual const PolicyMap& GetPolicies(
-      const PolicyNamespace& ns) const override;
-  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
-  virtual void RefreshPolicies(const base::Closure& callback) override;
+  void AddObserver(PolicyDomain domain,
+                   PolicyService::Observer* observer) override;
+  void RemoveObserver(PolicyDomain domain,
+                      PolicyService::Observer* observer) override;
+  const PolicyMap& GetPolicies(const PolicyNamespace& ns) const override;
+  bool IsInitializationComplete(PolicyDomain domain) const override;
+  void RefreshPolicies(const base::Closure& callback) override;
 
  private:
   typedef ObserverList<PolicyService::Observer, true> Observers;
   typedef std::map<PolicyDomain, Observers*> ObserverMap;
 
   // ConfigurationPolicyProvider::Observer overrides:
-  virtual void OnUpdatePolicy(ConfigurationPolicyProvider* provider) override;
+  void OnUpdatePolicy(ConfigurationPolicyProvider* provider) override;
 
   // Posts a task to notify observers of |ns| that its policies have changed,
   // passing along the |previous| and the |current| policies.
diff --git a/components/policy/core/common/policy_service_impl_unittest.cc b/components/policy/core/common/policy_service_impl_unittest.cc
index ee0360b..109aeb4 100644
--- a/components/policy/core/common/policy_service_impl_unittest.cc
+++ b/components/policy/core/common/policy_service_impl_unittest.cc
@@ -75,9 +75,9 @@ class ChangePolicyObserver : public PolicyService::Observer {
       : provider_(provider),
         observer_invoked_(false) {}
 
-  virtual void OnPolicyUpdated(const PolicyNamespace&,
-                               const PolicyMap& previous,
-                               const PolicyMap& current) override {
+  void OnPolicyUpdated(const PolicyNamespace&,
+                       const PolicyMap& previous,
+                       const PolicyMap& current) override {
     PolicyMap new_policy;
     new_policy.Set("foo",
                    POLICY_LEVEL_MANDATORY,
diff --git a/components/policy/core/common/preferences_mock_mac.h b/components/policy/core/common/preferences_mock_mac.h
index 1ae517e..8f3df0c8 100644
--- a/components/policy/core/common/preferences_mock_mac.h
+++ b/components/policy/core/common/preferences_mock_mac.h
@@ -13,15 +13,14 @@
 class POLICY_EXPORT MockPreferences : public MacPreferences {
  public:
   MockPreferences();
-  virtual ~MockPreferences();
+  ~MockPreferences() override;
 
-  virtual Boolean AppSynchronize(CFStringRef applicationID) override;
+  Boolean AppSynchronize(CFStringRef applicationID) override;
 
-  virtual CFPropertyListRef CopyAppValue(CFStringRef key,
-                                         CFStringRef applicationID) override;
+  CFPropertyListRef CopyAppValue(CFStringRef key,
+                                 CFStringRef applicationID) override;
 
-  virtual Boolean AppValueIsForced(CFStringRef key,
-                                   CFStringRef applicationID) override;
+  Boolean AppValueIsForced(CFStringRef key, CFStringRef applicationID) override;
 
   // Adds a preference item with the given info to the test set.
   void AddTestItem(CFStringRef key, CFPropertyListRef value, bool is_forced);
diff --git a/components/policy/core/common/schema_registry.h b/components/policy/core/common/schema_registry.h
index c0e492f..931cbef 100644
--- a/components/policy/core/common/schema_registry.h
+++ b/components/policy/core/common/schema_registry.h
@@ -102,21 +102,21 @@ class POLICY_EXPORT CombinedSchemaRegistry
       public SchemaRegistry::InternalObserver {
  public:
   CombinedSchemaRegistry();
-  virtual ~CombinedSchemaRegistry();
+  ~CombinedSchemaRegistry() override;
 
   void Track(SchemaRegistry* registry);
 
   // SchemaRegistry:
-  virtual void RegisterComponents(PolicyDomain domain,
-                                  const ComponentMap& components) override;
-  virtual void UnregisterComponent(const PolicyNamespace& ns) override;
+  void RegisterComponents(PolicyDomain domain,
+                          const ComponentMap& components) override;
+  void UnregisterComponent(const PolicyNamespace& ns) override;
 
   // SchemaRegistry::Observer:
-  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
-  virtual void OnSchemaRegistryReady() override;
+  void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  void OnSchemaRegistryReady() override;
 
   // SchemaRegistry::InternalObserver:
-  virtual void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) override;
+  void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) override;
 
  private:
   void Combine(bool has_new_schemas);
@@ -136,19 +136,19 @@ class POLICY_EXPORT ForwardingSchemaRegistry
   // This registry will stop updating its SchemaMap when |wrapped| is
   // destroyed.
   explicit ForwardingSchemaRegistry(SchemaRegistry* wrapped);
-  virtual ~ForwardingSchemaRegistry();
+  ~ForwardingSchemaRegistry() override;
 
   // SchemaRegistry:
-  virtual void RegisterComponents(PolicyDomain domain,
-                                  const ComponentMap& components) override;
-  virtual void UnregisterComponent(const PolicyNamespace& ns) override;
+  void RegisterComponents(PolicyDomain domain,
+                          const ComponentMap& components) override;
+  void UnregisterComponent(const PolicyNamespace& ns) override;
 
   // SchemaRegistry::Observer:
-  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
-  virtual void OnSchemaRegistryReady() override;
+  void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  void OnSchemaRegistryReady() override;
 
   // SchemaRegistry::InternalObserver:
-  virtual void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) override;
+  void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) override;
 
  private:
   SchemaRegistry* wrapped_;
diff --git a/components/power/origin_power_map.h b/components/power/origin_power_map.h
index 3d664da..7592a2b 100644
--- a/components/power/origin_power_map.h
+++ b/components/power/origin_power_map.h
@@ -21,7 +21,7 @@ class OriginPowerMap : public KeyedService {
   typedef base::CallbackList<void(void)>::Subscription Subscription;
 
   OriginPowerMap();
-  virtual ~OriginPowerMap();
+  ~OriginPowerMap() override;
 
   // Returns the integer percentage usage of the total power consumed by a
   // given URL's origin.
diff --git a/components/power/origin_power_map_factory.h b/components/power/origin_power_map_factory.h
index fc6c2bb..f812d60 100644
--- a/components/power/origin_power_map_factory.h
+++ b/components/power/origin_power_map_factory.h
@@ -21,10 +21,10 @@ class OriginPowerMapFactory : public BrowserContextKeyedServiceFactory {
   friend struct DefaultSingletonTraits<OriginPowerMapFactory>;
 
   OriginPowerMapFactory();
-  virtual ~OriginPowerMapFactory();
+  ~OriginPowerMapFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(OriginPowerMapFactory);
diff --git a/components/precache/content/precache_manager.h b/components/precache/content/precache_manager.h
index 592a3cf..56d5d22 100644
--- a/components/precache/content/precache_manager.h
+++ b/components/precache/content/precache_manager.h
@@ -43,7 +43,7 @@ class PrecacheManager : public KeyedService,
   typedef base::Closure PrecacheCompletionCallback;
 
   explicit PrecacheManager(content::BrowserContext* browser_context);
-  virtual ~PrecacheManager();
+  ~PrecacheManager() override;
 
   // Returns true if precaching is enabled as part of a field trial or by the
   // command line flag. This method can be called on any thread.
@@ -74,10 +74,10 @@ class PrecacheManager : public KeyedService,
 
  private:
   // From KeyedService.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // From PrecacheFetcher::PrecacheDelegate.
-  virtual void OnDone() override;
+  void OnDone() override;
 
   void OnURLsReceived(const std::list<GURL>& urls);
 
diff --git a/components/precache/content/precache_manager_factory.h b/components/precache/content/precache_manager_factory.h
index 51f77e8..bc57686 100644
--- a/components/precache/content/precache_manager_factory.h
+++ b/components/precache/content/precache_manager_factory.h
@@ -27,10 +27,10 @@ class PrecacheManagerFactory : public BrowserContextKeyedServiceFactory {
   friend struct DefaultSingletonTraits<PrecacheManagerFactory>;
 
   PrecacheManagerFactory();
-  virtual ~PrecacheManagerFactory();
+  ~PrecacheManagerFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* browser_context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(PrecacheManagerFactory);
diff --git a/components/precache/content/precache_manager_unittest.cc b/components/precache/content/precache_manager_unittest.cc
index 360e9fc..56a67b8 100644
--- a/components/precache/content/precache_manager_unittest.cc
+++ b/components/precache/content/precache_manager_unittest.cc
@@ -89,7 +89,7 @@ class FakeURLListProvider : public URLListProvider {
         run_immediately_(run_immediately),
         was_get_urls_called_(false) {}
 
-  virtual void GetURLs(const GetURLsCallback& callback) override {
+  void GetURLs(const GetURLsCallback& callback) override {
     was_get_urls_called_ = true;
 
     if (run_immediately_) {
diff --git a/components/precache/core/precache_fetcher.cc b/components/precache/core/precache_fetcher.cc
index 650ca53b..70abac7 100644
--- a/components/precache/core/precache_fetcher.cc
+++ b/components/precache/core/precache_fetcher.cc
@@ -105,8 +105,8 @@ class PrecacheFetcher::Fetcher : public net::URLFetcherDelegate {
   // the specified URL using the specified request context.
   Fetcher(net::URLRequestContextGetter* request_context, const GURL& url,
           const base::Callback<void(const URLFetcher&)>& callback);
-  virtual ~Fetcher() {}
-  virtual void OnURLFetchComplete(const URLFetcher* source) override;
+  ~Fetcher() override {}
+  void OnURLFetchComplete(const URLFetcher* source) override;
 
  private:
   const base::Callback<void(const URLFetcher&)> callback_;
diff --git a/components/precache/core/precache_fetcher_unittest.cc b/components/precache/core/precache_fetcher_unittest.cc
index 0961a3c..999e51c 100644
--- a/components/precache/core/precache_fetcher_unittest.cc
+++ b/components/precache/core/precache_fetcher_unittest.cc
@@ -60,9 +60,7 @@ class TestPrecacheDelegate : public PrecacheFetcher::PrecacheDelegate {
  public:
   TestPrecacheDelegate() : was_on_done_called_(false) {}
 
-  virtual void OnDone() override {
-    was_on_done_called_ = true;
-  }
+  void OnDone() override { was_on_done_called_ = true; }
 
   bool was_on_done_called() const {
     return was_on_done_called_;
diff --git a/components/pref_registry/pref_registry_syncable.h b/components/pref_registry/pref_registry_syncable.h
index 57deda6..0fd9980 100644
--- a/components/pref_registry/pref_registry_syncable.h
+++ b/components/pref_registry/pref_registry_syncable.h
@@ -114,7 +114,7 @@ class PREF_REGISTRY_EXPORT PrefRegistrySyncable : public PrefRegistry {
   scoped_refptr<PrefRegistrySyncable> ForkForIncognito();
 
  private:
-  virtual ~PrefRegistrySyncable();
+  ~PrefRegistrySyncable() override;
 
   void RegisterSyncablePreference(const char* path,
                                   base::Value* default_value,
diff --git a/components/pref_registry/testing_pref_service_syncable.h b/components/pref_registry/testing_pref_service_syncable.h
index 5522baa..22c8a57 100644
--- a/components/pref_registry/testing_pref_service_syncable.h
+++ b/components/pref_registry/testing_pref_service_syncable.h
@@ -22,7 +22,7 @@ class TestingPrefServiceSyncable
                              TestingPrefStore* recommended_prefs,
                              PrefRegistrySyncable* pref_registry,
                              PrefNotifierImpl* pref_notifier);
-  virtual ~TestingPrefServiceSyncable();
+  ~TestingPrefServiceSyncable() override;
 
   // This is provided as a convenience; on a production PrefService
   // you would do all registrations before constructing it, passing it
diff --git a/components/proximity_auth/bluetooth_connection.h b/components/proximity_auth/bluetooth_connection.h
index ebe4f8d..affa5b2 100644
--- a/components/proximity_auth/bluetooth_connection.h
+++ b/components/proximity_auth/bluetooth_connection.h
@@ -33,17 +33,17 @@ class BluetoothConnection : public Connection,
   // Bluetooth daemon.
   BluetoothConnection(const RemoteDevice& remote_device,
                       const device::BluetoothUUID& uuid);
-  virtual ~BluetoothConnection();
+  ~BluetoothConnection() override;
 
  protected:
   // Connection:
-  virtual void Connect() override;
-  virtual void Disconnect() override;
-  virtual void SendMessageImpl(scoped_ptr<WireMessage> message) override;
+  void Connect() override;
+  void Disconnect() override;
+  void SendMessageImpl(scoped_ptr<WireMessage> message) override;
 
   // BluetoothAdapter::Observer:
-  virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) override;
+  void DeviceRemoved(device::BluetoothAdapter* adapter,
+                     device::BluetoothDevice* device) override;
 
  private:
   // Registers receive callbacks with the backing |socket_|.
diff --git a/components/proximity_auth/bluetooth_connection_finder.h b/components/proximity_auth/bluetooth_connection_finder.h
index 8de83b7..40b28dd 100644
--- a/components/proximity_auth/bluetooth_connection_finder.h
+++ b/components/proximity_auth/bluetooth_connection_finder.h
@@ -30,20 +30,20 @@ class BluetoothConnectionFinder : public ConnectionFinder,
   BluetoothConnectionFinder(const RemoteDevice& remote_device,
                             const device::BluetoothUUID& uuid,
                             const base::TimeDelta& polling_interval);
-  virtual ~BluetoothConnectionFinder();
+  ~BluetoothConnectionFinder() override;
 
   // ConnectionFinder:
-  virtual void Find(const ConnectionCallback& connection_callback) override;
+  void Find(const ConnectionCallback& connection_callback) override;
 
  protected:
   // Exposed for mocking out the connection in tests.
   virtual scoped_ptr<Connection> CreateConnection();
 
   // BluetoothAdapter::Observer:
-  virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter,
-                                     bool present) override;
-  virtual void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
-                                     bool powered) override;
+  void AdapterPresentChanged(device::BluetoothAdapter* adapter,
+                             bool present) override;
+  void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
+                             bool powered) override;
 
  private:
   // Returns true iff the Bluetooth adapter is ready to make connections.
@@ -64,10 +64,9 @@ class BluetoothConnectionFinder : public ConnectionFinder,
   void OnAdapterInitialized(scoped_refptr<device::BluetoothAdapter> adapter);
 
   // ConnectionObserver:
-  virtual void OnConnectionStatusChanged(
-      const Connection& connection,
-      Connection::Status old_status,
-      Connection::Status new_status) override;
+  void OnConnectionStatusChanged(const Connection& connection,
+                                 Connection::Status old_status,
+                                 Connection::Status new_status) override;
 
   // The remote device to connect to.
   const RemoteDevice remote_device_;
diff --git a/components/proximity_auth/bluetooth_connection_unittest.cc b/components/proximity_auth/bluetooth_connection_unittest.cc
index 1476533..a30d08c 100644
--- a/components/proximity_auth/bluetooth_connection_unittest.cc
+++ b/components/proximity_auth/bluetooth_connection_unittest.cc
@@ -80,9 +80,9 @@ class MockBluetoothConnection : public BluetoothConnection {
 class TestWireMessage : public WireMessage {
  public:
   TestWireMessage() : WireMessage("permit id", "payload") {}
-  virtual ~TestWireMessage() {}
+  ~TestWireMessage() override {}
 
-  virtual std::string Serialize() const override { return kSerializedMessage; }
+  std::string Serialize() const override { return kSerializedMessage; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestWireMessage);
diff --git a/components/proximity_auth/client.h b/components/proximity_auth/client.h
index cea47ee..5cd5107 100644
--- a/components/proximity_auth/client.h
+++ b/components/proximity_auth/client.h
@@ -91,15 +91,14 @@ class Client : public ConnectionObserver {
   void HandleUnlockResponseMessage(const base::DictionaryValue& message);
 
   // ConnectionObserver:
-  virtual void OnConnectionStatusChanged(
-      const Connection& connection,
-      Connection::Status old_status,
-      Connection::Status new_status) override;
-  virtual void OnMessageReceived(const Connection& connection,
-                                 const WireMessage& wire_message) override;
-  virtual void OnSendCompleted(const Connection& connection,
-                               const WireMessage& wire_message,
-                               bool success) override;
+  void OnConnectionStatusChanged(const Connection& connection,
+                                 Connection::Status old_status,
+                                 Connection::Status new_status) override;
+  void OnMessageReceived(const Connection& connection,
+                         const WireMessage& wire_message) override;
+  void OnSendCompleted(const Connection& connection,
+                       const WireMessage& wire_message,
+                       bool success) override;
 
   // The connection used to send and receive events and status updates.
   scoped_ptr<Connection> connection_;
diff --git a/components/proximity_auth/client_unittest.cc b/components/proximity_auth/client_unittest.cc
index f2e5d60..49c0b1a 100644
--- a/components/proximity_auth/client_unittest.cc
+++ b/components/proximity_auth/client_unittest.cc
@@ -62,13 +62,13 @@ class MockSecureContext : public SecureContext {
 class FakeConnection : public Connection {
  public:
   FakeConnection() : Connection(RemoteDevice()) { Connect(); }
-  virtual ~FakeConnection() { Disconnect(); }
+  ~FakeConnection() override { Disconnect(); }
 
-  virtual void Connect() override { SetStatus(CONNECTED); }
+  void Connect() override { SetStatus(CONNECTED); }
 
-  virtual void Disconnect() override { SetStatus(DISCONNECTED); }
+  void Disconnect() override { SetStatus(DISCONNECTED); }
 
-  virtual void SendMessageImpl(scoped_ptr<WireMessage> message) override {
+  void SendMessageImpl(scoped_ptr<WireMessage> message) override {
     ASSERT_FALSE(current_message_);
     current_message_ = message.Pass();
   }
@@ -91,7 +91,7 @@ class FakeConnection : public Connection {
 
   // Returns a message containing the payload set via
   // ReceiveMessageWithPayload().
-  virtual scoped_ptr<WireMessage> DeserializeWireMessage(
+  scoped_ptr<WireMessage> DeserializeWireMessage(
       bool* is_incomplete_message) override {
     *is_incomplete_message = false;
     return make_scoped_ptr(new WireMessage(std::string(), pending_payload_));
@@ -142,7 +142,7 @@ class TestClient : public Client {
   TestClient()
       : Client(make_scoped_ptr(new NiceMock<FakeConnection>()),
                make_scoped_ptr(new NiceMock<MockSecureContext>())) {}
-  virtual ~TestClient() {}
+  ~TestClient() override {}
 
   // Simple getters for the mock objects owned by |this| client.
   FakeConnection* GetFakeConnection() {
diff --git a/components/proximity_auth/connection_unittest.cc b/components/proximity_auth/connection_unittest.cc
index e3c335f..8fb1593 100644
--- a/components/proximity_auth/connection_unittest.cc
+++ b/components/proximity_auth/connection_unittest.cc
@@ -77,7 +77,7 @@ class MockConnectionObserver : public ConnectionObserver {
 class TestWireMessage : public WireMessage {
  public:
   TestWireMessage() : WireMessage(std::string(), std::string()) {}
-  virtual ~TestWireMessage() {}
+  ~TestWireMessage() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestWireMessage);
diff --git a/components/proximity_auth/cryptauth/cryptauth_api_call_flow.h b/components/proximity_auth/cryptauth/cryptauth_api_call_flow.h
index 53ae29b..3dd8f8c 100644
--- a/components/proximity_auth/cryptauth/cryptauth_api_call_flow.h
+++ b/components/proximity_auth/cryptauth/cryptauth_api_call_flow.h
@@ -23,7 +23,7 @@ class CryptAuthApiCallFlow : public OAuth2ApiCallFlow {
   typedef base::Callback<void(const std::string& error_message)> ErrorCallback;
 
   CryptAuthApiCallFlow(const GURL& request_url);
-  virtual ~CryptAuthApiCallFlow();
+  ~CryptAuthApiCallFlow() override;
 
   // Starts the API call.
   //   context: The URL context used to make the request.
@@ -44,11 +44,11 @@ class CryptAuthApiCallFlow : public OAuth2ApiCallFlow {
   using OAuth2ApiCallFlow::Start;
 
   // google_apis::OAuth2ApiCallFlow:
-  virtual GURL CreateApiCallUrl() override;
-  virtual std::string CreateApiCallBody() override;
-  virtual std::string CreateApiCallBodyContentType() override;
-  virtual void ProcessApiCallSuccess(const net::URLFetcher* source) override;
-  virtual void ProcessApiCallFailure(const net::URLFetcher* source) override;
+  GURL CreateApiCallUrl() override;
+  std::string CreateApiCallBody() override;
+  std::string CreateApiCallBodyContentType() override;
+  void ProcessApiCallSuccess(const net::URLFetcher* source) override;
+  void ProcessApiCallFailure(const net::URLFetcher* source) override;
 
  private:
   // The URL of the CryptAuth endpoint serving the request.
diff --git a/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc
index 8888c65..89ebe7f 100644
--- a/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc
+++ b/components/proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc
@@ -86,13 +86,13 @@ class ProximityAuthCryptAuthApiCallFlowTest
   }
 
   // net::TestURLFetcherDelegateForTests overrides.
-  virtual void OnRequestStart(int fetcher_id) override {
+  void OnRequestStart(int fetcher_id) override {
     url_fetcher_ = url_fetcher_factory_->GetFetcherByID(fetcher_id);
   }
 
-  virtual void OnChunkUpload(int fetcher_id) override {}
+  void OnChunkUpload(int fetcher_id) override {}
 
-  virtual void OnRequestEnd(int fetcher_id) override {}
+  void OnRequestEnd(int fetcher_id) override {}
 
   net::TestURLFetcher* url_fetcher_;
   scoped_ptr<std::string> result_;
diff --git a/components/query_parser/query_parser.cc b/components/query_parser/query_parser.cc
index 10703f0..96c73c2 100644
--- a/components/query_parser/query_parser.cc
+++ b/components/query_parser/query_parser.cc
@@ -67,22 +67,20 @@ bool IsQueryQuote(wchar_t ch) {
 class QueryNodeWord : public QueryNode {
  public:
   explicit QueryNodeWord(const base::string16& word);
-  virtual ~QueryNodeWord();
+  ~QueryNodeWord() override;
 
   const base::string16& word() const { return word_; }
 
   void set_literal(bool literal) { literal_ = literal; }
 
   // QueryNode:
-  virtual int AppendToSQLiteQuery(base::string16* query) const override;
-  virtual bool IsWord() const override;
-  virtual bool Matches(const base::string16& word, bool exact) const override;
-  virtual bool HasMatchIn(
-      const QueryWordVector& words,
-      Snippet::MatchPositions* match_positions) const override;
-  virtual bool HasMatchIn(
-      const QueryWordVector& words) const override;
-  virtual void AppendWords(std::vector<base::string16>* words) const override;
+  int AppendToSQLiteQuery(base::string16* query) const override;
+  bool IsWord() const override;
+  bool Matches(const base::string16& word, bool exact) const override;
+  bool HasMatchIn(const QueryWordVector& words,
+                  Snippet::MatchPositions* match_positions) const override;
+  bool HasMatchIn(const QueryWordVector& words) const override;
+  void AppendWords(std::vector<base::string16>* words) const override;
 
  private:
   base::string16 word_;
@@ -148,7 +146,7 @@ void QueryNodeWord::AppendWords(std::vector<base::string16>* words) const {
 class QueryNodeList : public QueryNode {
  public:
   QueryNodeList();
-  virtual ~QueryNodeList();
+  ~QueryNodeList() override;
 
   QueryNodeStarVector* children() { return &children_; }
 
@@ -158,14 +156,13 @@ class QueryNodeList : public QueryNode {
   void RemoveEmptySubnodes();
 
   // QueryNode:
-  virtual int AppendToSQLiteQuery(base::string16* query) const override;
-  virtual bool IsWord() const override;
-  virtual bool Matches(const base::string16& word, bool exact) const override;
-  virtual bool HasMatchIn(
-      const QueryWordVector& words,
-      Snippet::MatchPositions* match_positions) const override;
-  virtual bool HasMatchIn(const QueryWordVector& words) const override;
-  virtual void AppendWords(std::vector<base::string16>* words) const override;
+  int AppendToSQLiteQuery(base::string16* query) const override;
+  bool IsWord() const override;
+  bool Matches(const base::string16& word, bool exact) const override;
+  bool HasMatchIn(const QueryWordVector& words,
+                  Snippet::MatchPositions* match_positions) const override;
+  bool HasMatchIn(const QueryWordVector& words) const override;
+  void AppendWords(std::vector<base::string16>* words) const override;
 
  protected:
   int AppendChildrenToString(base::string16* query) const;
@@ -245,14 +242,13 @@ int QueryNodeList::AppendChildrenToString(base::string16* query) const {
 class QueryNodePhrase : public QueryNodeList {
  public:
   QueryNodePhrase();
-  virtual ~QueryNodePhrase();
+  ~QueryNodePhrase() override;
 
   // QueryNodeList:
-  virtual int AppendToSQLiteQuery(base::string16* query) const override;
-  virtual bool HasMatchIn(
-      const QueryWordVector& words,
-      Snippet::MatchPositions* match_positions) const override;
-  virtual bool HasMatchIn(const QueryWordVector& words) const override;
+  int AppendToSQLiteQuery(base::string16* query) const override;
+  bool HasMatchIn(const QueryWordVector& words,
+                  Snippet::MatchPositions* match_positions) const override;
+  bool HasMatchIn(const QueryWordVector& words) const override;
 
  private:
   bool MatchesAll(const QueryWordVector& words,
diff --git a/components/rappor/byte_vector_utils.h b/components/rappor/byte_vector_utils.h
index a3f5f06..3090d9b 100644
--- a/components/rappor/byte_vector_utils.h
+++ b/components/rappor/byte_vector_utils.h
@@ -80,7 +80,7 @@ class HmacByteVectorGenerator : public ByteVectorGenerator {
                           const std::string& entropy_input,
                           const std::string& personalization_string);
 
-  virtual ~HmacByteVectorGenerator();
+  ~HmacByteVectorGenerator() override;
 
   // Generates a random string suitable for passing to the constructor as
   // |entropy_input|.
@@ -95,7 +95,7 @@ class HmacByteVectorGenerator : public ByteVectorGenerator {
   explicit HmacByteVectorGenerator(const HmacByteVectorGenerator& prev_request);
 
   // ByteVector implementation:
-  virtual ByteVector GetRandomByteVector() override;
+  ByteVector GetRandomByteVector() override;
 
  private:
   // HMAC initalized with the value of "Key" HMAC_DRBG_Initialize.
diff --git a/components/rappor/log_uploader.h b/components/rappor/log_uploader.h
index 18661b5..f6219bb 100644
--- a/components/rappor/log_uploader.h
+++ b/components/rappor/log_uploader.h
@@ -39,7 +39,7 @@ class LogUploader : public net::URLFetcherDelegate {
 
   // If the object is destroyed (or the program terminates) while logs are
   // queued, the logs are lost.
-  virtual ~LogUploader();
+  ~LogUploader() override;
 
   // Adds an entry to the queue of logs to be uploaded to the server.  The
   // uploader makes no assumptions about the format of |log| and simply sends
@@ -64,7 +64,7 @@ class LogUploader : public net::URLFetcherDelegate {
  private:
   // Implements net::URLFetcherDelegate. Called after transmission completes
   // (whether successful or not).
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Called when the upload is completed.
   void OnUploadFinished(bool server_is_healthy, bool more_logs_remaining);
diff --git a/components/rappor/log_uploader_unittest.cc b/components/rappor/log_uploader_unittest.cc
index a065786..f3799ca 100644
--- a/components/rappor/log_uploader_unittest.cc
+++ b/components/rappor/log_uploader_unittest.cc
@@ -35,13 +35,13 @@ class TestLogUploader : public LogUploader {
   }
 
  protected:
-  virtual bool IsUploadScheduled() const override {
+  bool IsUploadScheduled() const override {
     return last_interval_set() != base::TimeDelta();
   }
 
   // Schedules a future call to StartScheduledUpload if one isn't already
   // pending.
-  virtual void ScheduleNextUpload(base::TimeDelta interval) override {
+  void ScheduleNextUpload(base::TimeDelta interval) override {
     EXPECT_EQ(last_interval_set(), base::TimeDelta());
     last_interval_set_ = interval;
   }
diff --git a/components/renderer_context_menu/context_menu_delegate.cc b/components/renderer_context_menu/context_menu_delegate.cc
index c6129b8..e9fbd97 100644
--- a/components/renderer_context_menu/context_menu_delegate.cc
+++ b/components/renderer_context_menu/context_menu_delegate.cc
@@ -14,7 +14,7 @@ class ContextMenuDelegateUserData : public base::SupportsUserData::Data {
  public:
   explicit ContextMenuDelegateUserData(ContextMenuDelegate* menu_delegate)
       : menu_delegate_(menu_delegate) {}
-  virtual ~ContextMenuDelegateUserData() {}
+  ~ContextMenuDelegateUserData() override {}
   ContextMenuDelegate* menu_delegate() { return menu_delegate_; }
 
  private:
diff --git a/components/renderer_context_menu/render_view_context_menu_base.h b/components/renderer_context_menu/render_view_context_menu_base.h
index f3a822a..45b3fc5 100644
--- a/components/renderer_context_menu/render_view_context_menu_base.h
+++ b/components/renderer_context_menu/render_view_context_menu_base.h
@@ -67,7 +67,7 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
   RenderViewContextMenuBase(content::RenderFrameHost* render_frame_host,
                             const content::ContextMenuParams& params);
 
-  virtual ~RenderViewContextMenuBase();
+  ~RenderViewContextMenuBase() override;
 
   // Initializes the context menu.
   void Init();
@@ -84,27 +84,25 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
   bool IsCommandIdKnown(int command_id, bool* enabled) const;
 
   // SimpleMenuModel::Delegate implementation.
-  virtual bool IsCommandIdChecked(int command_id) const override;
-  virtual void ExecuteCommand(int command_id, int event_flags) override;
-  virtual void MenuWillShow(ui::SimpleMenuModel* source) override;
-  virtual void MenuClosed(ui::SimpleMenuModel* source) override;
+  bool IsCommandIdChecked(int command_id) const override;
+  void ExecuteCommand(int command_id, int event_flags) override;
+  void MenuWillShow(ui::SimpleMenuModel* source) override;
+  void MenuClosed(ui::SimpleMenuModel* source) override;
 
   // RenderViewContextMenuProxy implementation.
-  virtual void AddMenuItem(int command_id,
-                           const base::string16& title) override;
-  virtual void AddCheckItem(int command_id,
-                            const base::string16& title) override;
-  virtual void AddSeparator() override;
-  virtual void AddSubMenu(int command_id,
-                          const base::string16& label,
-                          ui::MenuModel* model) override;
-  virtual void UpdateMenuItem(int command_id,
-                              bool enabled,
-                              bool hidden,
-                              const base::string16& title) override;
-  virtual content::RenderViewHost* GetRenderViewHost() const override;
-  virtual content::WebContents* GetWebContents() const override;
-  virtual content::BrowserContext* GetBrowserContext() const override;
+  void AddMenuItem(int command_id, const base::string16& title) override;
+  void AddCheckItem(int command_id, const base::string16& title) override;
+  void AddSeparator() override;
+  void AddSubMenu(int command_id,
+                  const base::string16& label,
+                  ui::MenuModel* model) override;
+  void UpdateMenuItem(int command_id,
+                      bool enabled,
+                      bool hidden,
+                      const base::string16& title) override;
+  content::RenderViewHost* GetRenderViewHost() const override;
+  content::WebContents* GetWebContents() const override;
+  content::BrowserContext* GetBrowserContext() const override;
 
  protected:
   friend class RenderViewContextMenuTest;
diff --git a/components/search_engines/default_search_policy_handler.h b/components/search_engines/default_search_policy_handler.h
index 1a53a48..870cae1 100644
--- a/components/search_engines/default_search_policy_handler.h
+++ b/components/search_engines/default_search_policy_handler.h
@@ -16,11 +16,11 @@ class DefaultSearchEncodingsPolicyHandler
     : public TypeCheckingPolicyHandler {
  public:
   DefaultSearchEncodingsPolicyHandler();
-  virtual ~DefaultSearchEncodingsPolicyHandler();
+  ~DefaultSearchEncodingsPolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultSearchEncodingsPolicyHandler);
@@ -30,13 +30,13 @@ class DefaultSearchEncodingsPolicyHandler
 class DefaultSearchPolicyHandler : public ConfigurationPolicyHandler {
  public:
   DefaultSearchPolicyHandler();
-  virtual ~DefaultSearchPolicyHandler();
+  ~DefaultSearchPolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   void HandleDictionaryPref(const PolicyMap& policies, PrefValueMap* prefs);
diff --git a/components/search_engines/keyword_table.h b/components/search_engines/keyword_table.h
index 7c8bc2a..a62ff57 100644
--- a/components/search_engines/keyword_table.h
+++ b/components/search_engines/keyword_table.h
@@ -92,16 +92,15 @@ class KeywordTable : public WebDatabaseTable {
   static const char kDefaultSearchProviderKey[];
 
   KeywordTable();
-  virtual ~KeywordTable();
+  ~KeywordTable() override;
 
   // Retrieves the KeywordTable* owned by |database|.
   static KeywordTable* FromWebDatabase(WebDatabase* db);
 
-  virtual WebDatabaseTable::TypeKey GetTypeKey() const override;
-  virtual bool CreateTablesIfNecessary() override;
-  virtual bool IsSyncable() override;
-  virtual bool MigrateToVersion(int version,
-                                bool* update_compatible_version) override;
+  WebDatabaseTable::TypeKey GetTypeKey() const override;
+  bool CreateTablesIfNecessary() override;
+  bool IsSyncable() override;
+  bool MigrateToVersion(int version, bool* update_compatible_version) override;
 
   // Performs an arbitrary number of Add/Remove/Update operations as a single
   // transaction.  This is provided for efficiency reasons: if the caller needs
diff --git a/components/search_engines/keyword_web_data_service.h b/components/search_engines/keyword_web_data_service.h
index da553a5..44d3fe8 100644
--- a/components/search_engines/keyword_web_data_service.h
+++ b/components/search_engines/keyword_web_data_service.h
@@ -82,7 +82,7 @@ class KeywordWebDataService : public WebDataServiceBase {
   void SetBuiltinKeywordVersion(int version);
 
  protected:
-  virtual ~KeywordWebDataService();
+  ~KeywordWebDataService() override;
 
  private:
   // Called by the BatchModeScoper (see comments there).
diff --git a/components/search_engines/template_url_fetcher.cc b/components/search_engines/template_url_fetcher.cc
index 3423939..542e475 100644
--- a/components/search_engines/template_url_fetcher.cc
+++ b/components/search_engines/template_url_fetcher.cc
@@ -32,7 +32,7 @@ class TemplateURLFetcher::RequestDelegate : public net::URLFetcherDelegate {
   // net::URLFetcherDelegate:
   // If data contains a valid OSDD, a TemplateURL is created and added to
   // the TemplateURLService.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // URL of the OSDD.
   GURL url() const { return osdd_url_; }
diff --git a/components/search_engines/template_url_fetcher.h b/components/search_engines/template_url_fetcher.h
index 7e2bf55..8607acb 100644
--- a/components/search_engines/template_url_fetcher.h
+++ b/components/search_engines/template_url_fetcher.h
@@ -40,7 +40,7 @@ class TemplateURLFetcher : public KeyedService {
   // Creates a TemplateURLFetcher.
   TemplateURLFetcher(TemplateURLService* template_url_service,
                      net::URLRequestContextGetter* request_context);
-  virtual ~TemplateURLFetcher();
+  ~TemplateURLFetcher() override;
 
   // If TemplateURLFetcher is not already downloading the OSDD for osdd_url,
   // it is downloaded. If successful and the result can be parsed, a TemplateURL
diff --git a/components/search_engines/template_url_parser_unittest.cc b/components/search_engines/template_url_parser_unittest.cc
index 4331be0..15214ff 100644
--- a/components/search_engines/template_url_parser_unittest.cc
+++ b/components/search_engines/template_url_parser_unittest.cc
@@ -21,10 +21,9 @@ using base::ASCIIToUTF16;
 class ParamFilterImpl : public TemplateURLParser::ParameterFilter {
  public:
   ParamFilterImpl(std::string name_str, std::string value_str);
-  virtual ~ParamFilterImpl();
+  ~ParamFilterImpl() override;
 
-  virtual bool KeepParameter(const std::string& key,
-                             const std::string& value) override;
+  bool KeepParameter(const std::string& key, const std::string& value) override;
 
  private:
   std::string name_str_;
diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h
index 438c42e..cd755ea 100644
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -97,7 +97,7 @@ class TemplateURLService : public WebDataServiceConsumer,
       const base::Closure& dsp_change_callback);
   // The following is for testing.
   TemplateURLService(const Initializer* initializers, const int count);
-  virtual ~TemplateURLService();
+  ~TemplateURLService() override;
 
   // Creates a TemplateURLData that was previously saved to |prefs| via
   // SaveDefaultSearchProviderToPrefs or set via policy.
@@ -290,9 +290,8 @@ class TemplateURLService : public WebDataServiceConsumer,
   // Notification that the keywords have been loaded.
   // This is invoked from WebDataService, and should not be directly
   // invoked.
-  virtual void OnWebDataServiceRequestDone(
-      KeywordWebDataService::Handle h,
-      const WDTypedResult* result) override;
+  void OnWebDataServiceRequestDone(KeywordWebDataService::Handle h,
+                                   const WDTypedResult* result) override;
 
   // Returns the locale-direction-adjusted short name for the given keyword.
   // Also sets the out param to indicate whether the keyword belongs to an
@@ -304,29 +303,28 @@ class TemplateURLService : public WebDataServiceConsumer,
   void OnHistoryURLVisited(const URLVisitedDetails& details);
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // syncer::SyncableService implementation.
 
   // Returns all syncable TemplateURLs from this model as SyncData. This should
   // include every search engine and no Extension keywords.
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const override;
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
   // Process new search engine changes from Sync, merging them into our local
   // data. This may send notifications if local search engines are added,
   // updated or removed.
-  virtual syncer::SyncError ProcessSyncChanges(
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
   // Merge initial search engine data from Sync and push any local changes up
   // to Sync. This may send notifications if local search engines are added,
   // updated or removed.
-  virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+  syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override;
-  virtual void StopSyncing(syncer::ModelType type) override;
+  void StopSyncing(syncer::ModelType type) override;
 
   // Processes a local TemplateURL change for Sync. |turl| is the TemplateURL
   // that has been modified, and |type| is the Sync ChangeType that took place.
diff --git a/components/search_engines/template_url_service_sync_unittest.cc b/components/search_engines/template_url_service_sync_unittest.cc
index b800f0e..bef95f1 100644
--- a/components/search_engines/template_url_service_sync_unittest.cc
+++ b/components/search_engines/template_url_service_sync_unittest.cc
@@ -86,15 +86,14 @@ syncer::SyncData CreateCustomSyncData(const TemplateURL& turl,
 class TestChangeProcessor : public syncer::SyncChangeProcessor {
  public:
   TestChangeProcessor();
-  virtual ~TestChangeProcessor();
+  ~TestChangeProcessor() override;
 
   // Store a copy of all the changes passed in so we can examine them later.
-  virtual syncer::SyncError ProcessSyncChanges(
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
 
-  virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
-      override {
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override {
     return syncer::SyncDataList();
   }
 
diff --git a/components/search_engines/testing_search_terms_data.h b/components/search_engines/testing_search_terms_data.h
index c5d2429..970bb54 100644
--- a/components/search_engines/testing_search_terms_data.h
+++ b/components/search_engines/testing_search_terms_data.h
@@ -10,16 +10,15 @@
 class TestingSearchTermsData : public SearchTermsData {
  public:
   explicit TestingSearchTermsData(const std::string& google_base_url);
-  virtual ~TestingSearchTermsData();
-
-  virtual std::string GoogleBaseURLValue() const override;
-  virtual base::string16 GetRlzParameterValue(
-      bool from_app_list) const override;
-  virtual std::string GetSearchClient() const override;
-  virtual std::string GoogleImageSearchSource() const override;
-  virtual bool EnableAnswersInSuggest() const override;
-  virtual bool IsShowingSearchTermsOnSearchResultsPages() const override;
-  virtual int OmniboxStartMargin() const override;
+  ~TestingSearchTermsData() override;
+
+  std::string GoogleBaseURLValue() const override;
+  base::string16 GetRlzParameterValue(bool from_app_list) const override;
+  std::string GetSearchClient() const override;
+  std::string GoogleImageSearchSource() const override;
+  bool EnableAnswersInSuggest() const override;
+  bool IsShowingSearchTermsOnSearchResultsPages() const override;
+  int OmniboxStartMargin() const override;
 
   void set_google_base_url(const std::string& google_base_url) {
     google_base_url_ = google_base_url;
diff --git a/components/search_provider_logos/logo_tracker.h b/components/search_provider_logos/logo_tracker.h
index 54e3f2c..1bfa403 100644
--- a/components/search_provider_logos/logo_tracker.h
+++ b/components/search_provider_logos/logo_tracker.h
@@ -105,7 +105,7 @@ class LogoTracker : public net::URLFetcherDelegate {
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       scoped_ptr<LogoDelegate> delegate);
 
-  virtual ~LogoTracker();
+  ~LogoTracker() override;
 
   // Defines the server API for downloading and parsing the logo. This must be
   // called at least once before calling GetLogo().
@@ -172,10 +172,10 @@ class LogoTracker : public net::URLFetcherDelegate {
                             const SkBitmap& image);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
-  virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                          int64 current,
-                                          int64 total) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchDownloadProgress(const net::URLFetcher* source,
+                                  int64 current,
+                                  int64 total) override;
 
   // The URL from which the logo is fetched.
   GURL logo_url_;
diff --git a/components/search_provider_logos/logo_tracker_unittest.cc b/components/search_provider_logos/logo_tracker_unittest.cc
index 27d6951..c5c1f35 100644
--- a/components/search_provider_logos/logo_tracker_unittest.cc
+++ b/components/search_provider_logos/logo_tracker_unittest.cc
@@ -277,9 +277,9 @@ class MockLogoObserver : public LogoObserver {
 class TestLogoDelegate : public LogoDelegate {
  public:
   TestLogoDelegate() {}
-  virtual ~TestLogoDelegate() {}
+  ~TestLogoDelegate() override {}
 
-  virtual void DecodeUntrustedImage(
+  void DecodeUntrustedImage(
       const scoped_refptr<base::RefCountedString>& encoded_image,
       base::Callback<void(const SkBitmap&)> image_decoded_callback) override {
     SkBitmap bitmap =
diff --git a/components/signin/core/browser/about_signin_internals.h b/components/signin/core/browser/about_signin_internals.h
index 94fca77..c7e264c 100644
--- a/components/signin/core/browser/about_signin_internals.h
+++ b/components/signin/core/browser/about_signin_internals.h
@@ -48,7 +48,7 @@ class AboutSigninInternals
 
   AboutSigninInternals(ProfileOAuth2TokenService* token_service,
                        SigninManagerBase* signin_manager);
-  virtual ~AboutSigninInternals();
+  ~AboutSigninInternals() override;
 
   // Each instance of SigninInternalsUI adds itself as an observer to be
   // notified of all updates that AboutSigninInternals receives.
@@ -59,18 +59,18 @@ class AboutSigninInternals
   void RefreshSigninPrefs();
 
   // SigninManager::SigninDiagnosticsObserver implementation.
-  virtual void NotifySigninValueChanged(
+  void NotifySigninValueChanged(
       const signin_internals_util::UntimedSigninStatusField& field,
       const std::string& value) override;
 
-  virtual void NotifySigninValueChanged(
+  void NotifySigninValueChanged(
       const signin_internals_util::TimedSigninStatusField& field,
       const std::string& value) override;
 
   void Initialize(SigninClient* client);
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Returns a dictionary of values in signin_status_ for use in
   // about:signin-internals. The values are formatted as shown -
@@ -93,19 +93,17 @@ class AboutSigninInternals
   void GetCookieAccountsAsync();
 
   // OAuth2TokenService::DiagnosticsObserver implementations.
-  virtual void OnAccessTokenRequested(
+  void OnAccessTokenRequested(
       const std::string& account_id,
       const std::string& consumer_id,
       const OAuth2TokenService::ScopeSet& scopes) override;
-  virtual void OnFetchAccessTokenComplete(
-      const std::string& account_id,
-      const std::string& consumer_id,
-      const OAuth2TokenService::ScopeSet& scopes,
-      GoogleServiceAuthError error,
-      base::Time expiration_time) override;
-  virtual void OnTokenRemoved(const std::string& account_id,
-                              const OAuth2TokenService::ScopeSet& scopes)
-      override;
+  void OnFetchAccessTokenComplete(const std::string& account_id,
+                                  const std::string& consumer_id,
+                                  const OAuth2TokenService::ScopeSet& scopes,
+                                  GoogleServiceAuthError error,
+                                  base::Time expiration_time) override;
+  void OnTokenRemoved(const std::string& account_id,
+                      const OAuth2TokenService::ScopeSet& scopes) override;
 
     void OnRefreshTokenReceived(std::string status);
     void OnAuthenticationResultReceived(std::string status);
@@ -174,9 +172,8 @@ class AboutSigninInternals
 
 
   // Overriden from GaiaAuthConsumer.
-  virtual void OnListAccountsSuccess(const std::string& data) override;
-  virtual void OnListAccountsFailure(const GoogleServiceAuthError& error)
-      override;
+  void OnListAccountsSuccess(const std::string& data) override;
+  void OnListAccountsFailure(const GoogleServiceAuthError& error) override;
 
   // Callback for ListAccounts. Once the email addresses are fetched from GAIA,
   // they are pushed to the signin_internals_ui.
diff --git a/components/signin/core/browser/account_reconcilor.h b/components/signin/core/browser/account_reconcilor.h
index 2b7f5ac..7d3caf4 100644
--- a/components/signin/core/browser/account_reconcilor.h
+++ b/components/signin/core/browser/account_reconcilor.h
@@ -41,7 +41,7 @@ class AccountReconcilor : public KeyedService,
   AccountReconcilor(ProfileOAuth2TokenService* token_service,
                     SigninManagerBase* signin_manager,
                     SigninClient* client);
-  virtual ~AccountReconcilor();
+  ~AccountReconcilor() override;
 
   void Initialize(bool start_reconcile_if_tokens_available);
 
@@ -51,7 +51,7 @@ class AccountReconcilor : public KeyedService,
   void OnNewProfileManagementFlagChanged(bool new_flag_status);
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Add or remove observers for the merge session notification.
   void AddMergeSessionObserver(MergeSessionHelper::Observer* observer);
@@ -138,24 +138,22 @@ class AccountReconcilor : public KeyedService,
   void OnCookieChanged(const net::CanonicalCookie* cookie);
 
   // Overriden from GaiaAuthConsumer.
-  virtual void OnListAccountsSuccess(const std::string& data) override;
-  virtual void OnListAccountsFailure(const GoogleServiceAuthError& error)
-      override;
+  void OnListAccountsSuccess(const std::string& data) override;
+  void OnListAccountsFailure(const GoogleServiceAuthError& error) override;
 
   // Overriden from MergeSessionHelper::Observer.
-  virtual void MergeSessionCompleted(const std::string& account_id,
-                                     const GoogleServiceAuthError& error)
-      override;
+  void MergeSessionCompleted(const std::string& account_id,
+                             const GoogleServiceAuthError& error) override;
 
   // Overriden from OAuth2TokenService::Observer.
-  virtual void OnEndBatchChanges() override;
+  void OnEndBatchChanges() override;
 
   // Overriden from SigninManagerBase::Observer.
-  virtual void GoogleSigninSucceeded(const std::string& account_id,
-                                     const std::string& username,
-                                     const std::string& password) override;
-  virtual void GoogleSignedOut(const std::string& account_id,
-                               const std::string& username) override;
+  void GoogleSigninSucceeded(const std::string& account_id,
+                             const std::string& username,
+                             const std::string& password) override;
+  void GoogleSignedOut(const std::string& account_id,
+                       const std::string& username) override;
 
   void MayBeDoNextListAccounts();
 
diff --git a/components/signin/core/browser/account_service_flag_fetcher.h b/components/signin/core/browser/account_service_flag_fetcher.h
index 0ef6cd3..1ee6ee3 100644
--- a/components/signin/core/browser/account_service_flag_fetcher.h
+++ b/components/signin/core/browser/account_service_flag_fetcher.h
@@ -48,30 +48,28 @@ class AccountServiceFlagFetcher : public GaiaAuthConsumer,
                             const ResultCallback& callback);
 
   // Destructing the object before the callback is called cancels the request.
-  virtual ~AccountServiceFlagFetcher();
+  ~AccountServiceFlagFetcher() override;
 
  private:
   void Start();
   void StartFetchingOAuth2AccessToken();
 
   // Overridden from OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
-  virtual void OnRefreshTokensLoaded() override;
+  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void OnRefreshTokensLoaded() override;
 
   // Overridden from OAuth2TokenService::Consumer:
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // Overridden from GaiaAuthConsumer:
-  virtual void OnClientLoginSuccess(const ClientLoginResult& result) override;
-  virtual void OnClientLoginFailure(const GoogleServiceAuthError& error)
-      override;
-  virtual void OnGetUserInfoSuccess(const UserInfoMap& data) override;
-  virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error)
-      override;
+  void OnClientLoginSuccess(const ClientLoginResult& result) override;
+  void OnClientLoginFailure(const GoogleServiceAuthError& error) override;
+  void OnGetUserInfoSuccess(const UserInfoMap& data) override;
+  void OnGetUserInfoFailure(const GoogleServiceAuthError& error) override;
 
   const std::string account_id_;
   ProfileOAuth2TokenService* token_service_;
diff --git a/components/signin/core/browser/account_tracker_service.cc b/components/signin/core/browser/account_tracker_service.cc
index 2c5f2cb..714c452 100644
--- a/components/signin/core/browser/account_tracker_service.cc
+++ b/components/signin/core/browser/account_tracker_service.cc
@@ -32,24 +32,24 @@ class AccountInfoFetcher : public OAuth2TokenService::Consumer,
                      net::URLRequestContextGetter* request_context_getter,
                      AccountTrackerService* service,
                      const std::string& account_id);
-  virtual ~AccountInfoFetcher();
+  ~AccountInfoFetcher() override;
 
   const std::string& account_id() { return account_id_; }
 
   void Start();
 
   // OAuth2TokenService::Consumer implementation.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // gaia::GaiaOAuthClient::Delegate implementation.
-  virtual void OnGetUserInfoResponse(
+  void OnGetUserInfoResponse(
       scoped_ptr<base::DictionaryValue> user_info) override;
-  virtual void OnOAuthError() override;
-  virtual void OnNetworkError(int response_code) override;
+  void OnOAuthError() override;
+  void OnNetworkError(int response_code) override;
 
  private:
   OAuth2TokenService* token_service_;
diff --git a/components/signin/core/browser/account_tracker_service.h b/components/signin/core/browser/account_tracker_service.h
index d973d1c..a6f403e 100644
--- a/components/signin/core/browser/account_tracker_service.h
+++ b/components/signin/core/browser/account_tracker_service.h
@@ -56,10 +56,10 @@ class AccountTrackerService : public KeyedService,
   };
 
   AccountTrackerService();
-  virtual ~AccountTrackerService();
+  ~AccountTrackerService() override;
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ -91,8 +91,8 @@ class AccountTrackerService : public KeyedService,
   void OnUserInfoFetchFailure(AccountInfoFetcher* fetcher);
 
   // OAuth2TokenService::Observer implementation.
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
+  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void OnRefreshTokenRevoked(const std::string& account_id) override;
 
   struct AccountState {
     AccountInfo info;
diff --git a/components/signin/core/browser/account_tracker_service_unittest.cc b/components/signin/core/browser/account_tracker_service_unittest.cc
index 8b340dc..64b83b0 100644
--- a/components/signin/core/browser/account_tracker_service_unittest.cc
+++ b/components/signin/core/browser/account_tracker_service_unittest.cc
@@ -98,7 +98,7 @@ std::string Str(const std::vector<TrackingEvent>& events) {
 class AccountTrackerObserver : public AccountTrackerService::Observer {
  public:
   AccountTrackerObserver() {}
-  virtual ~AccountTrackerObserver() {}
+  ~AccountTrackerObserver() override {}
 
   void Clear();
   void SortEventsByUser();
@@ -113,10 +113,8 @@ class AccountTrackerObserver : public AccountTrackerService::Observer {
 
  private:
   // AccountTrackerService::Observer implementation
-  virtual void OnAccountUpdated(
-      const AccountTrackerService::AccountInfo& ids) override;
-  virtual void OnAccountRemoved(
-      const AccountTrackerService::AccountInfo& ids) override;
+  void OnAccountUpdated(const AccountTrackerService::AccountInfo& ids) override;
+  void OnAccountRemoved(const AccountTrackerService::AccountInfo& ids) override;
 
   testing::AssertionResult CheckEvents(
       const std::vector<TrackingEvent>& events);
diff --git a/components/signin/core/browser/fake_auth_status_provider.h b/components/signin/core/browser/fake_auth_status_provider.h
index 7254179..ce2cca9 100644
--- a/components/signin/core/browser/fake_auth_status_provider.h
+++ b/components/signin/core/browser/fake_auth_status_provider.h
@@ -14,7 +14,7 @@ class FakeAuthStatusProvider
     : public SigninErrorController::AuthStatusProvider {
  public:
   explicit FakeAuthStatusProvider(SigninErrorController* error);
-  virtual ~FakeAuthStatusProvider();
+  ~FakeAuthStatusProvider() override;
 
   // Sets the auth error that this provider reports to SigninErrorController.
   // Also notifies SigninErrorController via AuthStatusChanged().
@@ -27,9 +27,9 @@ class FakeAuthStatusProvider
   }
 
   // AuthStatusProvider implementation.
-  virtual std::string GetAccountId() const override;
-  virtual std::string GetUsername() const override;
-  virtual GoogleServiceAuthError GetAuthStatus() const override;
+  std::string GetAccountId() const override;
+  std::string GetUsername() const override;
+  GoogleServiceAuthError GetAuthStatus() const override;
 
  private:
   SigninErrorController* error_provider_;
diff --git a/components/signin/core/browser/mutable_profile_oauth2_token_service.cc b/components/signin/core/browser/mutable_profile_oauth2_token_service.cc
index 98c92b0..6813351 100644
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service.cc
+++ b/components/signin/core/browser/mutable_profile_oauth2_token_service.cc
@@ -47,11 +47,11 @@ class MutableProfileOAuth2TokenService::RevokeServerRefreshToken
  public:
   RevokeServerRefreshToken(MutableProfileOAuth2TokenService* token_service,
                            const std::string& account_id);
-  virtual ~RevokeServerRefreshToken();
+  ~RevokeServerRefreshToken() override;
 
  private:
   // GaiaAuthConsumer overrides:
-  virtual void OnOAuth2RevokeTokenCompleted() override;
+  void OnOAuth2RevokeTokenCompleted() override;
 
   MutableProfileOAuth2TokenService* token_service_;
   GaiaAuthFetcher fetcher_;
diff --git a/components/signin/core/browser/mutable_profile_oauth2_token_service.h b/components/signin/core/browser/mutable_profile_oauth2_token_service.h
index e7db6a2..a06efba 100644
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service.h
+++ b/components/signin/core/browser/mutable_profile_oauth2_token_service.h
@@ -20,17 +20,16 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
                                          public WebDataServiceConsumer  {
  public:
   // ProfileOAuth2TokenService overrides.
-  virtual void Shutdown() override;
-  virtual std::vector<std::string> GetAccounts() override;
+  void Shutdown() override;
+  std::vector<std::string> GetAccounts() override;
 
   // The below three methods should be called only on the thread on which this
   // object was created.
-  virtual void LoadCredentials(const std::string& primary_account_id) override;
-  virtual void UpdateCredentials(const std::string& account_id,
-                                 const std::string& refresh_token) override;
-  virtual void RevokeAllCredentials() override;
-  virtual bool RefreshTokenIsAvailable(const std::string& account_id) const
-      override;
+  void LoadCredentials(const std::string& primary_account_id) override;
+  void UpdateCredentials(const std::string& account_id,
+                         const std::string& refresh_token) override;
+  void RevokeAllCredentials() override;
+  bool RefreshTokenIsAvailable(const std::string& account_id) const override;
 
   // Revokes credentials related to |account_id|.
   void RevokeCredentials(const std::string& account_id);
@@ -41,7 +40,7 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
     AccountInfo(ProfileOAuth2TokenService* token_service,
                 const std::string& account_id,
                 const std::string& refresh_token);
-    virtual ~AccountInfo();
+    ~AccountInfo() override;
 
     const std::string& refresh_token() const { return refresh_token_; }
     void set_refresh_token(const std::string& token) {
@@ -51,9 +50,9 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
     void SetLastAuthError(const GoogleServiceAuthError& error);
 
     // SigninErrorController::AuthStatusProvider implementation.
-    virtual std::string GetAccountId() const override;
-    virtual std::string GetUsername() const override;
-    virtual GoogleServiceAuthError GetAuthStatus() const override;
+    std::string GetAccountId() const override;
+    std::string GetUsername() const override;
+    GoogleServiceAuthError GetAuthStatus() const override;
 
    private:
     ProfileOAuth2TokenService* token_service_;
@@ -72,19 +71,19 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
   friend class MutableProfileOAuth2TokenServiceTest;
 
   MutableProfileOAuth2TokenService();
-  virtual ~MutableProfileOAuth2TokenService();
+  ~MutableProfileOAuth2TokenService() override;
 
   // OAuth2TokenService implementation.
-  virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
+  OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
       OAuth2AccessTokenConsumer* consumer) override;
-  virtual net::URLRequestContextGetter* GetRequestContext() override;
+  net::URLRequestContextGetter* GetRequestContext() override;
 
   // Updates the internal cache of the result from the most-recently-completed
   // auth request (used for reporting errors to the user).
-  virtual void UpdateAuthError(const std::string& account_id,
-                               const GoogleServiceAuthError& error) override;
+  void UpdateAuthError(const std::string& account_id,
+                       const GoogleServiceAuthError& error) override;
 
   virtual std::string GetRefreshToken(const std::string& account_id) const;
 
@@ -103,9 +102,8 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
                            CanonicalizeAccountId);
 
   // WebDataServiceConsumer implementation:
-  virtual void OnWebDataServiceRequestDone(
-      WebDataServiceBase::Handle handle,
-      const WDTypedResult* result) override;
+  void OnWebDataServiceRequestDone(WebDataServiceBase::Handle handle,
+                                   const WDTypedResult* result) override;
 
   // Loads credentials into in memory stucture.
   void LoadAllCredentialsIntoMemory(
diff --git a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
index b7e9a3a..d53f427 100644
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
+++ b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
@@ -65,21 +65,17 @@ class MutableProfileOAuth2TokenServiceTest
   }
 
   // OAuth2TokenService::Observer implementation.
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) override {
+  void OnRefreshTokenAvailable(const std::string& account_id) override {
     ++token_available_count_;
   }
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) override {
+  void OnRefreshTokenRevoked(const std::string& account_id) override {
     ++token_revoked_count_;
   }
-  virtual void OnRefreshTokensLoaded() override { ++tokens_loaded_count_; }
+  void OnRefreshTokensLoaded() override { ++tokens_loaded_count_; }
 
-  virtual void OnStartBatchChanges() override {
-    ++start_batch_changes_;
-  }
+  void OnStartBatchChanges() override { ++start_batch_changes_; }
 
-  virtual void OnEndBatchChanges() override {
-    ++end_batch_changes_;
-  }
+  void OnEndBatchChanges() override { ++end_batch_changes_; }
 
   void ResetObserverCounts() {
     token_available_count_ = 0;
diff --git a/components/signin/core/browser/profile_oauth2_token_service.h b/components/signin/core/browser/profile_oauth2_token_service.h
index fbc1fcc..13210c1 100644
--- a/components/signin/core/browser/profile_oauth2_token_service.h
+++ b/components/signin/core/browser/profile_oauth2_token_service.h
@@ -37,16 +37,16 @@ class SigninClient;
 class ProfileOAuth2TokenService : public OAuth2TokenService,
                                   public KeyedService {
  public:
-  virtual ~ProfileOAuth2TokenService();
+  ~ProfileOAuth2TokenService() override;
 
   // Initializes this token service with the SigninClient.
   virtual void Initialize(SigninClient* client);
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Lists account IDs of all accounts with a refresh token.
-  virtual std::vector<std::string> GetAccounts() override;
+  std::vector<std::string> GetAccounts() override;
 
   // Loads credentials from a backing persistent store to make them available
   // after service is used between profile restarts.
@@ -85,13 +85,12 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   // concrete class.
 
   // Simply returns NULL and should be overriden by subsclasses.
-  virtual net::URLRequestContextGetter* GetRequestContext() override;
+  net::URLRequestContextGetter* GetRequestContext() override;
 
   // Updates the internal cache of the result from the most-recently-completed
   // auth request (used for reporting errors to the user).
-  virtual void UpdateAuthError(
-      const std::string& account_id,
-      const GoogleServiceAuthError& error) override;
+  void UpdateAuthError(const std::string& account_id,
+                       const GoogleServiceAuthError& error) override;
 
   // Validate that the account_id argument is valid.  This method DCHECKs
   // when invalid.
diff --git a/components/signin/core/browser/signin_account_id_helper.cc b/components/signin/core/browser/signin_account_id_helper.cc
index 8570e11..a4c7ab8e 100644
--- a/components/signin/core/browser/signin_account_id_helper.cc
+++ b/components/signin/core/browser/signin_account_id_helper.cc
@@ -20,19 +20,19 @@ class SigninAccountIdHelper::GaiaIdFetcher
                 ProfileOAuth2TokenService* token_service,
                 SigninManagerBase* signin_manager,
                 SigninAccountIdHelper* signin_account_id_helper);
-  virtual ~GaiaIdFetcher();
+  ~GaiaIdFetcher() override;
 
   // OAuth2TokenService::Consumer implementation.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // gaia::GaiaOAuthClient::Delegate implementation.
-  virtual void OnGetUserIdResponse(const std::string& gaia_id) override;
-  virtual void OnOAuthError() override;
-  virtual void OnNetworkError(int response_code) override;
+  void OnGetUserIdResponse(const std::string& gaia_id) override;
+  void OnOAuthError() override;
+  void OnNetworkError(int response_code) override;
 
  private:
   void Start();
diff --git a/components/signin/core/browser/signin_account_id_helper.h b/components/signin/core/browser/signin_account_id_helper.h
index 680d463..8c93896 100644
--- a/components/signin/core/browser/signin_account_id_helper.h
+++ b/components/signin/core/browser/signin_account_id_helper.h
@@ -24,14 +24,14 @@ class SigninAccountIdHelper : public SigninManagerBase::Observer,
   SigninAccountIdHelper(SigninClient* client,
                         ProfileOAuth2TokenService* token_service,
                         SigninManagerBase* signin_manager);
-  virtual ~SigninAccountIdHelper();
+  ~SigninAccountIdHelper() override;
 
   // SigninManagerBase::Observer:
-  virtual void GoogleSignedOut(const std::string& account_id,
-                               const std::string& username) override;
+  void GoogleSignedOut(const std::string& account_id,
+                       const std::string& username) override;
 
   // OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void OnRefreshTokenAvailable(const std::string& account_id) override;
 
   // Disables network requests for testing to avoid messing up with irrelevant
   // tests.
diff --git a/components/signin/core/browser/signin_client.h b/components/signin/core/browser/signin_client.h
index 5043ab1..7a48a0b 100644
--- a/components/signin/core/browser/signin_client.h
+++ b/components/signin/core/browser/signin_client.h
@@ -38,7 +38,7 @@ class SigninClient : public KeyedService {
   typedef base::CallbackList<void(const net::CanonicalCookie* cookie)>
       CookieChangedCallbackList;
 
-  virtual ~SigninClient() {}
+  ~SigninClient() override {}
 
   // Gets the preferences associated with the client.
   virtual PrefService* GetPrefs() = 0;
diff --git a/components/signin/core/browser/signin_manager.h b/components/signin/core/browser/signin_manager.h
index 320872e..57f3813 100644
--- a/components/signin/core/browser/signin_manager.h
+++ b/components/signin/core/browser/signin_manager.h
@@ -64,7 +64,7 @@ class SigninManager : public SigninManagerBase {
   static const char kChromeSigninEffectiveSite[];
 
   SigninManager(SigninClient* client, ProfileOAuth2TokenService* token_service);
-  virtual ~SigninManager();
+  ~SigninManager() override;
 
   // Returns true if the username is allowed based on the policy string.
   static bool IsUsernameAllowedByPolicy(const std::string& username,
@@ -93,8 +93,8 @@ class SigninManager : public SigninManagerBase {
   // On platforms where SigninManager is responsible for dealing with
   // invalid username policy updates, we need to check this during
   // initialization and sign the user out.
-  virtual void Initialize(PrefService* local_state) override;
-  virtual void Shutdown() override;
+  void Initialize(PrefService* local_state) override;
+  void Shutdown() override;
 
   // Invoked from an OAuthTokenFetchedCallback to complete user signin.
   virtual void CompletePendingSignin();
@@ -104,9 +104,9 @@ class SigninManager : public SigninManagerBase {
   void OnExternalSigninCompleted(const std::string& username);
 
   // Returns true if there's a signin in progress.
-  virtual bool AuthInProgress() const override;
+  bool AuthInProgress() const override;
 
-  virtual bool IsSigninAllowed() const override;
+  bool IsSigninAllowed() const override;
 
   // Returns true if the passed username is allowed by policy. Virtual for
   // mocking in tests.
diff --git a/components/signin/core/browser/signin_manager_base.h b/components/signin/core/browser/signin_manager_base.h
index 11a9f98..d195adc 100644
--- a/components/signin/core/browser/signin_manager_base.h
+++ b/components/signin/core/browser/signin_manager_base.h
@@ -61,7 +61,7 @@ class SigninManagerBase : public KeyedService {
   };
 
   SigninManagerBase(SigninClient* client);
-  virtual ~SigninManagerBase();
+  ~SigninManagerBase() override;
 
   // If user was signed in, load tokens from DB if available.
   virtual void Initialize(PrefService* local_state);
@@ -109,7 +109,7 @@ class SigninManagerBase : public KeyedService {
   virtual bool AuthInProgress() const;
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Methods to register or remove observers of signin.
   void AddObserver(Observer* observer);
diff --git a/components/signin/core/browser/signin_oauth_helper.h b/components/signin/core/browser/signin_oauth_helper.h
index fa361a1..12de65b 100644
--- a/components/signin/core/browser/signin_oauth_helper.h
+++ b/components/signin/core/browser/signin_oauth_helper.h
@@ -38,19 +38,16 @@ class SigninOAuthHelper : public GaiaAuthConsumer {
                              const std::string& session_index,
                              const std::string& signin_scoped_device_id,
                              Consumer* consumer);
-  virtual ~SigninOAuthHelper();
+  ~SigninOAuthHelper() override;
 
  private:
   // Overridden from GaiaAuthConsumer.
-  virtual void OnClientOAuthSuccess(const ClientOAuthResult& result) override;
-  virtual void OnClientOAuthFailure(const GoogleServiceAuthError& error)
-      override;
-  virtual void OnClientLoginSuccess(const ClientLoginResult& result) override;
-  virtual void OnClientLoginFailure(const GoogleServiceAuthError& error)
-      override;
-  virtual void OnGetUserInfoSuccess(const UserInfoMap& data) override;
-  virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error)
-      override;
+  void OnClientOAuthSuccess(const ClientOAuthResult& result) override;
+  void OnClientOAuthFailure(const GoogleServiceAuthError& error) override;
+  void OnClientLoginSuccess(const ClientLoginResult& result) override;
+  void OnClientLoginFailure(const GoogleServiceAuthError& error) override;
+  void OnGetUserInfoSuccess(const UserInfoMap& data) override;
+  void OnGetUserInfoFailure(const GoogleServiceAuthError& error) override;
 
   GaiaAuthFetcher gaia_auth_fetcher_;
   std::string refresh_token_;
diff --git a/components/signin/core/browser/signin_tracker.h b/components/signin/core/browser/signin_tracker.h
index a45dedf..dfe6ce7 100644
--- a/components/signin/core/browser/signin_tracker.h
+++ b/components/signin/core/browser/signin_tracker.h
@@ -75,23 +75,22 @@ class SigninTracker : public SigninManagerBase::Observer,
                 AccountReconcilor* account_reconcilor,
                 SigninClient* client,
                 Observer* observer);
-  virtual ~SigninTracker();
+  ~SigninTracker() override;
 
   // SigninManagerBase::Observer implementation.
-  virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) override;
+  void GoogleSigninFailed(const GoogleServiceAuthError& error) override;
 
   // OAuth2TokenService::Observer implementation.
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
+  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void OnRefreshTokenRevoked(const std::string& account_id) override;
 
  private:
   // Initializes this by adding notifications and observers.
   void Initialize();
 
   // MergeSessionHelper::Observer implementation.
-  virtual void MergeSessionCompleted(
-      const std::string& account_id,
-      const GoogleServiceAuthError& error) override;
+  void MergeSessionCompleted(const std::string& account_id,
+                             const GoogleServiceAuthError& error) override;
 
   // The classes whose collective signin status we are tracking.
   ProfileOAuth2TokenService* token_service_;
diff --git a/components/signin/core/browser/test_signin_client.h b/components/signin/core/browser/test_signin_client.h
index 4df28fa..1538327 100644
--- a/components/signin/core/browser/test_signin_client.h
+++ b/components/signin/core/browser/test_signin_client.h
@@ -26,33 +26,33 @@ class TestSigninClient : public SigninClient {
  public:
   TestSigninClient();
   TestSigninClient(PrefService* pref_service);
-  virtual ~TestSigninClient();
+  ~TestSigninClient() override;
 
   // SigninClient implementation that is specialized for unit tests.
 
   // Returns NULL.
   // NOTE: This should be changed to return a properly-initalized PrefService
   // once there is a unit test that requires it.
-  virtual PrefService* GetPrefs() override;
+  PrefService* GetPrefs() override;
 
   // Returns a pointer to a loaded database.
-  virtual scoped_refptr<TokenWebData> GetDatabase() override;
+  scoped_refptr<TokenWebData> GetDatabase() override;
 
   // Returns true.
-  virtual bool CanRevokeCredentials() override;
+  bool CanRevokeCredentials() override;
 
   // Returns empty string.
-  virtual std::string GetSigninScopedDeviceId() override;
+  std::string GetSigninScopedDeviceId() override;
 
   // Does nothing.
-  virtual void OnSignedOut() override;
+  void OnSignedOut() override;
 
   // Returns the empty string.
-  virtual std::string GetProductVersion() override;
+  std::string GetProductVersion() override;
 
   // Returns a TestURLRequestContextGetter or an manually provided
   // URLRequestContextGetter.
-  virtual net::URLRequestContextGetter* GetURLRequestContext() override;
+  net::URLRequestContextGetter* GetURLRequestContext() override;
 
   // For testing purposes, can override the TestURLRequestContextGetter created
   // in the default constructor.
@@ -63,23 +63,23 @@ class TestSigninClient : public SigninClient {
 #endif
 
   // Returns true.
-  virtual bool ShouldMergeSigninCredentialsIntoCookieJar() override;
+  bool ShouldMergeSigninCredentialsIntoCookieJar() override;
 
   // Does nothing.
-  virtual scoped_ptr<CookieChangedCallbackList::Subscription>
-      AddCookieChangedCallback(const CookieChangedCallback& callback) override;
+  scoped_ptr<CookieChangedCallbackList::Subscription> AddCookieChangedCallback(
+      const CookieChangedCallback& callback) override;
 
 #if defined(OS_IOS)
   ios::FakeProfileOAuth2TokenServiceIOSProvider* GetIOSProviderAsFake();
 #endif
 
   // SigninClient overrides:
-  virtual void SetSigninProcess(int host_id) override;
-  virtual void ClearSigninProcess() override;
-  virtual bool IsSigninProcess(int host_id) const override;
-  virtual bool HasSigninProcess() const override;
-  virtual bool IsFirstRun() const override;
-  virtual base::Time GetInstallDate() override;
+  void SetSigninProcess(int host_id) override;
+  void ClearSigninProcess() override;
+  bool IsSigninProcess(int host_id) const override;
+  bool HasSigninProcess() const override;
+  bool IsFirstRun() const override;
+  base::Time GetInstallDate() override;
 
  private:
   // Loads the token database.
diff --git a/components/signin/core/browser/webdata/token_service_table.h b/components/signin/core/browser/webdata/token_service_table.h
index b4a1d8d..8cc7027 100644
--- a/components/signin/core/browser/webdata/token_service_table.h
+++ b/components/signin/core/browser/webdata/token_service_table.h
@@ -16,16 +16,15 @@ class WebDatabase;
 class TokenServiceTable : public WebDatabaseTable {
  public:
   TokenServiceTable() {}
-  virtual ~TokenServiceTable() {}
+  ~TokenServiceTable() override {}
 
   // Retrieves the TokenServiceTable* owned by |database|.
   static TokenServiceTable* FromWebDatabase(WebDatabase* db);
 
-  virtual WebDatabaseTable::TypeKey GetTypeKey() const override;
-  virtual bool CreateTablesIfNecessary() override;
-  virtual bool IsSyncable() override;
-  virtual bool MigrateToVersion(int version,
-                                bool* update_compatible_version) override;
+  WebDatabaseTable::TypeKey GetTypeKey() const override;
+  bool CreateTablesIfNecessary() override;
+  bool IsSyncable() override;
+  bool MigrateToVersion(int version, bool* update_compatible_version) override;
 
   // Remove all tokens previously set with SetTokenForService.
   bool RemoveAllTokens();
diff --git a/components/signin/core/browser/webdata/token_web_data.h b/components/signin/core/browser/webdata/token_web_data.h
index e63bde6..a7432af 100644
--- a/components/signin/core/browser/webdata/token_web_data.h
+++ b/components/signin/core/browser/webdata/token_web_data.h
@@ -59,7 +59,7 @@ class TokenWebData : public WebDataServiceBase {
   // For unit tests, passes a null callback.
   TokenWebData();
 
-  virtual ~TokenWebData();
+  ~TokenWebData() override;
 
  private:
   scoped_refptr<TokenWebDataBackend> token_backend_;
diff --git a/components/storage_monitor/image_capture_device_manager_unittest.mm b/components/storage_monitor/image_capture_device_manager_unittest.mm
index 477a203..bd85af9 100644
--- a/components/storage_monitor/image_capture_device_manager_unittest.mm
+++ b/components/storage_monitor/image_capture_device_manager_unittest.mm
@@ -205,28 +205,24 @@ class TestCameraListener
       : completed_(false),
         removed_(false),
         last_error_(base::File::FILE_ERROR_INVALID_URL) {}
-  virtual ~TestCameraListener() {}
+  ~TestCameraListener() override {}
 
-  virtual void ItemAdded(const std::string& name,
-                         const base::File::Info& info) override {
+  void ItemAdded(const std::string& name,
+                 const base::File::Info& info) override {
     items_.push_back(name);
   }
 
-  virtual void NoMoreItems() override {
-    completed_ = true;
-  }
+  void NoMoreItems() override { completed_ = true; }
 
-  virtual void DownloadedFile(const std::string& name,
-                              base::File::Error error) override {
+  void DownloadedFile(const std::string& name,
+                      base::File::Error error) override {
     EXPECT_TRUE(content::BrowserThread::CurrentlyOn(
         content::BrowserThread::UI));
     downloads_.push_back(name);
     last_error_ = error;
   }
 
-  virtual void DeviceRemoved() override {
-    removed_ = true;
-  }
+  void DeviceRemoved() override { removed_ = true; }
 
   std::vector<std::string> items() const { return items_; }
   std::vector<std::string> downloads() const { return downloads_; }
diff --git a/components/storage_monitor/mock_removable_storage_observer.h b/components/storage_monitor/mock_removable_storage_observer.h
index 220035e..14fde61 100644
--- a/components/storage_monitor/mock_removable_storage_observer.h
+++ b/components/storage_monitor/mock_removable_storage_observer.h
@@ -13,11 +13,11 @@ namespace storage_monitor {
 class MockRemovableStorageObserver : public RemovableStorageObserver {
  public:
   MockRemovableStorageObserver();
-  virtual ~MockRemovableStorageObserver();
+  ~MockRemovableStorageObserver() override;
 
-  virtual void OnRemovableStorageAttached(const StorageInfo& info) override;
+  void OnRemovableStorageAttached(const StorageInfo& info) override;
 
-  virtual void OnRemovableStorageDetached(const StorageInfo& info) override;
+  void OnRemovableStorageDetached(const StorageInfo& info) override;
 
   int attach_calls() { return attach_calls_; }
 
diff --git a/components/storage_monitor/storage_monitor.cc b/components/storage_monitor/storage_monitor.cc
index cd6bfae..f82995d 100644
--- a/components/storage_monitor/storage_monitor.cc
+++ b/components/storage_monitor/storage_monitor.cc
@@ -25,13 +25,13 @@ class StorageMonitor::ReceiverImpl : public StorageMonitor::Receiver {
   explicit ReceiverImpl(StorageMonitor* notifications)
       : notifications_(notifications) {}
 
-  virtual ~ReceiverImpl() {}
+  ~ReceiverImpl() override {}
 
-  virtual void ProcessAttach(const StorageInfo& info) override;
+  void ProcessAttach(const StorageInfo& info) override;
 
-  virtual void ProcessDetach(const std::string& id) override;
+  void ProcessDetach(const std::string& id) override;
 
-  virtual void MarkInitialized() override;
+  void MarkInitialized() override;
 
  private:
   StorageMonitor* notifications_;
diff --git a/components/storage_monitor/storage_monitor_mac.h b/components/storage_monitor/storage_monitor_mac.h
index 60a76f4..9379f5e 100644
--- a/components/storage_monitor/storage_monitor_mac.h
+++ b/components/storage_monitor/storage_monitor_mac.h
@@ -30,21 +30,19 @@ class StorageMonitorMac : public StorageMonitor,
   // Should only be called by browser start up code.  Use GetInstance() instead.
   StorageMonitorMac();
 
-  virtual ~StorageMonitorMac();
+  ~StorageMonitorMac() override;
 
-  virtual void Init() override;
+  void Init() override;
 
   void UpdateDisk(const std::string& bsd_name,
                   const StorageInfo& info,
                   UpdateType update_type);
 
-  virtual bool GetStorageInfoForPath(
-      const base::FilePath& path,
-      StorageInfo* device_info) const override;
+  bool GetStorageInfoForPath(const base::FilePath& path,
+                             StorageInfo* device_info) const override;
 
-  virtual void EjectDevice(
-      const std::string& device_id,
-      base::Callback<void(EjectStatus)> callback) override;
+  void EjectDevice(const std::string& device_id,
+                   base::Callback<void(EjectStatus)> callback) override;
 
  private:
   static void DiskAppearedCallback(DADiskRef disk, void* context);
diff --git a/components/storage_monitor/test_storage_monitor.h b/components/storage_monitor/test_storage_monitor.h
index 202156d..a42949f 100644
--- a/components/storage_monitor/test_storage_monitor.h
+++ b/components/storage_monitor/test_storage_monitor.h
@@ -14,9 +14,9 @@ namespace storage_monitor {
 class TestStorageMonitor : public StorageMonitor {
  public:
   TestStorageMonitor();
-  virtual ~TestStorageMonitor();
+  ~TestStorageMonitor() override;
 
-  virtual void Init() override;
+  void Init() override;
 
   void MarkInitialized();
 
@@ -34,9 +34,8 @@ class TestStorageMonitor : public StorageMonitor {
   // Synchronously initialize the current storage monitor.
   static void SyncInitialize();
 
-  virtual bool GetStorageInfoForPath(
-      const base::FilePath& path,
-      StorageInfo* device_info) const override;
+  bool GetStorageInfoForPath(const base::FilePath& path,
+                             StorageInfo* device_info) const override;
 
 #if defined(OS_WIN)
   virtual bool GetMTPStorageInfoFromDeviceId(
@@ -50,12 +49,11 @@ class TestStorageMonitor : public StorageMonitor {
       media_transfer_protocol_manager() override;
 #endif
 
-  virtual Receiver* receiver() const override;
+  Receiver* receiver() const override;
 
-  virtual void EjectDevice(
+  void EjectDevice(
       const std::string& device_id,
-      base::Callback<void(StorageMonitor::EjectStatus)> callback)
-      override;
+      base::Callback<void(StorageMonitor::EjectStatus)> callback) override;
 
   const std::string& ejected_device() const { return ejected_device_; }
 
diff --git a/components/suggestions/image_manager.h b/components/suggestions/image_manager.h
index 57ead85..1f7e392 100644
--- a/components/suggestions/image_manager.h
+++ b/components/suggestions/image_manager.h
@@ -40,7 +40,7 @@ class ImageManager : public ImageFetcherDelegate {
   ImageManager(scoped_ptr<ImageFetcher> image_fetcher,
                scoped_ptr<leveldb_proto::ProtoDatabase<ImageData> > database,
                const base::FilePath& database_dir);
-  virtual ~ImageManager();
+  ~ImageManager() override;
 
   virtual void Initialize(const SuggestionsProfile& suggestions);
 
@@ -51,7 +51,7 @@ class ImageManager : public ImageFetcherDelegate {
 
  protected:
   // Perform additional tasks when an image has been fetched.
-  virtual void OnImageFetched(const GURL& url, const SkBitmap* bitmap) override;
+  void OnImageFetched(const GURL& url, const SkBitmap* bitmap) override;
 
  private:
   friend class MockImageManager;
diff --git a/components/suggestions/suggestions_service.h b/components/suggestions/suggestions_service.h
index ea385e1..2203370 100644
--- a/components/suggestions/suggestions_service.h
+++ b/components/suggestions/suggestions_service.h
@@ -57,7 +57,7 @@ class SuggestionsService : public KeyedService, public net::URLFetcherDelegate {
       scoped_ptr<SuggestionsStore> suggestions_store,
       scoped_ptr<ImageManager> thumbnail_manager,
       scoped_ptr<BlacklistStore> blacklist_store);
-  virtual ~SuggestionsService();
+  ~SuggestionsService() override;
 
   // Whether this service is enabled.
   static bool IsEnabled();
@@ -124,10 +124,10 @@ class SuggestionsService : public KeyedService, public net::URLFetcherDelegate {
   // net::URLFetcherDelegate implementation.
   // Called when fetch request completes. Parses the received suggestions data,
   // and dispatches them to callbacks stored in queue.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   // Load the cached suggestions and service the requestors with them.
   void ServeFromCache();
diff --git a/components/sync_driver/data_type_controller.h b/components/sync_driver/data_type_controller.h
index 629919d..dd645b3 100644
--- a/components/sync_driver/data_type_controller.h
+++ b/components/sync_driver/data_type_controller.h
@@ -128,7 +128,7 @@ class DataTypeController
 
   // Partial implementation of DataTypeErrorHandler.
   // This is thread safe.
-  virtual syncer::SyncError CreateAndUploadError(
+  syncer::SyncError CreateAndUploadError(
       const tracked_objects::Location& location,
       const std::string& message,
       syncer::ModelType type) override;
@@ -156,7 +156,7 @@ class DataTypeController
   // us know that it is safe to start associating.
   virtual void OnModelLoaded() = 0;
 
-  virtual ~DataTypeController();
+  ~DataTypeController() override;
 
   syncer::UserShare* user_share() const;
 
diff --git a/components/sync_driver/data_type_manager_impl.h b/components/sync_driver/data_type_manager_impl.h
index 5856a18..422b244 100644
--- a/components/sync_driver/data_type_manager_impl.h
+++ b/components/sync_driver/data_type_manager_impl.h
@@ -46,31 +46,29 @@ class DataTypeManagerImpl : public DataTypeManager,
       const DataTypeEncryptionHandler* encryption_handler,
       BackendDataTypeConfigurer* configurer,
       DataTypeManagerObserver* observer);
-  virtual ~DataTypeManagerImpl();
+  ~DataTypeManagerImpl() override;
 
   // DataTypeManager interface.
-  virtual void Configure(syncer::ModelTypeSet desired_types,
-                         syncer::ConfigureReason reason) override;
-  virtual void ReenableType(syncer::ModelType type) override;
-  virtual void ResetDataTypeErrors() override;
+  void Configure(syncer::ModelTypeSet desired_types,
+                 syncer::ConfigureReason reason) override;
+  void ReenableType(syncer::ModelType type) override;
+  void ResetDataTypeErrors() override;
 
   // Needed only for backend migration.
-  virtual void PurgeForMigration(
-      syncer::ModelTypeSet undesired_types,
-      syncer::ConfigureReason reason) override;
+  void PurgeForMigration(syncer::ModelTypeSet undesired_types,
+                         syncer::ConfigureReason reason) override;
 
-  virtual void Stop() override;
-  virtual State state() const override;
+  void Stop() override;
+  State state() const override;
 
   // |ModelAssociationManagerDelegate| implementation.
-  virtual void OnSingleDataTypeAssociationDone(
+  void OnSingleDataTypeAssociationDone(
       syncer::ModelType type,
       const syncer::DataTypeAssociationStats& association_stats) override;
-  virtual void OnModelAssociationDone(
+  void OnModelAssociationDone(
       const DataTypeManager::ConfigureResult& result) override;
-  virtual void OnSingleDataTypeWillStop(
-      syncer::ModelType type,
-      const syncer::SyncError& error) override;
+  void OnSingleDataTypeWillStop(syncer::ModelType type,
+                                const syncer::SyncError& error) override;
 
   // Used by unit tests. TODO(sync) : This would go away if we made
   // this class be able to do Dependency injection. crbug.com/129212.
diff --git a/components/sync_driver/data_type_manager_impl_unittest.cc b/components/sync_driver/data_type_manager_impl_unittest.cc
index 5fad570..22aed72 100644
--- a/components/sync_driver/data_type_manager_impl_unittest.cc
+++ b/components/sync_driver/data_type_manager_impl_unittest.cc
@@ -80,13 +80,12 @@ DataTypeStatusTable BuildStatusTable(ModelTypeSet crypto_errors,
 class FakeBackendDataTypeConfigurer : public BackendDataTypeConfigurer {
  public:
   FakeBackendDataTypeConfigurer() {}
-  virtual ~FakeBackendDataTypeConfigurer() {}
+  ~FakeBackendDataTypeConfigurer() override {}
 
-  virtual void ConfigureDataTypes(
+  void ConfigureDataTypes(
       syncer::ConfigureReason reason,
       const DataTypeConfigStateMap& config_state_map,
-      const base::Callback<void(ModelTypeSet,
-                                ModelTypeSet)>& ready_task,
+      const base::Callback<void(ModelTypeSet, ModelTypeSet)>& ready_task,
       const base::Callback<void()>& retry_callback) override {
     last_ready_task_ = ready_task;
 
@@ -101,12 +100,12 @@ class FakeBackendDataTypeConfigurer : public BackendDataTypeConfigurer {
     }
   }
 
-  virtual void ActivateDataType(
-      syncer::ModelType type, syncer::ModelSafeGroup group,
-      ChangeProcessor* change_processor) override {
+  void ActivateDataType(syncer::ModelType type,
+                        syncer::ModelSafeGroup group,
+                        ChangeProcessor* change_processor) override {
     activated_types_.Put(type);
   }
-  virtual void DeactivateDataType(syncer::ModelType type) override {
+  void DeactivateDataType(syncer::ModelType type) override {
     activated_types_.Remove(type);
   }
 
@@ -130,7 +129,7 @@ class FakeBackendDataTypeConfigurer : public BackendDataTypeConfigurer {
 class FakeDataTypeManagerObserver : public DataTypeManagerObserver {
  public:
   FakeDataTypeManagerObserver() { ResetExpectations(); }
-  virtual ~FakeDataTypeManagerObserver() {
+  ~FakeDataTypeManagerObserver() override {
     EXPECT_FALSE(start_expected_);
     DataTypeManager::ConfigureResult default_result;
     EXPECT_EQ(done_expectation_.status, default_result.status);
@@ -149,7 +148,7 @@ class FakeDataTypeManagerObserver : public DataTypeManagerObserver {
     done_expectation_ = DataTypeManager::ConfigureResult();
   }
 
-  virtual void OnConfigureDone(
+  void OnConfigureDone(
       const DataTypeManager::ConfigureResult& result) override {
     EXPECT_EQ(done_expectation_.status, result.status);
     DataTypeStatusTable::TypeErrorMap errors =
@@ -168,7 +167,7 @@ class FakeDataTypeManagerObserver : public DataTypeManagerObserver {
     done_expectation_ = DataTypeManager::ConfigureResult();
   }
 
-  virtual void OnConfigureStart() override {
+  void OnConfigureStart() override {
     EXPECT_TRUE(start_expected_);
     start_expected_ = false;
   }
@@ -181,10 +180,10 @@ class FakeDataTypeManagerObserver : public DataTypeManagerObserver {
 class FakeDataTypeEncryptionHandler : public DataTypeEncryptionHandler {
  public:
   FakeDataTypeEncryptionHandler();
-  virtual ~FakeDataTypeEncryptionHandler();
+  ~FakeDataTypeEncryptionHandler() override;
 
-  virtual bool IsPassphraseRequired() const override;
-  virtual ModelTypeSet GetEncryptedDataTypes() const override;
+  bool IsPassphraseRequired() const override;
+  ModelTypeSet GetEncryptedDataTypes() const override;
 
   void set_passphrase_required(bool passphrase_required) {
     passphrase_required_ = passphrase_required;
@@ -237,14 +236,14 @@ class TestDataTypeManager : public DataTypeManagerImpl {
     return configure_result_;
   }
 
-  virtual void OnModelAssociationDone(
+  void OnModelAssociationDone(
       const DataTypeManager::ConfigureResult& result) override {
     configure_result_ = result;
     DataTypeManagerImpl::OnModelAssociationDone(result);
   }
 
  private:
-  virtual ModelTypeSet GetPriorityTypes() const override {
+  ModelTypeSet GetPriorityTypes() const override {
     return custom_priority_types_;
   }
 
diff --git a/components/sync_driver/device_info_data_type_controller.h b/components/sync_driver/device_info_data_type_controller.h
index da3d480..fa6b8f1 100644
--- a/components/sync_driver/device_info_data_type_controller.h
+++ b/components/sync_driver/device_info_data_type_controller.h
@@ -21,10 +21,10 @@ class DeviceInfoDataTypeController : public UIDataTypeController {
       LocalDeviceInfoProvider* local_device_info_provider);
 
  private:
-  virtual ~DeviceInfoDataTypeController();
+  ~DeviceInfoDataTypeController() override;
 
   // UIDataTypeController implementations.
-  virtual bool StartModels() override;
+  bool StartModels() override;
 
   // Called by LocalDeviceInfoProvider when the local device into becomes
   // available.
diff --git a/components/sync_driver/device_info_data_type_controller_unittest.cc b/components/sync_driver/device_info_data_type_controller_unittest.cc
index 7161929..137ed25 100644
--- a/components/sync_driver/device_info_data_type_controller_unittest.cc
+++ b/components/sync_driver/device_info_data_type_controller_unittest.cc
@@ -56,14 +56,14 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
+  base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
       syncer::ModelType type) override {
     // Shouldn't be called for this test.
     NOTREACHED();
     return base::WeakPtr<syncer::SyncableService>();
   }
 
-  virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
+  scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
       syncer::AttachmentService::Delegate* delegate) override {
diff --git a/components/sync_driver/device_info_sync_service.h b/components/sync_driver/device_info_sync_service.h
index eb636be..a214fc0 100644
--- a/components/sync_driver/device_info_sync_service.h
+++ b/components/sync_driver/device_info_sync_service.h
@@ -22,27 +22,26 @@ class DeviceInfoSyncService : public syncer::SyncableService,
  public:
   explicit DeviceInfoSyncService(
       LocalDeviceInfoProvider* local_device_info_provider);
-  virtual ~DeviceInfoSyncService();
+  ~DeviceInfoSyncService() override;
 
   // syncer::SyncableService implementation.
-  virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+  syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
-  virtual void StopSyncing(syncer::ModelType type) override;
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const override;
-  virtual syncer::SyncError ProcessSyncChanges(
+  void StopSyncing(syncer::ModelType type) override;
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
 
   // DeviceInfoTracker implementation.
-  virtual scoped_ptr<DeviceInfo> GetDeviceInfo(
+  scoped_ptr<DeviceInfo> GetDeviceInfo(
       const std::string& client_id) const override;
-  virtual ScopedVector<DeviceInfo> GetAllDeviceInfo() const override;
-  virtual void AddObserver(Observer* observer) override;
-  virtual void RemoveObserver(Observer* observer) override;
+  ScopedVector<DeviceInfo> GetAllDeviceInfo() const override;
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
 
   // Called to update local device backup time.
   void UpdateLocalDeviceBackupTime(base::Time backup_time);
diff --git a/components/sync_driver/device_info_sync_service_unittest.cc b/components/sync_driver/device_info_sync_service_unittest.cc
index 1dbe6a8..9722aa4 100644
--- a/components/sync_driver/device_info_sync_service_unittest.cc
+++ b/components/sync_driver/device_info_sync_service_unittest.cc
@@ -34,19 +34,18 @@ namespace {
 class TestChangeProcessor : public SyncChangeProcessor {
  public:
   TestChangeProcessor() {}
-  virtual ~TestChangeProcessor() {}
+  ~TestChangeProcessor() override {}
 
   // SyncChangeProcessor implementation.
   // Store a copy of all the changes passed in so we can examine them later.
-  virtual SyncError ProcessSyncChanges(
-      const tracked_objects::Location& from_here,
-      const SyncChangeList& change_list) override {
+  SyncError ProcessSyncChanges(const tracked_objects::Location& from_here,
+                               const SyncChangeList& change_list) override {
     change_list_ = change_list;
     return SyncError();
   }
 
   // This method isn't used in these tests.
-  virtual SyncDataList GetAllSyncData(ModelType type) const override {
+  SyncDataList GetAllSyncData(ModelType type) const override {
     return SyncDataList();
   }
 
@@ -98,9 +97,7 @@ class DeviceInfoSyncServiceTest : public testing::Test,
     sync_service_->RemoveObserver(this);
   }
 
-  virtual void OnDeviceInfoChange() override {
-    num_device_info_changed_callbacks_++;
-  }
+  void OnDeviceInfoChange() override { num_device_info_changed_callbacks_++; }
 
   scoped_ptr<SyncChangeProcessor> PassProcessor() {
     return scoped_ptr<SyncChangeProcessor>(
diff --git a/components/sync_driver/fake_data_type_controller.h b/components/sync_driver/fake_data_type_controller.h
index 1716efa..20b8204 100644
--- a/components/sync_driver/fake_data_type_controller.h
+++ b/components/sync_driver/fake_data_type_controller.h
@@ -23,19 +23,18 @@ class FakeDataTypeController : public DataTypeController {
  public:
   explicit FakeDataTypeController(syncer::ModelType type);
 
-  virtual void LoadModels(
-      const ModelLoadCallback& model_load_callback) override;
-  virtual void OnModelLoaded() override;
-  virtual void StartAssociating(const StartCallback& start_callback) override;
-  virtual void Stop() override;
-  virtual syncer::ModelType type() const override;
-  virtual std::string name() const override;
-  virtual syncer::ModelSafeGroup model_safe_group() const override;
-  virtual ChangeProcessor* GetChangeProcessor() const override;
-  virtual State state() const override;
-  virtual void OnSingleDataTypeUnrecoverableError(
+  void LoadModels(const ModelLoadCallback& model_load_callback) override;
+  void OnModelLoaded() override;
+  void StartAssociating(const StartCallback& start_callback) override;
+  void Stop() override;
+  syncer::ModelType type() const override;
+  std::string name() const override;
+  syncer::ModelSafeGroup model_safe_group() const override;
+  ChangeProcessor* GetChangeProcessor() const override;
+  State state() const override;
+  void OnSingleDataTypeUnrecoverableError(
       const syncer::SyncError& error) override;
-  virtual bool ReadyForStart() const override;
+  bool ReadyForStart() const override;
 
   void FinishStart(ConfigureResult result);
 
@@ -48,7 +47,7 @@ class FakeDataTypeController : public DataTypeController {
   void SetReadyForStart(bool ready);
 
  protected:
-  virtual ~FakeDataTypeController();
+  ~FakeDataTypeController() override;
 
  private:
   DataTypeController::State state_;
diff --git a/components/sync_driver/fake_generic_change_processor.h b/components/sync_driver/fake_generic_change_processor.h
index a16c9e4..0619edd 100644
--- a/components/sync_driver/fake_generic_change_processor.h
+++ b/components/sync_driver/fake_generic_change_processor.h
@@ -19,22 +19,22 @@ class FakeGenericChangeProcessor : public GenericChangeProcessor {
  public:
   FakeGenericChangeProcessor(syncer::ModelType type,
                              SyncApiComponentFactory* sync_factory);
-  virtual ~FakeGenericChangeProcessor();
+  ~FakeGenericChangeProcessor() override;
 
   // Setters for GenericChangeProcessor implementation results.
   void set_sync_model_has_user_created_nodes(bool has_nodes);
   void set_sync_model_has_user_created_nodes_success(bool success);
 
   // GenericChangeProcessor implementations.
-  virtual syncer::SyncError ProcessSyncChanges(
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
-  virtual syncer::SyncError GetAllSyncDataReturnError(
+  syncer::SyncError GetAllSyncDataReturnError(
       syncer::SyncDataList* data) const override;
-  virtual bool GetDataTypeContext(std::string* context) const override;
-  virtual int GetSyncCount() override;
-  virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) override;
-  virtual bool CryptoReadyIfNecessary() override;
+  bool GetDataTypeContext(std::string* context) const override;
+  int GetSyncCount() override;
+  bool SyncModelHasUserCreatedNodes(bool* has_nodes) override;
+  bool CryptoReadyIfNecessary() override;
 
  private:
   bool sync_model_has_user_created_nodes_;
@@ -46,8 +46,8 @@ class FakeGenericChangeProcessorFactory : public GenericChangeProcessorFactory {
  public:
   explicit FakeGenericChangeProcessorFactory(
       scoped_ptr<FakeGenericChangeProcessor> processor);
-  virtual ~FakeGenericChangeProcessorFactory();
-  virtual scoped_ptr<GenericChangeProcessor> CreateGenericChangeProcessor(
+  ~FakeGenericChangeProcessorFactory() override;
+  scoped_ptr<GenericChangeProcessor> CreateGenericChangeProcessor(
       syncer::ModelType type,
       syncer::UserShare* user_share,
       DataTypeErrorHandler* error_handler,
diff --git a/components/sync_driver/generic_change_processor.h b/components/sync_driver/generic_change_processor.h
index e3c1fc7..d729474 100644
--- a/components/sync_driver/generic_change_processor.h
+++ b/components/sync_driver/generic_change_processor.h
@@ -55,32 +55,30 @@ class GenericChangeProcessor : public ChangeProcessor,
       syncer::UserShare* user_share,
       SyncApiComponentFactory* sync_factory,
       const scoped_refptr<syncer::AttachmentStore>& attachment_store);
-  virtual ~GenericChangeProcessor();
+  ~GenericChangeProcessor() override;
 
   // ChangeProcessor interface.
   // Build and store a list of all changes into |syncer_changes_|.
-  virtual void ApplyChangesFromSyncModel(
+  void ApplyChangesFromSyncModel(
       const syncer::BaseTransaction* trans,
       int64 version,
       const syncer::ImmutableChangeRecordList& changes) override;
   // Passes |syncer_changes_|, built in ApplyChangesFromSyncModel, onto
   // |local_service_| by way of its ProcessSyncChanges method.
-  virtual void CommitChangesFromSyncModel() override;
+  void CommitChangesFromSyncModel() override;
 
   // syncer::SyncChangeProcessor implementation.
-  virtual syncer::SyncError ProcessSyncChanges(
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
-  virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type)
-      const override;
-  virtual syncer::SyncError UpdateDataTypeContext(
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+  syncer::SyncError UpdateDataTypeContext(
       syncer::ModelType type,
       syncer::SyncChangeProcessor::ContextRefreshStatus refresh_status,
       const std::string& context) override;
 
   // syncer::AttachmentService::Delegate implementation.
-  virtual void OnAttachmentUploaded(
-      const syncer::AttachmentId& attachment_id) override;
+  void OnAttachmentUploaded(const syncer::AttachmentId& attachment_id) override;
 
   // Similar to above, but returns a SyncError for use by direct clients
   // of GenericChangeProcessor that may need more error visibility.
@@ -102,8 +100,8 @@ class GenericChangeProcessor : public ChangeProcessor,
 
  protected:
   // ChangeProcessor interface.
-  virtual void StartImpl() override;  // Does nothing.
-  virtual syncer::UserShare* share_handle() const override;
+  void StartImpl() override;  // Does nothing.
+  syncer::UserShare* share_handle() const override;
 
  private:
   // Logically part of ProcessSyncChanges.
diff --git a/components/sync_driver/generic_change_processor_unittest.cc b/components/sync_driver/generic_change_processor_unittest.cc
index f3c2ac8..56c9534 100644
--- a/components/sync_driver/generic_change_processor_unittest.cc
+++ b/components/sync_driver/generic_change_processor_unittest.cc
@@ -39,8 +39,8 @@ class MockAttachmentService : public syncer::AttachmentServiceImpl {
  public:
   MockAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store);
-  virtual ~MockAttachmentService();
-  virtual void UploadAttachments(
+  ~MockAttachmentService() override;
+  void UploadAttachments(
       const syncer::AttachmentIdSet& attachment_ids) override;
   std::vector<syncer::AttachmentIdSet>* attachment_id_sets();
 
@@ -82,14 +82,14 @@ class MockSyncApiComponentFactory : public SyncApiComponentFactory {
       scoped_ptr<syncer::AttachmentService> attachment_service)
       : attachment_service_(attachment_service.Pass()) {}
 
-  virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
+  base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
       syncer::ModelType type) override {
     // Shouldn't be called for this test.
     NOTREACHED();
     return base::WeakPtr<syncer::SyncableService>();
   }
 
-  virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
+  scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
       syncer::AttachmentService::Delegate* delegate) override {
diff --git a/components/sync_driver/local_device_info_provider_mock.h b/components/sync_driver/local_device_info_provider_mock.h
index f8d0605..60c6a45 100644
--- a/components/sync_driver/local_device_info_provider_mock.h
+++ b/components/sync_driver/local_device_info_provider_mock.h
@@ -23,15 +23,14 @@ class LocalDeviceInfoProviderMock
       const std::string& sync_user_agent,
       const sync_pb::SyncEnums::DeviceType device_type,
       const std::string& signin_scoped_device_id);
-  virtual ~LocalDeviceInfoProviderMock();
-
-  virtual const DeviceInfo* GetLocalDeviceInfo() const override;
-  virtual std::string GetLocalSyncCacheGUID() const override;
-  virtual void Initialize(
-      const std::string& cache_guid,
-      const std::string& signin_scoped_device_id) override;
-  virtual scoped_ptr<Subscription> RegisterOnInitializedCallback(
-    const base::Closure& callback) override;
+  ~LocalDeviceInfoProviderMock() override;
+
+  const DeviceInfo* GetLocalDeviceInfo() const override;
+  std::string GetLocalSyncCacheGUID() const override;
+  void Initialize(const std::string& cache_guid,
+                  const std::string& signin_scoped_device_id) override;
+  scoped_ptr<Subscription> RegisterOnInitializedCallback(
+      const base::Closure& callback) override;
 
   void SetInitialized(bool is_initialized);
 
diff --git a/components/sync_driver/non_blocking_data_type_controller_unittest.cc b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
index 2608d08..d11476f 100644
--- a/components/sync_driver/non_blocking_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
@@ -27,10 +27,9 @@ namespace {
 class NullModelTypeSyncWorker : public syncer::ModelTypeSyncWorker {
  public:
   NullModelTypeSyncWorker();
-  virtual ~NullModelTypeSyncWorker();
+  ~NullModelTypeSyncWorker() override;
 
-  virtual void EnqueueForCommit(
-      const syncer::CommitRequestDataList& list) override;
+  void EnqueueForCommit(const syncer::CommitRequestDataList& list) override;
 };
 
 NullModelTypeSyncWorker::NullModelTypeSyncWorker() {
@@ -80,9 +79,9 @@ class MockSyncContextProxy : public syncer::SyncContextProxy {
       : mock_sync_context_(sync_context),
         model_task_runner_(model_task_runner),
         sync_task_runner_(sync_task_runner) {}
-  virtual ~MockSyncContextProxy() {}
+  ~MockSyncContextProxy() override {}
 
-  virtual void ConnectTypeToSync(
+  void ConnectTypeToSync(
       syncer::ModelType type,
       const syncer::DataTypeState& data_type_state,
       const syncer::UpdateResponseDataList& saved_pending_updates,
@@ -99,14 +98,14 @@ class MockSyncContextProxy : public syncer::SyncContextProxy {
                                            type_proxy));
   }
 
-  virtual void Disconnect(syncer::ModelType type) override {
+  void Disconnect(syncer::ModelType type) override {
     sync_task_runner_->PostTask(FROM_HERE,
                                 base::Bind(&MockSyncContext::Disconnect,
                                            base::Unretained(mock_sync_context_),
                                            type));
   }
 
-  virtual scoped_ptr<SyncContextProxy> Clone() const override {
+  scoped_ptr<SyncContextProxy> Clone() const override {
     return scoped_ptr<SyncContextProxy>(new MockSyncContextProxy(
         mock_sync_context_, model_task_runner_, sync_task_runner_));
   }
diff --git a/components/sync_driver/non_ui_data_type_controller.h b/components/sync_driver/non_ui_data_type_controller.h
index d003e6e..45cee42 100644
--- a/components/sync_driver/non_ui_data_type_controller.h
+++ b/components/sync_driver/non_ui_data_type_controller.h
@@ -30,26 +30,25 @@ class NonUIDataTypeController : public DataTypeController {
       SyncApiComponentFactory* sync_factory);
 
   // DataTypeController interface.
-  virtual void LoadModels(
-      const ModelLoadCallback& model_load_callback) override;
-  virtual void StartAssociating(const StartCallback& start_callback) override;
-  virtual void Stop() override;
+  void LoadModels(const ModelLoadCallback& model_load_callback) override;
+  void StartAssociating(const StartCallback& start_callback) override;
+  void Stop() override;
   virtual syncer::ModelType type() const = 0;
   virtual syncer::ModelSafeGroup model_safe_group() const = 0;
-  virtual ChangeProcessor* GetChangeProcessor() const override;
-  virtual std::string name() const override;
-  virtual State state() const override;
-  virtual void OnSingleDataTypeUnrecoverableError(
+  ChangeProcessor* GetChangeProcessor() const override;
+  std::string name() const override;
+  State state() const override;
+  void OnSingleDataTypeUnrecoverableError(
       const syncer::SyncError& error) override;
 
  protected:
   // For testing only.
   NonUIDataTypeController();
   // DataTypeController is RefCounted.
-  virtual ~NonUIDataTypeController();
+  ~NonUIDataTypeController() override;
 
   // DataTypeController interface.
-  virtual void OnModelLoaded() override;
+  void OnModelLoaded() override;
 
   // Start any dependent services that need to be running before we can
   // associate models. The default implementation is a no-op.
diff --git a/components/sync_driver/non_ui_data_type_controller_unittest.cc b/components/sync_driver/non_ui_data_type_controller_unittest.cc
index e8bef60..61f6304 100644
--- a/components/sync_driver/non_ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_ui_data_type_controller_unittest.cc
@@ -106,10 +106,8 @@ class NonUIDataTypeControllerFake
         change_processor_(change_processor),
         backend_loop_(backend_loop) {}
 
-  virtual syncer::ModelType type() const override {
-    return AUTOFILL_PROFILE;
-  }
-  virtual syncer::ModelSafeGroup model_safe_group() const override {
+  syncer::ModelType type() const override { return AUTOFILL_PROFILE; }
+  syncer::ModelSafeGroup model_safe_group() const override {
     return syncer::GROUP_DB;
   }
 
@@ -130,14 +128,13 @@ class NonUIDataTypeControllerFake
     pending_tasks_.clear();
   }
 
-  virtual SharedChangeProcessor* CreateSharedChangeProcessor() override {
+  SharedChangeProcessor* CreateSharedChangeProcessor() override {
     return change_processor_.get();
   }
 
  protected:
-  virtual bool PostTaskOnBackendThread(
-      const tracked_objects::Location& from_here,
-      const base::Closure& task) override {
+  bool PostTaskOnBackendThread(const tracked_objects::Location& from_here,
+                               const base::Closure& task) override {
     if (blocked_) {
       pending_tasks_.push_back(PendingTask(from_here, task));
       return true;
@@ -148,22 +145,17 @@ class NonUIDataTypeControllerFake
 
   // We mock the following methods because their default implementations do
   // nothing, but we still want to make sure they're called appropriately.
-  virtual bool StartModels() override {
-    return mock_->StartModels();
-  }
-  virtual void StopModels() override {
-    mock_->StopModels();
-  }
-  virtual void RecordAssociationTime(base::TimeDelta time) override {
+  bool StartModels() override { return mock_->StartModels(); }
+  void StopModels() override { mock_->StopModels(); }
+  void RecordAssociationTime(base::TimeDelta time) override {
     mock_->RecordAssociationTime(time);
   }
-  virtual void RecordStartFailure(DataTypeController::ConfigureResult result)
-      override {
+  void RecordStartFailure(DataTypeController::ConfigureResult result) override {
     mock_->RecordStartFailure(result);
   }
 
  private:
-  virtual ~NonUIDataTypeControllerFake() {}
+  ~NonUIDataTypeControllerFake() override {}
 
   DISALLOW_COPY_AND_ASSIGN(NonUIDataTypeControllerFake);
 
diff --git a/components/sync_driver/proxy_data_type_controller.h b/components/sync_driver/proxy_data_type_controller.h
index acfc002..ed70456 100644
--- a/components/sync_driver/proxy_data_type_controller.h
+++ b/components/sync_driver/proxy_data_type_controller.h
@@ -21,26 +21,25 @@ class ProxyDataTypeController : public DataTypeController {
        syncer::ModelType type);
 
   // DataTypeController interface.
-  virtual void LoadModels(
-      const ModelLoadCallback& model_load_callback) override;
-  virtual void StartAssociating(const StartCallback& start_callback) override;
-  virtual void Stop() override;
-  virtual syncer::ModelType type() const override;
-  virtual syncer::ModelSafeGroup model_safe_group() const override;
-  virtual ChangeProcessor* GetChangeProcessor() const override;
-  virtual std::string name() const override;
-  virtual State state() const override;
+  void LoadModels(const ModelLoadCallback& model_load_callback) override;
+  void StartAssociating(const StartCallback& start_callback) override;
+  void Stop() override;
+  syncer::ModelType type() const override;
+  syncer::ModelSafeGroup model_safe_group() const override;
+  ChangeProcessor* GetChangeProcessor() const override;
+  std::string name() const override;
+  State state() const override;
 
   // DataTypeErrorHandler interface.
-  virtual void OnSingleDataTypeUnrecoverableError(
+  void OnSingleDataTypeUnrecoverableError(
       const syncer::SyncError& error) override;
 
  protected:
   // DataTypeController is RefCounted.
-  virtual ~ProxyDataTypeController();
+  ~ProxyDataTypeController() override;
 
   // DataTypeController interface.
-  virtual void OnModelLoaded() override;
+  void OnModelLoaded() override;
 
  private:
   State state_;
diff --git a/components/sync_driver/shared_change_processor_ref.h b/components/sync_driver/shared_change_processor_ref.h
index ba1eae1..2924a05 100644
--- a/components/sync_driver/shared_change_processor_ref.h
+++ b/components/sync_driver/shared_change_processor_ref.h
@@ -21,21 +21,20 @@ class SharedChangeProcessorRef : public syncer::SyncChangeProcessor,
   SharedChangeProcessorRef(
       const scoped_refptr<SharedChangeProcessor>&
           change_processor);
-  virtual ~SharedChangeProcessorRef();
+  ~SharedChangeProcessorRef() override;
 
   // syncer::SyncChangeProcessor implementation.
-  virtual syncer::SyncError ProcessSyncChanges(
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) override;
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const override;
-  virtual syncer::SyncError UpdateDataTypeContext(
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+  syncer::SyncError UpdateDataTypeContext(
       syncer::ModelType type,
       syncer::SyncChangeProcessor::ContextRefreshStatus refresh_status,
       const std::string& context) override;
 
   // syncer::SyncErrorFactory implementation.
-  virtual syncer::SyncError CreateAndUploadError(
+  syncer::SyncError CreateAndUploadError(
       const tracked_objects::Location& from_here,
       const std::string& message) override;
 
diff --git a/components/sync_driver/system_encryptor.h b/components/sync_driver/system_encryptor.h
index bdb7fea..7b08a54 100644
--- a/components/sync_driver/system_encryptor.h
+++ b/components/sync_driver/system_encryptor.h
@@ -13,13 +13,13 @@ namespace sync_driver {
 // Encryptor that uses the Chrome password manager's encryptor.
 class SystemEncryptor : public syncer::Encryptor {
  public:
-  virtual ~SystemEncryptor();
+  ~SystemEncryptor() override;
 
-  virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) override;
+  bool EncryptString(const std::string& plaintext,
+                     std::string* ciphertext) override;
 
-  virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) override;
+  bool DecryptString(const std::string& ciphertext,
+                     std::string* plaintext) override;
 };
 
 }  // namespace sync_driver
diff --git a/components/sync_driver/ui_data_type_controller.h b/components/sync_driver/ui_data_type_controller.h
index dc45de9..dcade37 100644
--- a/components/sync_driver/ui_data_type_controller.h
+++ b/components/sync_driver/ui_data_type_controller.h
@@ -38,18 +38,17 @@ class UIDataTypeController : public DataTypeController {
       SyncApiComponentFactory* sync_factory);
 
   // DataTypeController interface.
-  virtual void LoadModels(
-      const ModelLoadCallback& model_load_callback) override;
-  virtual void StartAssociating(const StartCallback& start_callback) override;
-  virtual void Stop() override;
-  virtual syncer::ModelType type() const override;
-  virtual syncer::ModelSafeGroup model_safe_group() const override;
-  virtual ChangeProcessor* GetChangeProcessor() const override;
-  virtual std::string name() const override;
-  virtual State state() const override;
+  void LoadModels(const ModelLoadCallback& model_load_callback) override;
+  void StartAssociating(const StartCallback& start_callback) override;
+  void Stop() override;
+  syncer::ModelType type() const override;
+  syncer::ModelSafeGroup model_safe_group() const override;
+  ChangeProcessor* GetChangeProcessor() const override;
+  std::string name() const override;
+  State state() const override;
 
   // DataTypeErrorHandler interface.
-  virtual void OnSingleDataTypeUnrecoverableError(
+  void OnSingleDataTypeUnrecoverableError(
       const syncer::SyncError& error) override;
 
   // Used by tests to override the factory used to create
@@ -61,7 +60,7 @@ class UIDataTypeController : public DataTypeController {
   // For testing only.
   UIDataTypeController();
   // DataTypeController is RefCounted.
-  virtual ~UIDataTypeController();
+  ~UIDataTypeController() override;
 
   // Start any dependent services that need to be running before we can
   // associate models. The default implementation is a no-op.
@@ -76,7 +75,7 @@ class UIDataTypeController : public DataTypeController {
   virtual void StopModels();
 
   // DataTypeController interface.
-  virtual void OnModelLoaded() override;
+  void OnModelLoaded() override;
 
   // Helper method for cleaning up state and invoking the start callback.
   virtual void StartDone(ConfigureResult result,
diff --git a/components/sync_driver/ui_data_type_controller_unittest.cc b/components/sync_driver/ui_data_type_controller_unittest.cc
index 66db4af..23878a2 100644
--- a/components/sync_driver/ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/ui_data_type_controller_unittest.cc
@@ -50,12 +50,12 @@ class SyncUIDataTypeControllerTest : public testing::Test,
     PumpLoop();
   }
 
-  virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
+  base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
       syncer::ModelType type) override {
     return syncable_service_.AsWeakPtr();
   }
 
-  virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
+  scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
       syncer::AttachmentService::Delegate* delegate) override {
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index 26a15af..05888fa 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -37,7 +37,7 @@ class ComponentsTestSuite : public base::TestSuite {
   ComponentsTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
 
  private:
-  virtual void Initialize() override {
+  void Initialize() override {
     base::TestSuite::Initialize();
 
     // Initialize the histograms subsystem, so that any histograms hit in tests
@@ -100,7 +100,7 @@ class ComponentsTestSuite : public base::TestSuite {
         "chrome-extension");
   }
 
-  virtual void Shutdown() override {
+  void Shutdown() override {
     ui::ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
diff --git a/components/tracing/child_trace_message_filter.h b/components/tracing/child_trace_message_filter.h
index 2f79d0e..daa00ee 100644
--- a/components/tracing/child_trace_message_filter.h
+++ b/components/tracing/child_trace_message_filter.h
@@ -21,12 +21,12 @@ class ChildTraceMessageFilter : public IPC::MessageFilter {
   explicit ChildTraceMessageFilter(base::MessageLoopProxy* ipc_message_loop);
 
   // IPC::MessageFilter implementation.
-  virtual void OnFilterAdded(IPC::Sender* sender) override;
-  virtual void OnFilterRemoved() override;
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  void OnFilterAdded(IPC::Sender* sender) override;
+  void OnFilterRemoved() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
-  virtual ~ChildTraceMessageFilter();
+  ~ChildTraceMessageFilter() override;
 
  private:
   // Message handlers.
diff --git a/components/translate/content/browser/browser_cld_data_provider.h b/components/translate/content/browser/browser_cld_data_provider.h
index 4e8776a..f46807e 100644
--- a/components/translate/content/browser/browser_cld_data_provider.h
+++ b/components/translate/content/browser/browser_cld_data_provider.h
@@ -31,7 +31,7 @@ namespace translate {
 // constant from ipc_message_start.h
 class BrowserCldDataProvider : public IPC::Listener {
  public:
-  virtual ~BrowserCldDataProvider() {}
+  ~BrowserCldDataProvider() override {}
 
   // IPC::Listener implementation:
   // If the specified message is a request for CLD data, invokes
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index 196ebaf..4acb00d 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h
@@ -51,7 +51,7 @@ class ContentTranslateDriver : public TranslateDriver,
   };
 
   ContentTranslateDriver(content::NavigationController* nav_controller);
-  virtual ~ContentTranslateDriver();
+  ~ContentTranslateDriver() override;
 
   // Adds or Removes observers.
   void AddObserver(Observer* observer);
@@ -71,30 +71,29 @@ class ContentTranslateDriver : public TranslateDriver,
   void InitiateTranslation(const std::string& page_lang, int attempt);
 
   // TranslateDriver methods.
-  virtual void OnIsPageTranslatedChanged() override;
-  virtual void OnTranslateEnabledChanged() override;
-  virtual bool IsLinkNavigation() override;
-  virtual void TranslatePage(int page_seq_no,
-                             const std::string& translate_script,
-                             const std::string& source_lang,
-                             const std::string& target_lang) override;
-  virtual void RevertTranslation(int page_seq_no) override;
-  virtual bool IsOffTheRecord() override;
-  virtual const std::string& GetContentsMimeType() override;
-  virtual const GURL& GetLastCommittedURL() override;
-  virtual const GURL& GetActiveURL() override;
-  virtual const GURL& GetVisibleURL() override;
-  virtual bool HasCurrentPage() override;
-  virtual void OpenUrlInNewTab(const GURL& url) override;
+  void OnIsPageTranslatedChanged() override;
+  void OnTranslateEnabledChanged() override;
+  bool IsLinkNavigation() override;
+  void TranslatePage(int page_seq_no,
+                     const std::string& translate_script,
+                     const std::string& source_lang,
+                     const std::string& target_lang) override;
+  void RevertTranslation(int page_seq_no) override;
+  bool IsOffTheRecord() override;
+  const std::string& GetContentsMimeType() override;
+  const GURL& GetLastCommittedURL() override;
+  const GURL& GetActiveURL() override;
+  const GURL& GetVisibleURL() override;
+  bool HasCurrentPage() override;
+  void OpenUrlInNewTab(const GURL& url) override;
 
   // content::WebContentsObserver implementation.
-  virtual void NavigationEntryCommitted(
+  void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override;
-  virtual void DidNavigateAnyFrame(
-      content::RenderFrameHost* render_frame_host,
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override;
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  void DidNavigateAnyFrame(content::RenderFrameHost* render_frame_host,
+                           const content::LoadCommittedDetails& details,
+                           const content::FrameNavigateParams& params) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC handlers.
   void OnTranslateAssignedSequenceNumber(int page_seq_no);
diff --git a/components/translate/content/browser/static_browser_cld_data_provider.h b/components/translate/content/browser/static_browser_cld_data_provider.h
index eb883308..04a4232 100644
--- a/components/translate/content/browser/static_browser_cld_data_provider.h
+++ b/components/translate/content/browser/static_browser_cld_data_provider.h
@@ -13,11 +13,11 @@ namespace translate {
 class StaticBrowserCldDataProvider : public BrowserCldDataProvider {
  public:
   explicit StaticBrowserCldDataProvider();
-  virtual ~StaticBrowserCldDataProvider();
+  ~StaticBrowserCldDataProvider() override;
   // BrowserCldDataProvider implementations:
-  virtual bool OnMessageReceived(const IPC::Message&) override;
-  virtual void OnCldDataRequest() override;
-  virtual void SendCldDataResponse() override;
+  bool OnMessageReceived(const IPC::Message&) override;
+  void OnCldDataRequest() override;
+  void SendCldDataResponse() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StaticBrowserCldDataProvider);
diff --git a/components/translate/content/renderer/renderer_cld_data_provider.h b/components/translate/content/renderer/renderer_cld_data_provider.h
index 4da053a..fb0a333 100644
--- a/components/translate/content/renderer/renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/renderer_cld_data_provider.h
@@ -29,7 +29,7 @@ namespace translate {
 // constant from ipc_message_start.h
 class RendererCldDataProvider : public IPC::Listener {
  public:
-  virtual ~RendererCldDataProvider() {}
+  ~RendererCldDataProvider() override {}
 
   // (Inherited from IPC::Listener)
   // If the specified message is a response for CLD data, attempts to
diff --git a/components/translate/content/renderer/static_renderer_cld_data_provider.h b/components/translate/content/renderer/static_renderer_cld_data_provider.h
index 77b8c5a..a2f82f9 100644
--- a/components/translate/content/renderer/static_renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/static_renderer_cld_data_provider.h
@@ -18,12 +18,12 @@ namespace translate {
 class StaticRendererCldDataProvider : public RendererCldDataProvider {
  public:
   explicit StaticRendererCldDataProvider();
-  virtual ~StaticRendererCldDataProvider();
+  ~StaticRendererCldDataProvider() override;
   // RendererCldDataProvider implementations:
-  virtual bool OnMessageReceived(const IPC::Message&) override;
-  virtual void SendCldDataRequest() override;
-  virtual void SetCldAvailableCallback(base::Callback<void(void)>) override;
-  virtual bool IsCldDataAvailable() override;
+  bool OnMessageReceived(const IPC::Message&) override;
+  void SendCldDataRequest() override;
+  void SetCldAvailableCallback(base::Callback<void(void)>) override;
+  bool IsCldDataAvailable() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StaticRendererCldDataProvider);
diff --git a/components/translate/content/renderer/translate_helper.h b/components/translate/content/renderer/translate_helper.h
index 6e12c69..4d9275d 100644
--- a/components/translate/content/renderer/translate_helper.h
+++ b/components/translate/content/renderer/translate_helper.h
@@ -83,7 +83,7 @@ class TranslateHelper : public content::RenderViewObserver {
                            int world_id,
                            int extension_group,
                            const std::string& extension_scheme);
-  virtual ~TranslateHelper();
+  ~TranslateHelper() override;
 
   // Informs us that the page's text has been extracted.
   void PageCaptured(const base::string16& contents);
@@ -180,7 +180,7 @@ class TranslateHelper : public content::RenderViewObserver {
   static bool IsTranslationAllowed(blink::WebDocument* document);
 
   // RenderViewObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // Informs us that the page's text has been extracted.
   void PageCapturedImpl(int page_seq_no, const base::string16& contents);
diff --git a/components/translate/core/browser/language_state_unittest.cc b/components/translate/core/browser/language_state_unittest.cc
index 3137369..12bab06 100644
--- a/components/translate/core/browser/language_state_unittest.cc
+++ b/components/translate/core/browser/language_state_unittest.cc
@@ -31,42 +31,36 @@ class MockTranslateDriver : public TranslateDriver {
 
   virtual ~MockTranslateDriver() {}
 
-  virtual void OnIsPageTranslatedChanged() override {
+  void OnIsPageTranslatedChanged() override {
     on_is_page_translated_changed_called_ = true;
   }
 
-  virtual void OnTranslateEnabledChanged() override {
+  void OnTranslateEnabledChanged() override {
     on_translate_enabled_changed_called_ = true;
   }
 
-  virtual bool IsLinkNavigation() override {
-    return false;
-  }
+  bool IsLinkNavigation() override { return false; }
 
-  virtual void TranslatePage(int page_seq_no,
-                             const std::string& translate_script,
-                             const std::string& source_lang,
-                             const std::string& target_lang) override {}
+  void TranslatePage(int page_seq_no,
+                     const std::string& translate_script,
+                     const std::string& source_lang,
+                     const std::string& target_lang) override {}
 
-  virtual void RevertTranslation(int page_seq_no) override {}
+  void RevertTranslation(int page_seq_no) override {}
 
-  virtual bool IsOffTheRecord() override { return false; }
+  bool IsOffTheRecord() override { return false; }
 
-  virtual const std::string& GetContentsMimeType() override {
-    return kHtmlMimeType;
-  }
+  const std::string& GetContentsMimeType() override { return kHtmlMimeType; }
 
-  virtual const GURL& GetLastCommittedURL() override {
-    return GURL::EmptyGURL();
-  }
+  const GURL& GetLastCommittedURL() override { return GURL::EmptyGURL(); }
 
-  virtual const GURL& GetActiveURL() override { return GURL::EmptyGURL(); }
+  const GURL& GetActiveURL() override { return GURL::EmptyGURL(); }
 
-  virtual const GURL& GetVisibleURL() override { return GURL::EmptyGURL(); }
+  const GURL& GetVisibleURL() override { return GURL::EmptyGURL(); }
 
-  virtual bool HasCurrentPage() override { return true; }
+  bool HasCurrentPage() override { return true; }
 
-  virtual void OpenUrlInNewTab(const GURL& url) override {}
+  void OpenUrlInNewTab(const GURL& url) override {}
 
   bool on_is_page_translated_changed_called() const {
     return on_is_page_translated_changed_called_;
diff --git a/components/translate/core/browser/options_menu_model.h b/components/translate/core/browser/options_menu_model.h
index e502c11f..5beae3b 100644
--- a/components/translate/core/browser/options_menu_model.h
+++ b/components/translate/core/browser/options_menu_model.h
@@ -26,15 +26,14 @@ class OptionsMenuModel : public ui::SimpleMenuModel,
   };
 
   explicit OptionsMenuModel(TranslateInfoBarDelegate* translate_delegate);
-  virtual ~OptionsMenuModel();
+  ~OptionsMenuModel() override;
 
   // ui::SimpleMenuModel::Delegate implementation:
-  virtual bool IsCommandIdChecked(int command_id) const override;
-  virtual bool IsCommandIdEnabled(int command_id) const override;
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      ui::Accelerator* accelerator) override;
-  virtual void ExecuteCommand(int command_id, int event_flags) override;
+  bool IsCommandIdChecked(int command_id) const override;
+  bool IsCommandIdEnabled(int command_id) const override;
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override;
+  void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   TranslateInfoBarDelegate* translate_infobar_delegate_;
diff --git a/components/translate/core/browser/translate_infobar_delegate.h b/components/translate/core/browser/translate_infobar_delegate.h
index 28365cb..f0ca769 100644
--- a/components/translate/core/browser/translate_infobar_delegate.h
+++ b/components/translate/core/browser/translate_infobar_delegate.h
@@ -40,7 +40,7 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
 
   static const size_t kNoIndex;
 
-  virtual ~TranslateInfoBarDelegate();
+  ~TranslateInfoBarDelegate() override;
 
   // Factory method to create a translate infobar.  |error_type| must be
   // specified iff |step| == TRANSLATION_ERROR.  For other translate steps,
@@ -192,11 +192,11 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
   typedef std::pair<std::string, base::string16> LanguageNamePair;
 
   // InfoBarDelegate:
-  virtual void InfoBarDismissed() override;
-  virtual int GetIconID() const override;
-  virtual infobars::InfoBarDelegate::Type GetInfoBarType() const override;
-  virtual bool ShouldExpire(const NavigationDetails& details) const override;
-  virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() override;
+  void InfoBarDismissed() override;
+  int GetIconID() const override;
+  infobars::InfoBarDelegate::Type GetInfoBarType() const override;
+  bool ShouldExpire(const NavigationDetails& details) const override;
+  TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() override;
 
   bool is_off_the_record_;
   translate::TranslateStep step_;
diff --git a/components/translate/core/browser/translate_url_fetcher.h b/components/translate/core/browser/translate_url_fetcher.h
index 1f76bc8..90ed6bc 100644
--- a/components/translate/core/browser/translate_url_fetcher.h
+++ b/components/translate/core/browser/translate_url_fetcher.h
@@ -28,7 +28,7 @@ class TranslateURLFetcher : public net::URLFetcherDelegate {
   };
 
   explicit TranslateURLFetcher(int id);
-  virtual ~TranslateURLFetcher();
+  ~TranslateURLFetcher() override;
 
   int max_retry_on_5xx() {
     return max_retry_on_5xx_;
@@ -54,7 +54,7 @@ class TranslateURLFetcher : public net::URLFetcherDelegate {
   State state() { return state_; }
 
   // net::URLFetcherDelegate implementation:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // URL to send the request.
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index 8759efb..1a31553 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -85,11 +85,11 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   base::string16 display_name() const { return display_name_; }
 
   // UserInfo
-  virtual std::string GetEmail() const override;
-  virtual base::string16 GetDisplayName() const override;
-  virtual base::string16 GetGivenName() const override;
-  virtual const gfx::ImageSkia& GetImage() const override;
-  virtual std::string GetUserID() const override;
+  std::string GetEmail() const override;
+  base::string16 GetDisplayName() const override;
+  base::string16 GetGivenName() const override;
+  const gfx::ImageSkia& GetImage() const override;
+  std::string GetUserID() const override;
 
   // Is user supervised.
   virtual bool IsSupervised() const;
@@ -174,7 +174,7 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   static User* CreatePublicAccountUser(const std::string& email);
 
   explicit User(const std::string& email);
-  virtual ~User();
+  ~User() override;
 
   const std::string* GetAccountLocale() const { return account_locale_.get(); }
 
diff --git a/components/user_prefs/user_prefs.h b/components/user_prefs/user_prefs.h
index 90bf900..3e72d7a 100644
--- a/components/user_prefs/user_prefs.h
+++ b/components/user_prefs/user_prefs.h
@@ -35,7 +35,7 @@ class USER_PREFS_EXPORT UserPrefs : public base::SupportsUserData::Data {
 
  private:
   explicit UserPrefs(PrefService* prefs);
-  virtual ~UserPrefs();
+  ~UserPrefs() override;
 
   // Non-owning; owned by embedder.
   PrefService* prefs_;
diff --git a/components/variations/caching_permuted_entropy_provider.h b/components/variations/caching_permuted_entropy_provider.h
index e73ed69..0ec859f 100644
--- a/components/variations/caching_permuted_entropy_provider.h
+++ b/components/variations/caching_permuted_entropy_provider.h
@@ -27,7 +27,7 @@ class CachingPermutedEntropyProvider : public PermutedEntropyProvider {
   CachingPermutedEntropyProvider(PrefService* local_state,
                                  uint16 low_entropy_source,
                                  size_t low_entropy_source_max);
-  virtual ~CachingPermutedEntropyProvider();
+  ~CachingPermutedEntropyProvider() override;
 
   // Registers pref keys used by this class in the Local State pref registry.
   static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -38,7 +38,7 @@ class CachingPermutedEntropyProvider : public PermutedEntropyProvider {
 
  private:
   // PermutedEntropyProvider overrides:
-  virtual uint16 GetPermutedValue(uint32 randomization_seed) const override;
+  uint16 GetPermutedValue(uint32 randomization_seed) const override;
 
   // Reads the cache from local state.
   void ReadFromLocalState() const;
diff --git a/components/variations/entropy_provider.h b/components/variations/entropy_provider.h
index ff6ba87..0fff0b0 100644
--- a/components/variations/entropy_provider.h
+++ b/components/variations/entropy_provider.h
@@ -48,11 +48,11 @@ class SHA1EntropyProvider : public base::FieldTrial::EntropyProvider {
   // should contain a large amount of entropy - for example, a textual
   // representation of a persistent randomly-generated 128-bit value.
   explicit SHA1EntropyProvider(const std::string& entropy_source);
-  virtual ~SHA1EntropyProvider();
+  ~SHA1EntropyProvider() override;
 
   // base::FieldTrial::EntropyProvider implementation:
-  virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const override;
+  double GetEntropyForTrial(const std::string& trial_name,
+                            uint32 randomization_seed) const override;
 
  private:
   std::string entropy_source_;
@@ -71,11 +71,11 @@ class PermutedEntropyProvider : public base::FieldTrial::EntropyProvider {
   // which should have a value in the range of [0, low_entropy_source_max).
   PermutedEntropyProvider(uint16 low_entropy_source,
                           size_t low_entropy_source_max);
-  virtual ~PermutedEntropyProvider();
+  ~PermutedEntropyProvider() override;
 
   // base::FieldTrial::EntropyProvider implementation:
-  virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const override;
+  double GetEntropyForTrial(const std::string& trial_name,
+                            uint32 randomization_seed) const override;
 
  protected:
   // Performs the permutation algorithm and returns the permuted value that
diff --git a/components/variations/entropy_provider_unittest.cc b/components/variations/entropy_provider_unittest.cc
index fd94705..652ab44 100644
--- a/components/variations/entropy_provider_unittest.cc
+++ b/components/variations/entropy_provider_unittest.cc
@@ -80,10 +80,9 @@ class SHA1EntropyGenerator : public TrialEntropyGenerator {
       : trial_name_(trial_name) {
   }
 
-  virtual ~SHA1EntropyGenerator() {
-  }
+  ~SHA1EntropyGenerator() override {}
 
-  virtual double GenerateEntropyValue() const override {
+  double GenerateEntropyValue() const override {
     // Use a random GUID + 13 additional bits of entropy to match how the
     // SHA1EntropyProvider is used in metrics_service.cc.
     const int low_entropy_source =
@@ -113,10 +112,9 @@ class PermutedEntropyGenerator : public TrialEntropyGenerator {
                                                    &mapping_);
   }
 
-  virtual ~PermutedEntropyGenerator() {
-  }
+  ~PermutedEntropyGenerator() override {}
 
-  virtual double GenerateEntropyValue() const override {
+  double GenerateEntropyValue() const override {
     const int low_entropy_source =
         static_cast<uint16>(base::RandInt(0, kMaxLowEntropySize - 1));
     return mapping_[low_entropy_source] /
diff --git a/components/variations/variations_http_header_provider.h b/components/variations/variations_http_header_provider.h
index 30cdc3a..4bb7976 100644
--- a/components/variations/variations_http_header_provider.h
+++ b/components/variations/variations_http_header_provider.h
@@ -64,14 +64,13 @@ class VariationsHttpHeaderProvider : base::FieldTrialList::Observer {
                            OnFieldTrialGroupFinalized);
 
   VariationsHttpHeaderProvider();
-  virtual ~VariationsHttpHeaderProvider();
+  ~VariationsHttpHeaderProvider() override;
 
   // base::FieldTrialList::Observer implementation.
   // This will add the variation ID associated with |trial_name| and
   // |group_name| to the variation ID cache.
-  virtual void OnFieldTrialGroupFinalized(
-      const std::string& trial_name,
-      const std::string& group_name) override;
+  void OnFieldTrialGroupFinalized(const std::string& trial_name,
+                                  const std::string& group_name) override;
 
   // Prepares the variation IDs cache with initial values if not already done.
   // This method also registers the caller with the FieldTrialList to receive
diff --git a/components/variations/variations_seed_simulator_unittest.cc b/components/variations/variations_seed_simulator_unittest.cc
index 9ae37dd..bf93fa5 100644
--- a/components/variations/variations_seed_simulator_unittest.cc
+++ b/components/variations/variations_seed_simulator_unittest.cc
@@ -22,11 +22,11 @@ class TestEntropyProvider : public base::FieldTrial::EntropyProvider {
  public:
   explicit TestEntropyProvider(double entropy_value)
       : entropy_value_(entropy_value) {}
-  virtual ~TestEntropyProvider() {}
+  ~TestEntropyProvider() override {}
 
   // base::FieldTrial::EntropyProvider implementation:
-  virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const override {
+  double GetEntropyForTrial(const std::string& trial_name,
+                            uint32 randomization_seed) const override {
     return entropy_value_;
   }
 
diff --git a/components/visitedlink/browser/visitedlink_event_listener.h b/components/visitedlink/browser/visitedlink_event_listener.h
index 436f76d..2b6aa72 100644
--- a/components/visitedlink/browser/visitedlink_event_listener.h
+++ b/components/visitedlink/browser/visitedlink_event_listener.h
@@ -33,19 +33,19 @@ class VisitedLinkEventListener : public VisitedLinkMaster::Listener,
  public:
   VisitedLinkEventListener(VisitedLinkMaster* master,
                            content::BrowserContext* browser_context);
-  virtual ~VisitedLinkEventListener();
+  ~VisitedLinkEventListener() override;
 
-  virtual void NewTable(base::SharedMemory* table_memory) override;
-  virtual void Add(VisitedLinkMaster::Fingerprint fingerprint) override;
-  virtual void Reset() override;
+  void NewTable(base::SharedMemory* table_memory) override;
+  void Add(VisitedLinkMaster::Fingerprint fingerprint) override;
+  void Reset() override;
 
  private:
   void CommitVisitedLinks();
 
   // 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;
 
   base::OneShotTimer<VisitedLinkEventListener> coalesce_timer_;
   VisitedLinkCommon::Fingerprints pending_visited_links_;
diff --git a/components/visitedlink/browser/visitedlink_master.cc b/components/visitedlink/browser/visitedlink_master.cc
index b02b076..dc59cae 100644
--- a/components/visitedlink/browser/visitedlink_master.cc
+++ b/components/visitedlink/browser/visitedlink_master.cc
@@ -149,11 +149,11 @@ class VisitedLinkMaster::TableBuilder
   void DisownMaster();
 
   // VisitedLinkDelegate::URLEnumerator
-  virtual void OnURL(const GURL& url) override;
-  virtual void OnComplete(bool succeed) override;
+  void OnURL(const GURL& url) override;
+  void OnComplete(bool succeed) override;
 
  private:
-  virtual ~TableBuilder() {}
+  ~TableBuilder() override {}
 
   // OnComplete mashals to this function on the main thread to do the
   // notification.
diff --git a/components/visitedlink/browser/visitedlink_master.h b/components/visitedlink/browser/visitedlink_master.h
index aff4e49..d154c80 100644
--- a/components/visitedlink/browser/visitedlink_master.h
+++ b/components/visitedlink/browser/visitedlink_master.h
@@ -85,7 +85,7 @@ class VisitedLinkMaster : public VisitedLinkCommon {
                     bool suppress_rebuild,
                     const base::FilePath& filename,
                     int32 default_table_size);
-  virtual ~VisitedLinkMaster();
+  ~VisitedLinkMaster() override;
 
   // Must be called immediately after object creation. Nothing else will work
   // until this is called. Returns true on success, false means that this
diff --git a/components/visitedlink/renderer/visitedlink_slave.h b/components/visitedlink/renderer/visitedlink_slave.h
index 5131e65..730f789 100644
--- a/components/visitedlink/renderer/visitedlink_slave.h
+++ b/components/visitedlink/renderer/visitedlink_slave.h
@@ -18,10 +18,10 @@ class VisitedLinkSlave : public VisitedLinkCommon,
                          public content::RenderProcessObserver {
  public:
   VisitedLinkSlave();
-  virtual ~VisitedLinkSlave();
+  ~VisitedLinkSlave() override;
 
   // RenderProcessObserver implementation.
-  virtual bool OnControlMessageReceived(const IPC::Message& message) override;
+  bool OnControlMessageReceived(const IPC::Message& message) override;
 
   // Message handlers.
   void OnUpdateVisitedLinks(base::SharedMemoryHandle table);
diff --git a/components/visitedlink/test/visitedlink_perftest.cc b/components/visitedlink/test/visitedlink_perftest.cc
index d4dd583..f3d3dca 100644
--- a/components/visitedlink/test/visitedlink_perftest.cc
+++ b/components/visitedlink/test/visitedlink_perftest.cc
@@ -39,9 +39,9 @@ GURL TestURL(const char* prefix, int i) {
 class DummyVisitedLinkEventListener : public VisitedLinkMaster::Listener {
  public:
   DummyVisitedLinkEventListener() {}
-  virtual void NewTable(base::SharedMemory* table) override {}
-  virtual void Add(VisitedLinkCommon::Fingerprint) override {}
-  virtual void Reset() override {}
+  void NewTable(base::SharedMemory* table) override {}
+  void Add(VisitedLinkCommon::Fingerprint) override {}
+  void Reset() override {}
 };
 
 
diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc
index 8822df6..d41759a 100644
--- a/components/visitedlink/test/visitedlink_unittest.cc
+++ b/components/visitedlink/test/visitedlink_unittest.cc
@@ -54,8 +54,7 @@ std::vector<VisitedLinkSlave*> g_slaves;
 
 class TestVisitedLinkDelegate : public VisitedLinkDelegate {
  public:
-  virtual void RebuildTable(
-      const scoped_refptr<URLEnumerator>& enumerator) override;
+  void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
 
   void AddURLForRebuild(const GURL& url);
 
@@ -80,8 +79,8 @@ class TestURLIterator : public VisitedLinkMaster::URLIterator {
  public:
   explicit TestURLIterator(const URLs& urls);
 
-  virtual const GURL& NextURL() override;
-  virtual bool HasNextURL() const override;
+  const GURL& NextURL() override;
+  bool HasNextURL() const override;
 
  private:
   URLs::const_iterator iterator_;
@@ -109,7 +108,7 @@ class TrackingVisitedLinkEventListener : public VisitedLinkMaster::Listener {
       : reset_count_(0),
         add_count_(0) {}
 
-  virtual void NewTable(base::SharedMemory* table) override {
+  void NewTable(base::SharedMemory* table) override {
     if (table) {
       for (std::vector<VisitedLinkSlave>::size_type i = 0;
            i < g_slaves.size(); i++) {
@@ -119,8 +118,8 @@ class TrackingVisitedLinkEventListener : public VisitedLinkMaster::Listener {
       }
     }
   }
-  virtual void Add(VisitedLinkCommon::Fingerprint) override { add_count_++; }
-  virtual void Reset() override { reset_count_++; }
+  void Add(VisitedLinkCommon::Fingerprint) override { add_count_++; }
+  void Reset() override { reset_count_++; }
 
   void SetUp() {
     reset_count_ = 0;
@@ -536,18 +535,18 @@ class VisitRelayingRenderProcessHost : public MockRenderProcessHost {
         content::Source<RenderProcessHost>(this),
         content::NotificationService::NoDetails());
   }
-  virtual ~VisitRelayingRenderProcessHost() {
+  ~VisitRelayingRenderProcessHost() override {
     content::NotificationService::current()->Notify(
         content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
         content::Source<content::RenderProcessHost>(this),
         content::NotificationService::NoDetails());
   }
 
-  virtual void WidgetRestored() override { widgets_++; }
-  virtual void WidgetHidden() override { widgets_--; }
-  virtual int VisibleWidgetCount() const override { return widgets_; }
+  void WidgetRestored() override { widgets_++; }
+  void WidgetHidden() override { widgets_--; }
+  int VisibleWidgetCount() const override { return widgets_; }
 
-  virtual bool Send(IPC::Message* msg) override {
+  bool Send(IPC::Message* msg) override {
     VisitCountingContext* counting_context =
         static_cast<VisitCountingContext*>(
             GetBrowserContext());
@@ -578,7 +577,7 @@ class VisitedLinkRenderProcessHostFactory
  public:
   VisitedLinkRenderProcessHostFactory()
       : content::RenderProcessHostFactory() {}
-  virtual content::RenderProcessHost* CreateRenderProcessHost(
+  content::RenderProcessHost* CreateRenderProcessHost(
       content::BrowserContext* browser_context,
       content::SiteInstance* site_instance) const override {
     return new VisitRelayingRenderProcessHost(browser_context);
@@ -595,7 +594,7 @@ class VisitedLinkEventsTest : public content::RenderViewHostTestHarness {
     content::RenderViewHostTestHarness::SetUp();
   }
 
-  virtual content::BrowserContext* CreateBrowserContext() override {
+  content::BrowserContext* CreateBrowserContext() override {
     VisitCountingContext* context = new VisitCountingContext();
     master_.reset(new VisitedLinkMaster(context, &delegate_, true));
     master_->Init();
diff --git a/components/web_cache/browser/web_cache_manager.h b/components/web_cache/browser/web_cache_manager.h
index ce446a7..d3ad0a1 100644
--- a/components/web_cache/browser/web_cache_manager.h
+++ b/components/web_cache/browser/web_cache_manager.h
@@ -91,9 +91,9 @@ class WebCacheManager : public content::NotificationObserver {
   void ClearCacheOnNavigation();
 
   // 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;
 
   // Gets the default global size limit.  This interrogates system metrics to
   // tune the default size to the current system.
@@ -123,7 +123,7 @@ class WebCacheManager : public content::NotificationObserver {
   WebCacheManager();
   friend struct DefaultSingletonTraits<WebCacheManager>;
 
-  virtual ~WebCacheManager();
+  ~WebCacheManager() override;
 
   // Recomputes the allocation of cache resources among the renderers.  Also
   // informs the renderers of their new allocation.
diff --git a/components/web_cache/renderer/web_cache_render_process_observer.h b/components/web_cache/renderer/web_cache_render_process_observer.h
index 622185c..06ffc53 100644
--- a/components/web_cache/renderer/web_cache_render_process_observer.h
+++ b/components/web_cache/renderer/web_cache_render_process_observer.h
@@ -15,7 +15,7 @@ namespace web_cache {
 class WebCacheRenderProcessObserver : public content::RenderProcessObserver {
  public:
   WebCacheRenderProcessObserver();
-  virtual ~WebCacheRenderProcessObserver();
+  ~WebCacheRenderProcessObserver() override;
 
   // Needs to be called by RenderViews in case of navigations to execute
   // any 'clear cache' commands that were delayed until the next navigation.
@@ -23,9 +23,9 @@ class WebCacheRenderProcessObserver : public content::RenderProcessObserver {
 
  private:
   // RenderProcessObserver implementation.
-  virtual bool OnControlMessageReceived(const IPC::Message& message) override;
-  virtual void WebKitInitialized() override;
-  virtual void OnRenderProcessShutdown() override;
+  bool OnControlMessageReceived(const IPC::Message& message) override;
+  void WebKitInitialized() override;
+  void OnRenderProcessShutdown() override;
 
   // Message handlers.
   void OnSetCacheCapacities(size_t min_dead_capacity,
diff --git a/components/web_modal/popup_manager.cc b/components/web_modal/popup_manager.cc
index 215d4b8..4d07365 100644
--- a/components/web_modal/popup_manager.cc
+++ b/components/web_modal/popup_manager.cc
@@ -26,7 +26,7 @@ class PopupManagerRelay : public content::WebContentsUserData<PopupManager> {
   explicit PopupManagerRelay(base::WeakPtr<PopupManager> manager)
       : manager_(manager) {}
 
-  virtual ~PopupManagerRelay() {}
+  ~PopupManagerRelay() override {}
 
   base::WeakPtr<PopupManager> manager_;
 };
diff --git a/components/web_modal/popup_manager.h b/components/web_modal/popup_manager.h
index 0ce4a58..9d0c9fb 100644
--- a/components/web_modal/popup_manager.h
+++ b/components/web_modal/popup_manager.h
@@ -27,7 +27,7 @@ class PopupManager : public SinglePopupManagerDelegate {
   // |host| may be null.
   PopupManager(WebContentsModalDialogHost* host);
 
-  virtual ~PopupManager();
+  ~PopupManager() override;
 
   // Returns the native view which will be the parent of managed popups.
   virtual gfx::NativeView GetHostView() const;
@@ -48,7 +48,7 @@ class PopupManager : public SinglePopupManagerDelegate {
       const content::WebContents* web_contents) const;
 
   // Called when a NativePopup we own is about to be closed.
-  virtual void WillClose(NativePopup popup) override;
+  void WillClose(NativePopup popup) override;
 
   // Called by views code to re-activate popups anchored to a particular tab
   // when that tab gets focus. Note that depending on the situation, more than
diff --git a/components/web_modal/test_web_contents_modal_dialog_host.h b/components/web_modal/test_web_contents_modal_dialog_host.h
index e51db7a..1ba4d13 100644
--- a/components/web_modal/test_web_contents_modal_dialog_host.h
+++ b/components/web_modal/test_web_contents_modal_dialog_host.h
@@ -17,14 +17,14 @@ namespace web_modal {
 class TestWebContentsModalDialogHost : public WebContentsModalDialogHost {
  public:
   explicit TestWebContentsModalDialogHost(gfx::NativeView host_view);
-  virtual ~TestWebContentsModalDialogHost();
+  ~TestWebContentsModalDialogHost() override;
 
   // WebContentsModalDialogHost:
-  virtual gfx::Size GetMaximumDialogSize() override;
-  virtual gfx::NativeView GetHostView() const override;
-  virtual gfx::Point GetDialogPosition(const gfx::Size& size) override;
-  virtual void AddObserver(ModalDialogHostObserver* observer) override;
-  virtual void RemoveObserver(ModalDialogHostObserver* observer) override;
+  gfx::Size GetMaximumDialogSize() override;
+  gfx::NativeView GetHostView() const override;
+  gfx::Point GetDialogPosition(const gfx::Size& size) override;
+  void AddObserver(ModalDialogHostObserver* observer) override;
+  void RemoveObserver(ModalDialogHostObserver* observer) override;
 
   void set_max_dialog_size(const gfx::Size& max_dialog_size) {
     max_dialog_size_ = max_dialog_size;
diff --git a/components/web_modal/test_web_contents_modal_dialog_manager_delegate.h b/components/web_modal/test_web_contents_modal_dialog_manager_delegate.h
index 96a48e8..2abb386 100644
--- a/components/web_modal/test_web_contents_modal_dialog_manager_delegate.h
+++ b/components/web_modal/test_web_contents_modal_dialog_manager_delegate.h
@@ -18,13 +18,12 @@ class TestWebContentsModalDialogManagerDelegate
   TestWebContentsModalDialogManagerDelegate();
 
   // WebContentsModalDialogManagerDelegate overrides:
-  virtual void SetWebContentsBlocked(content::WebContents* web_contents,
-                                     bool blocked) override;
+  void SetWebContentsBlocked(content::WebContents* web_contents,
+                             bool blocked) override;
 
-  virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() override;
+  WebContentsModalDialogHost* GetWebContentsModalDialogHost() override;
 
-  virtual bool IsWebContentsVisible(
-      content::WebContents* web_contents) override;
+  bool IsWebContentsVisible(content::WebContents* web_contents) override;
 
   void set_web_contents_visible(bool visible) {
     web_contents_visible_ = visible;
diff --git a/components/web_modal/web_contents_modal_dialog_host.h b/components/web_modal/web_contents_modal_dialog_host.h
index 53dca44..3ae7c1f 100644
--- a/components/web_modal/web_contents_modal_dialog_host.h
+++ b/components/web_modal/web_contents_modal_dialog_host.h
@@ -19,7 +19,7 @@ namespace web_modal {
 // this into account.
 class WebContentsModalDialogHost : public ModalDialogHost {
  public:
-  virtual ~WebContentsModalDialogHost();
+  ~WebContentsModalDialogHost() override;
 
   // Returns the maximum dimensions a dialog can have.
   virtual gfx::Size GetMaximumDialogSize() = 0;
diff --git a/components/web_modal/web_contents_modal_dialog_manager.h b/components/web_modal/web_contents_modal_dialog_manager.h
index 4817753..eb0dd12 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.h
+++ b/components/web_modal/web_contents_modal_dialog_manager.h
@@ -23,7 +23,7 @@ class WebContentsModalDialogManager
       public content::WebContentsObserver,
       public content::WebContentsUserData<WebContentsModalDialogManager> {
  public:
-  virtual ~WebContentsModalDialogManager();
+  ~WebContentsModalDialogManager() override;
 
   WebContentsModalDialogManagerDelegate* delegate() const { return delegate_; }
   void SetDelegate(WebContentsModalDialogManagerDelegate* d);
@@ -50,8 +50,8 @@ class WebContentsModalDialogManager
   void FocusTopmostDialog() const;
 
   // SingleWebContentsDialogManagerDelegate:
-  virtual content::WebContents* GetWebContents() const override;
-  virtual void WillClose(NativeWebContentsModalDialog dialog) override;
+  content::WebContents* GetWebContents() const override;
+  void WillClose(NativeWebContentsModalDialog dialog) override;
 
   // For testing.
   class TestApi {
@@ -99,14 +99,14 @@ class WebContentsModalDialogManager
   void CloseAllDialogs();
 
   // Overridden from content::WebContentsObserver:
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
-  virtual void DidGetIgnoredUIEvent() override;
-  virtual void WasShown() override;
-  virtual void WasHidden() override;
-  virtual void WebContentsDestroyed() override;
-  virtual void DidAttachInterstitialPage() override;
+  void DidGetIgnoredUIEvent() override;
+  void WasShown() override;
+  void WasHidden() override;
+  void WebContentsDestroyed() override;
+  void DidAttachInterstitialPage() override;
 
   // Delegate for notifying our owner about stuff. Not owned by us.
   WebContentsModalDialogManagerDelegate* delegate_;
diff --git a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
index e0a1e80..a22b1dd 100644
--- a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
@@ -53,28 +53,23 @@ class TestNativeWebContentsModalDialogManager
       tracker_->SetState(NativeManagerTracker::NOT_SHOWN);
   }
 
-  virtual void Show() override {
+  void Show() override {
     if (tracker_)
       tracker_->SetState(NativeManagerTracker::SHOWN);
   }
-  virtual void Hide() override {
+  void Hide() override {
     if (tracker_)
       tracker_->SetState(NativeManagerTracker::HIDDEN);
   }
-  virtual void Close() override {
+  void Close() override {
     if (tracker_)
       tracker_->SetState(NativeManagerTracker::CLOSED);
     delegate_->WillClose(dialog_);
   }
-  virtual void Focus() override {
-  }
-  virtual void Pulse() override {
-  }
-  virtual void HostChanged(WebContentsModalDialogHost* new_host) override {
-  }
-  virtual NativeWebContentsModalDialog dialog() override {
-      return dialog_;
-  }
+  void Focus() override {}
+  void Pulse() override {}
+  void HostChanged(WebContentsModalDialogHost* new_host) override {}
+  NativeWebContentsModalDialog dialog() override { return dialog_; }
 
   void StopTracking() {
     tracker_ = NULL;
diff --git a/components/webdata/common/web_data_service_test_util.h b/components/webdata/common/web_data_service_test_util.h
index 8ac2eaa..7368356 100644
--- a/components/webdata/common/web_data_service_test_util.h
+++ b/components/webdata/common/web_data_service_test_util.h
@@ -15,9 +15,9 @@
 class MockWebDataServiceWrapperBase : public WebDataServiceWrapper {
  public:
   MockWebDataServiceWrapperBase();
-  virtual ~MockWebDataServiceWrapperBase();
+  ~MockWebDataServiceWrapperBase() override;
 
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockWebDataServiceWrapperBase);
@@ -31,12 +31,11 @@ class MockWebDataServiceWrapper : public MockWebDataServiceWrapperBase {
       scoped_refptr<autofill::AutofillWebDataService> fake_autofill,
       scoped_refptr<TokenWebData> fake_token);
 
-  virtual ~MockWebDataServiceWrapper();
+  ~MockWebDataServiceWrapper() override;
 
-  virtual scoped_refptr<autofill::AutofillWebDataService>
-      GetAutofillWebData() override;
+  scoped_refptr<autofill::AutofillWebDataService> GetAutofillWebData() override;
 
-  virtual scoped_refptr<TokenWebData> GetTokenWebData() override;
+  scoped_refptr<TokenWebData> GetTokenWebData() override;
 
  protected:
   scoped_refptr<autofill::AutofillWebDataService> fake_autofill_web_data_;
diff --git a/components/webdata/common/web_database_service.cc b/components/webdata/common/web_database_service.cc
index 4010c51..f6a7908 100644
--- a/components/webdata/common/web_database_service.cc
+++ b/components/webdata/common/web_database_service.cc
@@ -25,7 +25,7 @@ class WebDatabaseService::BackendDelegate :
         callback_thread_(base::MessageLoopProxy::current()) {
   }
 
-  virtual void DBLoaded(sql::InitStatus status) override {
+  void DBLoaded(sql::InitStatus status) override {
     callback_thread_->PostTask(
         FROM_HERE,
         base::Bind(&WebDatabaseService::OnDatabaseLoadDone,
diff --git a/components/wifi/fake_wifi_service.h b/components/wifi/fake_wifi_service.h
index 7827471..a25f191 100644
--- a/components/wifi/fake_wifi_service.h
+++ b/components/wifi/fake_wifi_service.h
@@ -17,43 +17,43 @@ namespace wifi {
 class FakeWiFiService : public WiFiService {
  public:
   FakeWiFiService();
-  virtual ~FakeWiFiService();
+  ~FakeWiFiService() override;
 
-  virtual void Initialize(
+  void Initialize(
       scoped_refptr<base::SequencedTaskRunner> task_runner) override;
-  virtual void UnInitialize() override;
-  virtual 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;
-  virtual 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;
-  virtual 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;
-  virtual void RequestNetworkScan() override;
-  virtual void StartConnect(const std::string& network_guid,
+  void UnInitialize() override;
+  void GetProperties(const std::string& network_guid,
+                     base::DictionaryValue* properties,
+                     std::string* error) override;
+  void GetManagedProperties(const std::string& network_guid,
+                            base::DictionaryValue* managed_properties,
                             std::string* error) override;
-  virtual 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;
-  virtual void SetEventObservers(
+  void GetState(const std::string& network_guid,
+                base::DictionaryValue* properties,
+                std::string* error) override;
+  void SetProperties(const std::string& network_guid,
+                     scoped_ptr<base::DictionaryValue> properties,
+                     std::string* error) override;
+  void CreateNetwork(bool shared,
+                     scoped_ptr<base::DictionaryValue> properties,
+                     std::string* network_guid,
+                     std::string* error) override;
+  void GetVisibleNetworks(const std::string& network_type,
+                          base::ListValue* network_list,
+                          bool include_details) override;
+  void RequestNetworkScan() override;
+  void StartConnect(const std::string& network_guid,
+                    std::string* error) override;
+  void StartDisconnect(const std::string& network_guid,
+                       std::string* error) override;
+  void GetKeyFromSystem(const std::string& network_guid,
+                        std::string* key_data,
+                        std::string* error) override;
+  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;
 
  private:
   NetworkList::iterator FindNetwork(const std::string& network_guid);
diff --git a/components/wifi/wifi_service_mac.mm b/components/wifi/wifi_service_mac.mm
index f8c407e..890b229 100644
--- a/components/wifi/wifi_service_mac.mm
+++ b/components/wifi/wifi_service_mac.mm
@@ -24,57 +24,57 @@ namespace wifi {
 class WiFiServiceMac : public WiFiService {
  public:
   WiFiServiceMac();
-  virtual ~WiFiServiceMac();
+  ~WiFiServiceMac() 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;
 
  private:
   // Checks |ns_error| and if is not |nil|, then stores |error_name|