replace OVERRIDE and FINAL with override and final in components/

BUG=417463

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

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

496 files changed, 2271 insertions, 2271 deletions

diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h
index 4aaf289..a5dca6c 100644
--- a/components/autofill/content/browser/content_autofill_driver.h
+++ b/components/autofill/content/browser/content_autofill_driver.h
@@ -43,24 +43,24 @@ 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 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;
+                                      const FormData& data) override;
+  virtual void PingRenderer() override;
   virtual void SendAutofillTypePredictionsToRenderer(
-      const std::vector<FormStructure*>& forms) OVERRIDE;
+      const std::vector<FormStructure*>& forms) override;
   virtual void RendererShouldAcceptDataListSuggestion(
-      const base::string16& value) OVERRIDE;
-  virtual void RendererShouldClearFilledForm() OVERRIDE;
-  virtual void RendererShouldClearPreviewedForm() OVERRIDE;
+      const base::string16& value) override;
+  virtual void RendererShouldClearFilledForm() override;
+  virtual void RendererShouldClearPreviewedForm() override;
   virtual void RendererShouldFillFieldWithValue(
-      const base::string16& value) OVERRIDE;
+      const base::string16& value) override;
   virtual void RendererShouldPreviewFieldWithValue(
-      const base::string16& value) OVERRIDE;
+      const base::string16& value) override;
 
   AutofillExternalDelegate* autofill_external_delegate() {
     return &autofill_external_delegate_;
@@ -79,11 +79,11 @@ class ContentAutofillDriver : public AutofillDriver,
   // content::WebContentsObserver:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
   virtual void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& load_details) OVERRIDE;
-  virtual void WasHidden() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      const content::LoadCommittedDetails& load_details) override;
+  virtual void WasHidden() override;
+  virtual 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 d2849ff..1509385 100644
--- a/components/autofill/content/browser/content_autofill_driver_unittest.cc
+++ b/components/autofill/content/browser/content_autofill_driver_unittest.cc
@@ -65,7 +65,7 @@ class TestContentAutofillDriver : public ContentAutofillDriver {
 
 class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
 
     test_autofill_client_.reset(new TestAutofillClient());
@@ -73,7 +73,7 @@ class ContentAutofillDriverTest : public content::RenderViewHostTestHarness {
                                                 test_autofill_client_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Reset the driver now to cause all pref observers to be removed and avoid
     // crashes that otherwise occur in the destructor.
     driver_.reset();
diff --git a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
index d9a9fb3..f4a6c8e 100644
--- a/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
+++ b/components/autofill/content/browser/request_autocomplete_manager_unittest.cc
@@ -25,7 +25,7 @@ class TestAutofillManager : public AutofillManager {
         autofill_enabled_(true) {}
   virtual ~TestAutofillManager() {}
 
-  virtual bool IsAutofillEnabled() const OVERRIDE { return autofill_enabled_; }
+  virtual bool IsAutofillEnabled() const override { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -46,7 +46,7 @@ class CustomTestAutofillClient : public TestAutofillClient {
   virtual void ShowRequestAutocompleteDialog(
       const FormData& form,
       const GURL& source_url,
-      const ResultCallback& callback) OVERRIDE {
+      const ResultCallback& callback) override {
     if (should_simulate_success_) {
       FormStructure form_structure(form);
       callback.Run(
@@ -96,7 +96,7 @@ class RequestAutocompleteManagerTest :
  public:
   RequestAutocompleteManagerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
 
     driver_.reset(
@@ -105,7 +105,7 @@ class RequestAutocompleteManagerTest :
         new RequestAutocompleteManager(driver_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Reset the driver now to cause all pref observers to be removed and avoid
     // crashes that otherwise occur in the destructor.
     driver_.reset();
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
index 217cdf9..55aa06b 100644
--- a/components/autofill/content/browser/risk/fingerprint.cc
+++ b/components/autofill/content/browser/risk/fingerprint.cc
@@ -202,7 +202,7 @@ class FingerprintDataLoader : public content::GpuDataManagerObserver {
   virtual ~FingerprintDataLoader() {}
 
   // content::GpuDataManagerObserver:
-  virtual void OnGpuInfoUpdate() OVERRIDE;
+  virtual void OnGpuInfoUpdate() override;
 
   // Callbacks for asynchronously loaded data.
   void OnGotFonts(scoped_ptr<base::ListValue> fonts);
diff --git a/components/autofill/content/browser/wallet/mock_wallet_client.h b/components/autofill/content/browser/wallet/mock_wallet_client.h
index 877a6f1..a3a3153 100644
--- a/components/autofill/content/browser/wallet/mock_wallet_client.h
+++ b/components/autofill/content/browser/wallet/mock_wallet_client.h
@@ -46,7 +46,7 @@ class MockWalletClient : public WalletClient {
       scoped_ptr<Instrument> instrument,
       scoped_ptr<Address> address,
       const WalletItems::MaskedInstrument* reference_instrument,
-      const Address* reference_address) OVERRIDE;
+      const Address* reference_address) override;
 
   MOCK_METHOD4(SaveToWalletMock,
       void(Instrument* instrument,
diff --git a/components/autofill/content/browser/wallet/wallet_client.h b/components/autofill/content/browser/wallet/wallet_client.h
index 6276833..1115f6d 100644
--- a/components/autofill/content/browser/wallet/wallet_client.h
+++ b/components/autofill/content/browser/wallet/wallet_client.h
@@ -223,7 +223,7 @@ class WalletClient : public net::URLFetcherDelegate {
   void HandleWalletError(ErrorType error_type);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
index b3f3aa0..a1e6eb1 100644
--- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc
@@ -657,19 +657,19 @@ class MockWalletClientDelegate : public WalletClientDelegate {
         is_shipping_required_(true) {}
   ~MockWalletClientDelegate() {}
 
-  virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
+  virtual const AutofillMetrics& GetMetricLogger() const override {
     return metric_logger_;
   }
 
-  virtual std::string GetRiskData() const OVERRIDE {
+  virtual std::string GetRiskData() const override {
     return "risky business";
   }
 
-  virtual std::string GetWalletCookieValue() const OVERRIDE {
+  virtual std::string GetWalletCookieValue() const override {
     return "gdToken";
   }
 
-  virtual bool IsShippingAddressRequired() const OVERRIDE {
+  virtual bool IsShippingAddressRequired() const override {
     return is_shipping_required_;
   }
 
@@ -723,12 +723,12 @@ class MockWalletClientDelegate : public WalletClientDelegate {
                     const std::vector<FormFieldError>& form_field_errors));
   MOCK_METHOD1(OnWalletError, void(WalletClient::ErrorType error_type));
 
-  virtual void OnDidGetFullWallet(scoped_ptr<FullWallet> full_wallet) OVERRIDE {
+  virtual void OnDidGetFullWallet(scoped_ptr<FullWallet> full_wallet) override {
     EXPECT_TRUE(full_wallet);
     ++full_wallets_received_;
   }
   virtual void OnDidGetWalletItems(scoped_ptr<WalletItems> wallet_items)
-      OVERRIDE {
+      override {
     EXPECT_TRUE(wallet_items);
     ++wallet_items_received_;
   }
@@ -752,12 +752,12 @@ class WalletClientTest : public testing::Test {
             base::MessageLoopProxy::current())) {}
   virtual ~WalletClientTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     wallet_client_.reset(new WalletClient(
         request_context_.get(), &delegate_, GURL(kMerchantUrl)));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     wallet_client_.reset();
   }
 
diff --git a/components/autofill/content/browser/wallet/wallet_signin_helper.h b/components/autofill/content/browser/wallet/wallet_signin_helper.h
index dbfe106..14b646e 100644
--- a/components/autofill/content/browser/wallet/wallet_signin_helper.h
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper.h
@@ -58,7 +58,7 @@ class WalletSigninHelper : public net::URLFetcherDelegate {
   void OnOtherError();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* fetcher) OVERRIDE;
+  virtual 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/browser/wallet/wallet_signin_helper_unittest.cc b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
index 9c9f73a..2187da6 100644
--- a/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc
@@ -54,12 +54,12 @@ class WalletSigninHelperTest : public testing::Test {
             base::MessageLoopProxy::current())) {}
   virtual ~WalletSigninHelperTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     signin_helper_.reset(
         new WalletSigninHelper(&mock_delegate_, request_context_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     signin_helper_.reset();
   }
 
diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
index c5427df..385f0f7 100644
--- a/components/autofill/content/renderer/autofill_agent.h
+++ b/components/autofill/content/renderer/autofill_agent.h
@@ -57,23 +57,23 @@ class AutofillAgent : public content::RenderViewObserver,
 
  private:
   // content::RenderViewObserver:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) OVERRIDE;
+  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;
+                                        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;
+                              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;
 
   // PageClickListener:
   virtual void FormControlElementClicked(
       const blink::WebFormControlElement& element,
-      bool was_focused) OVERRIDE;
+      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 ee949de..894c05c 100644
--- a/components/autofill/content/renderer/page_click_tracker.h
+++ b/components/autofill/content/renderer/page_click_tracker.h
@@ -34,10 +34,10 @@ class PageClickTracker : public content::RenderViewObserver {
 
  private:
   // RenderView::Observer implementation.
-  virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) OVERRIDE;
+  virtual void DidHandleMouseEvent(const blink::WebMouseEvent& event) override;
   virtual void DidHandleGestureEvent(
-      const blink::WebGestureEvent& event) OVERRIDE;
-  virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE;
+      const blink::WebGestureEvent& event) override;
+  virtual 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 616c7f8..fb557f6 100644
--- a/components/autofill/content/renderer/password_autofill_agent.h
+++ b/components/autofill/content/renderer/password_autofill_agent.h
@@ -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 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;
+                                   const blink::WebFormElement& form) override;
   virtual void WillSubmitForm(blink::WebLocalFrame* frame,
-                              const blink::WebFormElement& form) OVERRIDE;
+                              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 2d75af0..a2c1c12 100644
--- a/components/autofill/content/renderer/password_generation_agent.h
+++ b/components/autofill/content/renderer/password_generation_agent.h
@@ -48,15 +48,15 @@ class PasswordGenerationAgent : public content::RenderViewObserver {
   virtual bool ShouldAnalyzeDocument(const blink::WebDocument& document) const;
 
   // RenderViewObserver:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual 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;
+  virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
+  virtual 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 5ea21a4..2cc9e70 100644
--- a/components/autofill/content/renderer/renderer_save_password_progress_logger.h
+++ b/components/autofill/content/renderer/renderer_save_password_progress_logger.h
@@ -29,7 +29,7 @@ class RendererSavePasswordProgressLogger : public SavePasswordProgressLogger {
 
  protected:
   // SavePasswordProgressLogger:
-  virtual void SendLog(const std::string& log) OVERRIDE;
+  virtual 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 01f5a4b..1c39f63 100644
--- a/components/autofill/content/renderer/test_password_autofill_agent.h
+++ b/components/autofill/content/renderer/test_password_autofill_agent.h
@@ -19,7 +19,7 @@ class TestPasswordAutofillAgent : public PasswordAutofillAgent {
   // work with the password manager.
   // PasswordAutofillAgent:
   virtual bool OriginCanAccessPasswordManager(
-      const blink::WebSecurityOrigin& origin) OVERRIDE;
+      const blink::WebSecurityOrigin& origin) override;
 };
 
 }  // namespace autofill
diff --git a/components/autofill/content/renderer/test_password_generation_agent.h b/components/autofill/content/renderer/test_password_generation_agent.h
index e711ab0..ffdaefd 100644
--- a/components/autofill/content/renderer/test_password_generation_agent.h
+++ b/components/autofill/content/renderer/test_password_generation_agent.h
@@ -19,8 +19,8 @@ class TestPasswordGenerationAgent : public PasswordGenerationAgent {
   virtual ~TestPasswordGenerationAgent();
 
   // content::RenderViewObserver implementation:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual bool Send(IPC::Message* message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual 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(); }
@@ -31,7 +31,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;
+      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 2508847..f1d726c 100644
--- a/components/autofill/core/browser/address.h
+++ b/components/autofill/core/browser/address.h
@@ -24,23 +24,23 @@ class Address : public FormGroup {
   Address& operator=(const Address& address);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE;
+                          const base::string16& value) override;
   virtual base::string16 GetInfo(const AutofillType& type,
-                           const std::string& app_locale) const OVERRIDE;
+                           const std::string& app_locale) const override;
   virtual bool SetInfo(const AutofillType& type,
                        const base::string16& value,
-                       const std::string& app_locale) OVERRIDE;
+                       const std::string& app_locale) override;
   virtual void GetMatchingTypes(
       const base::string16& text,
       const std::string& app_locale,
-      ServerFieldTypeSet* matching_types) const OVERRIDE;
+      ServerFieldTypeSet* matching_types) const override;
 
  private:
   // FormGroup:
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE;
+      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 c094922..1543aaa 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;
+  virtual 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 9d06ffc..5c04088 100644
--- a/components/autofill/core/browser/autocomplete_history_manager.h
+++ b/components/autofill/core/browser/autocomplete_history_manager.h
@@ -31,7 +31,7 @@ class AutocompleteHistoryManager : public WebDataServiceConsumer {
   // WebDataServiceConsumer implementation.
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle h,
-      const WDTypedResult* result) OVERRIDE;
+      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 5245a8e..64da46b1 100644
--- a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
@@ -50,8 +50,8 @@ class MockAutofillClient : public TestAutofillClient {
         prefs_(test::PrefServiceForTesting()) {}
   virtual ~MockAutofillClient() {}
   virtual scoped_refptr<AutofillWebDataService>
-      GetDatabase() OVERRIDE { return web_data_service_; }
-  virtual PrefService* GetPrefs() OVERRIDE { return prefs_.get(); }
+      GetDatabase() override { return web_data_service_; }
+  virtual PrefService* GetPrefs() override { return prefs_.get(); }
 
  private:
   scoped_refptr<MockWebDataService> web_data_service_;
@@ -66,7 +66,7 @@ class AutocompleteHistoryManagerTest : public testing::Test {
  protected:
   AutocompleteHistoryManagerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     web_data_service_ = new MockWebDataService();
     autofill_client_.reset(new MockAutofillClient(web_data_service_));
     autofill_driver_.reset(new TestAutofillDriver());
@@ -74,7 +74,7 @@ class AutocompleteHistoryManagerTest : public testing::Test {
         autofill_driver_.get(), autofill_client_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     autocomplete_manager_.reset();
   }
 
diff --git a/components/autofill/core/browser/autofill_data_model_unittest.cc b/components/autofill/core/browser/autofill_data_model_unittest.cc
index 8540ecf..dc861a7 100644
--- a/components/autofill/core/browser/autofill_data_model_unittest.cc
+++ b/components/autofill/core/browser/autofill_data_model_unittest.cc
@@ -19,13 +19,13 @@ class TestAutofillDataModel : public AutofillDataModel {
   virtual ~TestAutofillDataModel() {}
 
  private:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE {
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override {
     return base::string16();
   }
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE {}
+                          const base::string16& value) override {}
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE {}
+      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 fab53d32..2963e41 100644
--- a/components/autofill/core/browser/autofill_download_manager.h
+++ b/components/autofill/core/browser/autofill_download_manager.h
@@ -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;
+  virtual 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 63d4e75..be1fd62 100644
--- a/components/autofill/core/browser/autofill_download_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_download_manager_unittest.cc
@@ -79,14 +79,14 @@ class AutofillDownloadTest : public AutofillDownloadManager::Observer,
 
   // AutofillDownloadManager::Observer implementation.
   virtual void OnLoadedServerPredictions(
-      const std::string& response_xml) OVERRIDE {
+      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 {
+  virtual void OnUploadedPossibleFieldTypes() override {
     ResponseData response;
     response.type_of_response = UPLOAD_SUCCESSFULL;
     responses_.push_back(response);
@@ -95,7 +95,7 @@ class AutofillDownloadTest : public AutofillDownloadManager::Observer,
   virtual void OnServerRequestError(
       const std::string& form_signature,
       AutofillDownloadManager::RequestType request_type,
-      int http_error) OVERRIDE {
+      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 36a511a..3a3f1bc 100644
--- a/components/autofill/core/browser/autofill_external_delegate.h
+++ b/components/autofill/core/browser/autofill_external_delegate.h
@@ -35,15 +35,15 @@ class AutofillExternalDelegate
   virtual ~AutofillExternalDelegate();
 
   // AutofillPopupDelegate implementation.
-  virtual void OnPopupShown() OVERRIDE;
-  virtual void OnPopupHidden() OVERRIDE;
+  virtual void OnPopupShown() override;
+  virtual void OnPopupHidden() override;
   virtual void DidSelectSuggestion(const base::string16& value,
-                                   int identifier) OVERRIDE;
+                                   int identifier) override;
   virtual void DidAcceptSuggestion(const base::string16& value,
-                                   int identifier) OVERRIDE;
+                                   int identifier) override;
   virtual void RemoveSuggestion(const base::string16& value,
-                                int identifier) OVERRIDE;
-  virtual void ClearPreviewedForm() OVERRIDE;
+                                int identifier) override;
+  virtual 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_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
index e58847a..82e32b9 100644
--- a/components/autofill/core/browser/autofill_external_delegate_unittest.cc
+++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
@@ -95,7 +95,7 @@ class MockAutofillManager : public AutofillManager {
 
 class AutofillExternalDelegateUnitTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     autofill_driver_.reset(new MockAutofillDriver());
     autofill_manager_.reset(
         new MockAutofillManager(autofill_driver_.get(), &autofill_client_));
@@ -104,7 +104,7 @@ class AutofillExternalDelegateUnitTest : public testing::Test {
             autofill_manager_.get(), autofill_driver_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed.
     autofill_manager_.reset();
diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
index 8e2b327..a2fab04 100644
--- a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
+++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
@@ -216,7 +216,7 @@ class AutofillImporter : public PersonalDataManagerObserver {
   }
 
   // PersonalDataManagerObserver:
-  virtual void OnPersonalDataChanged() OVERRIDE {
+  virtual void OnPersonalDataChanged() override {
     for (std::vector<AutofillProfile>::const_iterator iter = profiles_.begin();
          iter != profiles_.end(); ++iter) {
       personal_data_manager_->AddProfile(*iter);
diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index 0011cf5..a9ee3ef 100644
--- a/components/autofill/core/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -223,7 +223,7 @@ class AutofillManager : public AutofillDownloadManager::Observer {
  private:
   // AutofillDownloadManager::Observer:
   virtual void OnLoadedServerPredictions(
-      const std::string& response_xml) OVERRIDE;
+      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 f891f41..8e2e1df 100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -91,7 +91,7 @@ class TestPersonalDataManager : public PersonalDataManager {
     credit_cards_.push_back(credit_card);
   }
 
-  virtual void RemoveByGUID(const std::string& guid) OVERRIDE {
+  virtual void RemoveByGUID(const std::string& guid) override {
     CreditCard* credit_card = GetCreditCardWithGUID(guid.c_str());
     if (credit_card) {
       credit_cards_.erase(
@@ -107,7 +107,7 @@ class TestPersonalDataManager : public PersonalDataManager {
 
   // Do nothing (auxiliary profiles will be created in
   // CreateTestAuxiliaryProfile).
-  virtual void LoadAuxiliaryProfiles(bool record_metrics) const OVERRIDE {}
+  virtual void LoadAuxiliaryProfiles(bool record_metrics) const override {}
 
   void ClearAutofillProfiles() {
     web_profiles_.clear();
@@ -387,7 +387,7 @@ class TestAutofillManager : public AutofillManager {
         autofill_enabled_(true) {}
   virtual ~TestAutofillManager() {}
 
-  virtual bool IsAutofillEnabled() const OVERRIDE { return autofill_enabled_; }
+  virtual bool IsAutofillEnabled() const override { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -402,7 +402,7 @@ class TestAutofillManager : public AutofillManager {
       const FormStructure* submitted_form,
       const base::TimeTicks& load_time,
       const base::TimeTicks& interaction_time,
-      const base::TimeTicks& submission_time) OVERRIDE {
+      const base::TimeTicks& submission_time) override {
     run_loop_->Quit();
 
     // If we have expected field types set, make sure they match.
@@ -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 {
+  virtual void UploadFormData(const FormStructure& submitted_form) override {
     submitted_form_signature_ = submitted_form.FormSignature();
   }
 
@@ -506,7 +506,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
                        const FormData& form,
                        const FormFieldData& field,
                        const gfx::RectF& bounds,
-                       bool display_warning) OVERRIDE {
+                       bool display_warning) override {
     on_query_seen_ = true;
     on_suggestions_returned_seen_ = false;
   }
@@ -516,7 +516,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
       const std::vector<base::string16>& autofill_values,
       const std::vector<base::string16>& autofill_labels,
       const std::vector<base::string16>& autofill_icons,
-      const std::vector<int>& autofill_unique_ids) OVERRIDE {
+      const std::vector<int>& autofill_unique_ids) override {
     on_suggestions_returned_seen_ = true;
 
     query_id_ = query_id;
@@ -581,7 +581,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
 
 class AutofillManagerTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     autofill_client_.SetPrefs(test::PrefServiceForTesting());
     personal_data_.set_database(autofill_client_.GetDatabase());
     personal_data_.SetPrefService(autofill_client_.GetPrefs());
@@ -595,7 +595,7 @@ class AutofillManagerTest : public testing::Test {
     autofill_manager_->SetExternalDelegate(external_delegate_.get());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed.
     autofill_manager_.reset();
@@ -2888,7 +2888,7 @@ class MockAutofillClient : public TestAutofillClient {
   virtual void ShowRequestAutocompleteDialog(
       const FormData& form,
       const GURL& source_url,
-      const ResultCallback& callback) OVERRIDE {
+      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 b801bd5..08fbd22 100644
--- a/components/autofill/core/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -88,8 +88,8 @@ class PersonalDataManagerMock : public PersonalDataManager {
 
   // PersonalDataManager:
   virtual std::string SaveImportedProfile(
-      const AutofillProfile& profile) OVERRIDE;
-  virtual const std::vector<AutofillProfile*>& web_profiles() const OVERRIDE;
+      const AutofillProfile& profile) override;
+  virtual const std::vector<AutofillProfile*>& web_profiles() const override;
 
  private:
   ScopedVector<AutofillProfile> profiles_;
@@ -141,7 +141,7 @@ class AutofillMergeTest : public testing::Test,
 
   // DataDrivenTest:
   virtual void GenerateResults(const std::string& input,
-                               std::string* output) OVERRIDE;
+                               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 926542b..3982886 100644
--- a/components/autofill/core/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -87,7 +87,7 @@ class TestPersonalDataManager : public PersonalDataManager {
 
   // Overridden to avoid a trip to the database. This should be a no-op except
   // for the side-effect of logging the profile count.
-  virtual void LoadProfiles() OVERRIDE {
+  virtual void LoadProfiles() override {
     std::vector<AutofillProfile*> profiles;
     web_profiles_.release(&profiles);
     WDResult<std::vector<AutofillProfile*> > result(AUTOFILL_PROFILES_RESULT,
@@ -96,7 +96,7 @@ class TestPersonalDataManager : public PersonalDataManager {
   }
 
   // Overridden to avoid a trip to the database.
-  virtual void LoadCreditCards() OVERRIDE {}
+  virtual void LoadCreditCards() override {}
 
   const MockAutofillMetrics* metric_logger() const {
     return static_cast<const MockAutofillMetrics*>(
@@ -107,7 +107,7 @@ class TestPersonalDataManager : public PersonalDataManager {
     autofill_enabled_ = autofill_enabled;
   }
 
-  virtual bool IsAutofillEnabled() const OVERRIDE {
+  virtual bool IsAutofillEnabled() const override {
     return autofill_enabled_;
   }
 
@@ -173,7 +173,7 @@ class TestAutofillManager : public AutofillManager {
   }
   virtual ~TestAutofillManager() {}
 
-  virtual bool IsAutofillEnabled() const OVERRIDE { return autofill_enabled_; }
+  virtual bool IsAutofillEnabled() const override { return autofill_enabled_; }
 
   void set_autofill_enabled(bool autofill_enabled) {
     autofill_enabled_ = autofill_enabled;
@@ -211,7 +211,7 @@ class TestAutofillManager : public AutofillManager {
       const FormStructure* submitted_form,
       const base::TimeTicks& load_time,
       const base::TimeTicks& interaction_time,
-      const base::TimeTicks& submission_time) OVERRIDE {
+      const base::TimeTicks& submission_time) override {
     run_loop_->Quit();
 
     AutofillManager::UploadFormDataAsyncCallback(submitted_form,
@@ -233,8 +233,8 @@ class AutofillMetricsTest : public testing::Test {
  public:
   virtual ~AutofillMetricsTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   base::MessageLoop message_loop_;
diff --git a/components/autofill/core/browser/autofill_profile.h b/components/autofill/core/browser/autofill_profile.h
index e0030e5..cea4e04 100644
--- a/components/autofill/core/browser/autofill_profile.h
+++ b/components/autofill/core/browser/autofill_profile.h
@@ -43,21 +43,21 @@ class AutofillProfile : public AutofillDataModel {
   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;
+      ServerFieldTypeSet* matching_types) const override;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE;
+                          const base::string16& value) override;
   virtual base::string16 GetInfo(const AutofillType& type,
-                                 const std::string& app_locale) const OVERRIDE;
+                                 const std::string& app_locale) const override;
   virtual bool SetInfo(const AutofillType& type,
                        const base::string16& value,
-                       const std::string& app_locale) OVERRIDE;
+                       const std::string& app_locale) override;
 
   // AutofillDataModel:
   virtual base::string16 GetInfoForVariant(
       const AutofillType& type,
       size_t variant,
-      const std::string& app_locale) const OVERRIDE;
+      const std::string& app_locale) const override;
 
   // Multi-value equivalents to |GetInfo| and |SetInfo|.
   void SetRawMultiInfo(ServerFieldType type,
@@ -154,7 +154,7 @@ class AutofillProfile : public AutofillDataModel {
 
   // FormGroup:
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE;
+      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 720ffaf..45722a8 100644
--- a/components/autofill/core/browser/autofill_xml_parser.h
+++ b/components/autofill/core/browser/autofill_xml_parser.h
@@ -33,7 +33,7 @@ class AutofillXmlParser : public buzz::XmlParseHandler {
   // |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;
+                          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.
@@ -42,13 +42,13 @@ class AutofillXmlParser : public buzz::XmlParseHandler {
   // |len| is the length of the string pointed to by text.
   virtual void CharacterData(buzz::XmlParseContext* context,
                              const char* text,
-                             int len) OVERRIDE;
+                             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;
+                     XML_Error error_code) override;
 
   // True if parsing succeeded.
   bool succeeded_;
@@ -84,7 +84,7 @@ class AutofillQueryXmlParser : public AutofillXmlParser {
   // |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;
+                            const char** attrs) override;
 
   // A helper function to parse a |WebElementDescriptor|.
   // |context| is the current parsing context.
@@ -133,7 +133,7 @@ class AutofillUploadXmlParser : public AutofillXmlParser {
   // |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;
+                            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 5231baa..cfb56ec 100644
--- a/components/autofill/core/browser/contact_info.h
+++ b/components/autofill/core/browser/contact_info.h
@@ -28,19 +28,19 @@ class NameInfo : public FormGroup {
   bool ParsedNamesAreEqual(const NameInfo& info);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE;
+                          const base::string16& value) override;
   virtual base::string16 GetInfo(const AutofillType& type,
-                                 const std::string& app_locale) const OVERRIDE;
+                                 const std::string& app_locale) const override;
   virtual bool SetInfo(const AutofillType& type,
                        const base::string16& value,
-                       const std::string& app_locale) OVERRIDE;
+                       const std::string& app_locale) override;
 
  private:
   // FormGroup:
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE;
+      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.
@@ -68,14 +68,14 @@ class EmailInfo : public FormGroup {
   EmailInfo& operator=(const EmailInfo& info);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE;
+                          const base::string16& value) override;
 
  private:
   // FormGroup:
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE;
+      ServerFieldTypeSet* supported_types) const override;
 
   base::string16 email_;
 };
@@ -89,14 +89,14 @@ class CompanyInfo : public FormGroup {
   CompanyInfo& operator=(const CompanyInfo& info);
 
   // FormGroup:
-  virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE;
+                          const base::string16& value) override;
 
  private:
   // FormGroup:
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE;
+      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 3c4c1f6..585b431 100644
--- a/components/autofill/core/browser/credit_card.h
+++ b/components/autofill/core/browser/credit_card.h
@@ -49,15 +49,15 @@ class CreditCard : public AutofillDataModel {
   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;
+      ServerFieldTypeSet* matching_types) const override;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE;
+                          const base::string16& value) override;
   virtual base::string16 GetInfo(const AutofillType& type,
-                                 const std::string& app_locale) const OVERRIDE;
+                                 const std::string& app_locale) const override;
   virtual bool SetInfo(const AutofillType& type,
                        const base::string16& value,
-                       const std::string& app_locale) OVERRIDE;
+                       const std::string& app_locale) override;
 
   // Credit card preview summary, for example: ******1234, Exp: 01/2020
   const base::string16 Label() const;
@@ -117,7 +117,7 @@ class CreditCard : public AutofillDataModel {
  private:
   // FormGroup:
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE;
+      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 9260446..ec67b52 100644
--- a/components/autofill/core/browser/credit_card_field.h
+++ b/components/autofill/core/browser/credit_card_field.h
@@ -25,7 +25,7 @@ class CreditCardField : public FormField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
+  virtual 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 4e270a1..fcfdf63 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;
+  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   explicit EmailField(const AutofillField* field);
diff --git a/components/autofill/core/browser/name_field.cc b/components/autofill/core/browser/name_field.cc
index 686545f..faf0df7 100644
--- a/components/autofill/core/browser/name_field.cc
+++ b/components/autofill/core/browser/name_field.cc
@@ -25,7 +25,7 @@ class FullNameField : public NameField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
+  virtual bool ClassifyField(ServerFieldTypeMap* map) const override;
 
  private:
   explicit FullNameField(AutofillField* field);
@@ -44,7 +44,7 @@ class FirstLastNameField : public NameField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
+  virtual 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 e15e7e3..ecc89e5 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;
+  virtual 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 a539c5f..eeb9831 100644
--- a/components/autofill/core/browser/personal_data_manager.h
+++ b/components/autofill/core/browser/personal_data_manager.h
@@ -66,10 +66,10 @@ class PersonalDataManager : public KeyedService,
   // WebDataServiceConsumer:
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle h,
-      const WDTypedResult* result) OVERRIDE;
+      const WDTypedResult* result) override;
 
   // AutofillWebDataServiceObserverOnUIThread:
-  virtual void AutofillMultipleChanged() OVERRIDE;
+  virtual void AutofillMultipleChanged() override;
 
   // Adds a listener to be notified of PersonalDataManager events.
   virtual void AddObserver(PersonalDataManagerObserver* observer);
diff --git a/components/autofill/core/browser/phone_field.h b/components/autofill/core/browser/phone_field.h
index 0bab18b..2672650 100644
--- a/components/autofill/core/browser/phone_field.h
+++ b/components/autofill/core/browser/phone_field.h
@@ -29,7 +29,7 @@ class PhoneField : public FormField {
 
  protected:
   // FormField:
-  virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
+  virtual 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 19f9f09..17a0a24 100644
--- a/components/autofill/core/browser/phone_number.h
+++ b/components/autofill/core/browser/phone_number.h
@@ -32,15 +32,15 @@ class PhoneNumber : public 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;
+      ServerFieldTypeSet* matching_types) const override;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const override;
   virtual void SetRawInfo(ServerFieldType type,
-                          const base::string16& value) OVERRIDE;
+                          const base::string16& value) override;
   virtual base::string16 GetInfo(const AutofillType& type,
-                           const std::string& app_locale) const OVERRIDE;
+                           const std::string& app_locale) const override;
   virtual bool SetInfo(const AutofillType& type,
                        const base::string16& value,
-                       const std::string& app_locale) OVERRIDE;
+                       const std::string& app_locale) override;
 
   // Size and offset of the prefix and suffix portions of phone numbers.
   static const size_t kPrefixOffset = 0;
@@ -79,7 +79,7 @@ class PhoneNumber : public FormGroup {
  private:
   // FormGroup:
   virtual void GetSupportedTypes(
-      ServerFieldTypeSet* supported_types) const OVERRIDE;
+      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 9ec8416..617d706 100644
--- a/components/autofill/core/browser/test_autofill_client.h
+++ b/components/autofill/core/browser/test_autofill_client.h
@@ -20,18 +20,18 @@ class TestAutofillClient : public AutofillClient {
   virtual ~TestAutofillClient();
 
   // 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 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;
+      const base::Closure& save_card_callback) override;
   virtual void ShowRequestAutocompleteDialog(
       const FormData& form,
       const GURL& source_url,
-      const ResultCallback& callback) OVERRIDE;
+      const ResultCallback& callback) override;
   virtual void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
@@ -39,19 +39,19 @@ class TestAutofillClient : public AutofillClient {
       const std::vector<base::string16>& labels,
       const std::vector<base::string16>& icons,
       const std::vector<int>& identifiers,
-      base::WeakPtr<AutofillPopupDelegate> delegate) OVERRIDE;
+      base::WeakPtr<AutofillPopupDelegate> delegate) override;
   virtual void UpdateAutofillPopupDataListValues(
       const std::vector<base::string16>& values,
-      const std::vector<base::string16>& labels) OVERRIDE;
-  virtual void HideAutofillPopup() OVERRIDE;
-  virtual bool IsAutocompleteEnabled() OVERRIDE;
+      const std::vector<base::string16>& labels) override;
+  virtual void HideAutofillPopup() override;
+  virtual bool IsAutocompleteEnabled() override;
 
   virtual void DetectAccountCreationForms(
-      const std::vector<autofill::FormStructure*>& forms) OVERRIDE;
+      const std::vector<autofill::FormStructure*>& forms) override;
 
   virtual void DidFillOrPreviewField(
       const base::string16& autofilled_value,
-      const base::string16& profile_full_name) OVERRIDE;
+      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 34a8552..d226a27 100644
--- a/components/autofill/core/browser/test_autofill_driver.h
+++ b/components/autofill/core/browser/test_autofill_driver.h
@@ -23,26 +23,26 @@ class TestAutofillDriver : public AutofillDriver {
   virtual ~TestAutofillDriver();
 
   // AutofillDriver implementation.
-  virtual bool IsOffTheRecord() const OVERRIDE;
+  virtual 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 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;
+                                      const FormData& data) override;
+  virtual void PingRenderer() override;
   virtual void SendAutofillTypePredictionsToRenderer(
-      const std::vector<FormStructure*>& forms) OVERRIDE;
+      const std::vector<FormStructure*>& forms) override;
   virtual void RendererShouldAcceptDataListSuggestion(
-      const base::string16& value) OVERRIDE;
-  virtual void RendererShouldClearFilledForm() OVERRIDE;
-  virtual void RendererShouldClearPreviewedForm() OVERRIDE;
+      const base::string16& value) override;
+  virtual void RendererShouldClearFilledForm() override;
+  virtual void RendererShouldClearPreviewedForm() override;
   virtual void RendererShouldFillFieldWithValue(
-      const base::string16& value) OVERRIDE;
+      const base::string16& value) override;
   virtual void RendererShouldPreviewFieldWithValue(
-      const base::string16& value) OVERRIDE;
+      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 2bb9838..ede08aa 100644
--- a/components/autofill/core/browser/test_personal_data_manager.h
+++ b/components/autofill/core/browser/test_personal_data_manager.h
@@ -26,18 +26,18 @@ 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;
+  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;
 
   virtual std::string SaveImportedProfile(
-      const AutofillProfile& imported_profile) OVERRIDE;
+      const AutofillProfile& imported_profile) override;
   virtual std::string SaveImportedCreditCard(
-      const CreditCard& imported_credit_card) OVERRIDE;
+      const CreditCard& imported_credit_card) override;
 
-  virtual std::string CountryCodeForCurrentTimezone() const OVERRIDE;
+  virtual std::string CountryCodeForCurrentTimezone() const override;
   virtual const std::string& GetDefaultCountryCodeForNewAddress() const
-      OVERRIDE;
+      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_profile_syncable_service.h b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
index 715b40c..ca69049 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
+++ b/components/autofill/core/browser/webdata/autofill_profile_syncable_service.h
@@ -73,17 +73,17 @@ class AutofillProfileSyncableService
       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;
+      scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override;
+  virtual void StopSyncing(syncer::ModelType type) override;
   virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE;
+      syncer::ModelType type) const override;
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
 
   // AutofillWebDataServiceObserverOnDBThread implementation.
   virtual void AutofillProfileChanged(
-      const AutofillProfileChange& change) OVERRIDE;
+      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 3a7b9b1..ab88d89 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
@@ -101,7 +101,7 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor {
                syncer::SyncError(const tracked_objects::Location&,
                                  const syncer::SyncChangeList&));
   virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type)
-      const OVERRIDE { return syncer::SyncDataList(); }
+      const override { return syncer::SyncDataList(); }
 };
 
 class TestSyncChangeProcessor : public syncer::SyncChangeProcessor {
@@ -111,13 +111,13 @@ class TestSyncChangeProcessor : public syncer::SyncChangeProcessor {
 
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& location,
-      const syncer::SyncChangeList& changes) OVERRIDE {
+      const syncer::SyncChangeList& changes) override {
     changes_ = changes;
     return syncer::SyncError();
   }
 
   virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
-      OVERRIDE {
+      override {
     return syncer::SyncDataList();
   }
 
@@ -228,7 +228,7 @@ class AutofillProfileSyncableServiceTest : public testing::Test {
  public:
   AutofillProfileSyncableServiceTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     sync_processor_.reset(new MockSyncChangeProcessor);
   }
 
diff --git a/components/autofill/core/browser/webdata/autofill_table.h b/components/autofill/core/browser/webdata/autofill_table.h
index 660219d..abc6400 100644
--- a/components/autofill/core/browser/webdata/autofill_table.h
+++ b/components/autofill/core/browser/webdata/autofill_table.h
@@ -133,11 +133,11 @@ class AutofillTable : public WebDatabaseTable {
   // 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 WebDatabaseTable::TypeKey GetTypeKey() const override;
+  virtual bool CreateTablesIfNecessary() override;
+  virtual bool IsSyncable() override;
   virtual bool MigrateToVersion(int version,
-                                bool* update_compatible_version) OVERRIDE;
+                                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 8cf3ead..ef886e5 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_backend_impl.h
@@ -55,12 +55,12 @@ class AutofillWebDataBackendImpl
 
   // AutofillWebDataBackend implementation.
   virtual void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer)
-      OVERRIDE;
+      override;
   virtual void RemoveObserver(
-      AutofillWebDataServiceObserverOnDBThread* observer) OVERRIDE;
-  virtual WebDatabase* GetDatabase() OVERRIDE;
-  virtual void RemoveExpiredFormElements() OVERRIDE;
-  virtual void NotifyOfMultipleAutofillChanges() OVERRIDE;
+      AutofillWebDataServiceObserverOnDBThread* observer) override;
+  virtual WebDatabase* GetDatabase() override;
+  virtual void RemoveExpiredFormElements() override;
+  virtual 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
diff --git a/components/autofill/core/browser/webdata/autofill_webdata_service.h b/components/autofill/core/browser/webdata/autofill_webdata_service.h
index 0a2d97d..0c39173 100644
--- a/components/autofill/core/browser/webdata/autofill_webdata_service.h
+++ b/components/autofill/core/browser/webdata/autofill_webdata_service.h
@@ -47,40 +47,40 @@ class AutofillWebDataService : public AutofillWebData,
                          const ProfileErrorCallback& callback);
 
   // WebDataServiceBase implementation.
-  virtual void ShutdownOnUIThread() OVERRIDE;
+  virtual void ShutdownOnUIThread() override;
 
   // AutofillWebData implementation.
   virtual void AddFormFields(
-      const std::vector<FormFieldData>& fields) OVERRIDE;
+      const std::vector<FormFieldData>& fields) override;
   virtual WebDataServiceBase::Handle GetFormValuesForElementName(
       const base::string16& name,
       const base::string16& prefix,
       int limit,
-      WebDataServiceConsumer* consumer) OVERRIDE;
+      WebDataServiceConsumer* consumer) override;
 
   virtual WebDataServiceBase::Handle HasFormElements(
-      WebDataServiceConsumer* consumer) OVERRIDE;
+      WebDataServiceConsumer* consumer) override;
   virtual void RemoveFormElementsAddedBetween(
-      const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
+      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;
+      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(
-      WebDataServiceConsumer* consumer) OVERRIDE;
+      WebDataServiceConsumer* consumer) override;
   virtual 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;
+      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(
-      WebDataServiceConsumer* consumer) OVERRIDE;
+      WebDataServiceConsumer* consumer) override;
   virtual void RemoveAutofillDataModifiedBetween(
-      const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
+      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;
+      const base::Time& delete_begin, const base::Time& delete_end) override;
 
   void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer);
   void RemoveObserver(AutofillWebDataServiceObserverOnDBThread* observer);
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 0de91ac..55da159 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 {
+  virtual 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 697daf3..5f29509 100644
--- a/components/bookmarks/browser/base_bookmark_model_observer.h
+++ b/components/bookmarks/browser/base_bookmark_model_observer.h
@@ -19,30 +19,30 @@ class BaseBookmarkModelObserver : public BookmarkModelObserver {
 
   // BookmarkModelObserver:
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
+                                   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;
+                                 int new_index) override;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE;
+                                 int index) override;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      const std::set<GURL>& removed_urls) override;
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE;
+                                   const BookmarkNode* node) override;
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE;
+                                          const BookmarkNode* node) override;
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) OVERRIDE;
+                                             const BookmarkNode* node) override;
 
  protected:
   virtual ~BaseBookmarkModelObserver() {}
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.h b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
index 6aadaf2..581330d 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.h
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
@@ -33,17 +33,17 @@ 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;
+                                   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,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      const std::set<GURL>& removed_urls) override;
 
   // Updates the value for |prefs::kBookmarkEditorExpandedNodes| from
   // GetExpandedNodes().
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
index d5389fb..0ad4e77 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
@@ -40,8 +40,8 @@ class BookmarkExpandedStateTrackerTest : public testing::Test {
 
  protected:
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   base::MessageLoop message_loop_;
   TestBookmarkClient client_;
diff --git a/components/bookmarks/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc
index d474386..2ce206a 100644
--- a/components/bookmarks/browser/bookmark_index_unittest.cc
+++ b/components/bookmarks/browser/bookmark_index_unittest.cc
@@ -31,11 +31,11 @@ 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; }
+  virtual bool SupportsTypedCountForNodes() override { return true; }
 
   virtual void GetTypedCountForNodes(
       const NodeSet& nodes,
-      NodeTypedCountPairs* node_typed_count_pairs) OVERRIDE {
+      NodeTypedCountPairs* node_typed_count_pairs) override {
     for (NodeSet::const_iterator it = nodes.begin(); it != nodes.end(); ++it) {
       const BookmarkNode* node = *it;
       std::map<GURL, int>::const_iterator found =
diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
index 4181851..05d21e9 100644
--- a/components/bookmarks/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
@@ -67,7 +67,7 @@ class BookmarkModel : public KeyedService {
   virtual ~BookmarkModel();
 
   // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  virtual 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 653b20d..486df69 100644
--- a/components/bookmarks/browser/bookmark_model_unittest.cc
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -145,7 +145,7 @@ class BookmarkModelTest : public testing::Test,
   }
 
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE {
+                                   bool ids_reassigned) override {
     // We never load from the db, so that this should never get invoked.
     NOTREACHED();
   }
@@ -154,14 +154,14 @@ class BookmarkModelTest : public testing::Test,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE {
+                                 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 {
+                                 int index) override {
     ++added_count_;
     observer_details_.Set(parent, NULL, index, -1);
   }
@@ -169,7 +169,7 @@ class BookmarkModelTest : public testing::Test,
   virtual void OnWillRemoveBookmarks(BookmarkModel* model,
                                      const BookmarkNode* parent,
                                      int old_index,
-                                     const BookmarkNode* node) OVERRIDE {
+                                     const BookmarkNode* node) override {
     ++before_remove_count_;
   }
 
@@ -178,55 +178,55 @@ class BookmarkModelTest : public testing::Test,
       const BookmarkNode* parent,
       int old_index,
       const BookmarkNode* node,
-      const std::set<GURL>& removed_urls) OVERRIDE {
+      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 {
+                                   const BookmarkNode* node) override {
     ++changed_count_;
     observer_details_.Set(node, NULL, -1, -1);
   }
 
   virtual void OnWillChangeBookmarkNode(BookmarkModel* model,
-                                        const BookmarkNode* node) OVERRIDE {
+                                        const BookmarkNode* node) override {
     ++before_change_count_;
   }
 
   virtual void BookmarkNodeChildrenReordered(
       BookmarkModel* model,
-      const BookmarkNode* node) OVERRIDE {
+      const BookmarkNode* node) override {
     ++reordered_count_;
   }
 
   virtual void OnWillReorderBookmarkNode(BookmarkModel* model,
-                                         const BookmarkNode* node) OVERRIDE {
+                                         const BookmarkNode* node) override {
     ++before_reorder_count_;
   }
 
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE {
+                                          const BookmarkNode* node) override {
     // We never attempt to load favicons, so that this method never
     // gets invoked.
   }
 
   virtual void ExtensiveBookmarkChangesBeginning(
-      BookmarkModel* model) OVERRIDE {
+      BookmarkModel* model) override {
     ++extensive_changes_beginning_count_;
   }
 
-  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE {
+  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {
     ++extensive_changes_ended_count_;
   }
 
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE {
+      const std::set<GURL>& removed_urls) override {
     ++all_bookmarks_removed_;
   }
 
-  virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) OVERRIDE {
+  virtual 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 f53c0d0..a51c8ef 100644
--- a/components/bookmarks/browser/bookmark_node.h
+++ b/components/bookmarks/browser/bookmark_node.h
@@ -49,7 +49,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> {
   // 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;
+  virtual 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
@@ -201,7 +201,7 @@ class BookmarkPermanentNode : public BookmarkNode {
   void set_visible(bool value) { visible_ = value; }
 
   // BookmarkNode overrides:
-  virtual bool IsVisible() const OVERRIDE;
+  virtual bool IsVisible() const override;
 
  private:
   bool visible_;
diff --git a/components/bookmarks/browser/bookmark_node_data_unittest.cc b/components/bookmarks/browser/bookmark_node_data_unittest.cc
index 4e93fa2..d652595 100644
--- a/components/bookmarks/browser/bookmark_node_data_unittest.cc
+++ b/components/bookmarks/browser/bookmark_node_data_unittest.cc
@@ -24,7 +24,7 @@ class BookmarkNodeDataTest : public testing::Test {
  public:
   BookmarkNodeDataTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     event_source_ = ui::PlatformEventSource::CreateDefault();
     model_ = client_.CreateModel();
     test::WaitForBookmarkModelToLoad(model_.get());
@@ -32,7 +32,7 @@ class BookmarkNodeDataTest : public testing::Test {
     ASSERT_TRUE(success);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     model_.reset();
     event_source_.reset();
     bool success = profile_dir_.Delete();
diff --git a/components/bookmarks/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h
index 39639fa..262c6ab 100644
--- a/components/bookmarks/browser/bookmark_storage.h
+++ b/components/bookmarks/browser/bookmark_storage.h
@@ -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;
+  virtual 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 be6aef6..7a94080 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -32,7 +32,7 @@ class BookmarkUtilsTest : public testing::Test,
 
 // Copy and paste is not yet supported on iOS. http://crbug.com/228147
 #if !defined(OS_IOS)
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
   }
 #endif  // !defined(OS_IOS)
@@ -54,13 +54,13 @@ class BookmarkUtilsTest : public testing::Test,
 
  private:
   // BaseBookmarkModelObserver:
-  virtual void BookmarkModelChanged() OVERRIDE {}
+  virtual void BookmarkModelChanged() override {}
 
-  virtual void GroupedBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE {
+  virtual void GroupedBookmarkChangesBeginning(BookmarkModel* model) override {
     ++grouped_changes_beginning_count_;
   }
 
-  virtual void GroupedBookmarkChangesEnded(BookmarkModel* model) OVERRIDE {
+  virtual 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 ce7fbe8..c4f29b9 100644
--- a/components/bookmarks/test/bookmark_test_helpers.cc
+++ b/components/bookmarks/test/bookmark_test_helpers.cc
@@ -26,9 +26,9 @@ class BookmarkLoadObserver : public BaseBookmarkModelObserver {
 
  private:
   // BaseBookmarkModelObserver:
-  virtual void BookmarkModelChanged() OVERRIDE;
+  virtual void BookmarkModelChanged() override;
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
+                                   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 19b9c79..ca19156 100644
--- a/components/bookmarks/test/test_bookmark_client.h
+++ b/components/bookmarks/test/test_bookmark_client.h
@@ -39,13 +39,13 @@ 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;
+      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;
+      const BookmarkNode* permanent_node) override;
+  virtual bool CanSyncNode(const BookmarkNode* node) override;
+  virtual 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 9d41df4..1e155b7 100644
--- a/components/captive_portal/captive_portal_detector.h
+++ b/components/captive_portal/captive_portal_detector.h
@@ -62,7 +62,7 @@ class CAPTIVE_PORTAL_EXPORT CaptivePortalDetector
   friend class CaptivePortalDetectorTestBase;
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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/captive_portal/captive_portal_detector_unittest.cc b/components/captive_portal/captive_portal_detector_unittest.cc
index 32ffeb0..486baa14 100644
--- a/components/captive_portal/captive_portal_detector_unittest.cc
+++ b/components/captive_portal/captive_portal_detector_unittest.cc
@@ -54,7 +54,7 @@ class CaptivePortalDetectorTest : public testing::Test,
   CaptivePortalDetectorTest() {}
   virtual ~CaptivePortalDetectorTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CHECK(base::MessageLoopProxy::current().get());
     scoped_refptr<net::URLRequestContextGetter> request_context_getter(
         new net::TestURLRequestContextGetter(
@@ -64,7 +64,7 @@ class CaptivePortalDetectorTest : public testing::Test,
     set_detector(detector_.get());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     detector_.reset();
   }
 
diff --git a/components/cdm/browser/cdm_message_filter_android.h b/components/cdm/browser/cdm_message_filter_android.h
index 5388648..b32fca5 100644
--- a/components/cdm/browser/cdm_message_filter_android.h
+++ b/components/cdm/browser/cdm_message_filter_android.h
@@ -24,10 +24,10 @@ class CdmMessageFilterAndroid
   virtual ~CdmMessageFilterAndroid();
 
   // BrowserMessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
   virtual void OverrideThreadForMessage(
       const IPC::Message& message,
-      content::BrowserThread::ID* thread) OVERRIDE;
+      content::BrowserThread::ID* thread) override;
 
   // Query the key system information.
   void OnQueryKeySystemSupport(const SupportedKeySystemRequest& request,
diff --git a/components/component_updater/background_downloader_win.h b/components/component_updater/background_downloader_win.h
index 66cabe1..fe4a919 100644
--- a/components/component_updater/background_downloader_win.h
+++ b/components/component_updater/background_downloader_win.h
@@ -42,7 +42,7 @@ class BackgroundDownloader : public CrxDownloader {
 
  private:
   // Overrides for CrxDownloader.
-  virtual void DoStartDownload(const GURL& url) OVERRIDE;
+  virtual void DoStartDownload(const GURL& url) override;
 
   // Called asynchronously on the |task_runner_| at different stages during
   // the download. |OnDownloading| can be called multiple times.
diff --git a/components/component_updater/component_patcher_operation.h b/components/component_updater/component_patcher_operation.h
index 4867ed7..02ca26d 100644
--- a/components/component_updater/component_patcher_operation.h
+++ b/components/component_updater/component_patcher_operation.h
@@ -92,9 +92,9 @@ class DeltaUpdateOpCopy : public DeltaUpdateOp {
   virtual ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
-      ComponentInstaller* installer) OVERRIDE;
+      ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) OVERRIDE;
+  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   base::FilePath input_abs_path_;
 
@@ -116,9 +116,9 @@ class DeltaUpdateOpCreate : public DeltaUpdateOp {
   virtual ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
-      ComponentInstaller* installer) OVERRIDE;
+      ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) OVERRIDE;
+  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   base::FilePath patch_abs_path_;
 
@@ -159,9 +159,9 @@ class DeltaUpdateOpPatch : public DeltaUpdateOp {
   virtual ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
-      ComponentInstaller* installer) OVERRIDE;
+      ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) OVERRIDE;
+  virtual 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 519b0f6..4cd4a7a 100644
--- a/components/component_updater/component_updater_service.cc
+++ b/components/component_updater/component_updater_service.cc
@@ -106,17 +106,17 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
   virtual ~CrxUpdateService();
 
   // 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 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;
+                             const base::Closure& callback) override;
   virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
-      OVERRIDE;
+      override;
 
   // Context for a crx download url request.
   struct CRXContext {
@@ -143,10 +143,10 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
 
   // Overrides for ComponentUpdateService.
   virtual bool GetComponentDetails(const std::string& component_id,
-                                   CrxUpdateItem* item) const OVERRIDE;
+                                   CrxUpdateItem* item) const override;
 
   // Overrides for OnDemandUpdater.
-  virtual Status OnDemandUpdate(const std::string& component_id) OVERRIDE;
+  virtual 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 6eaaecd..345c3dd 100644
--- a/components/component_updater/default_component_installer.h
+++ b/components/component_updater/default_component_installer.h
@@ -91,11 +91,11 @@ class DefaultComponentInstaller : public ComponentInstaller {
   void Register(ComponentUpdateService* cus);
 
   // Overridden from ComponentInstaller:
-  virtual void OnUpdateError(int error) OVERRIDE;
+  virtual void OnUpdateError(int error) override;
   virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) OVERRIDE;
+                       const base::FilePath& unpack_path) override;
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
   virtual ~DefaultComponentInstaller();
 
diff --git a/components/component_updater/request_sender.h b/components/component_updater/request_sender.h
index 77d9964..2abcf47 100644
--- a/components/component_updater/request_sender.h
+++ b/components/component_updater/request_sender.h
@@ -44,7 +44,7 @@ class RequestSender : public net::URLFetcherDelegate {
   void SendInternal();
 
   // Overrides for URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   const Configurator& config_;
   std::vector<GURL> urls_;
diff --git a/components/component_updater/test/component_updater_ping_manager_unittest.cc b/components/component_updater/test/component_updater_ping_manager_unittest.cc
index 39075c8..806c9a8 100644
--- a/components/component_updater/test/component_updater_ping_manager_unittest.cc
+++ b/components/component_updater/test/component_updater_ping_manager_unittest.cc
@@ -23,8 +23,8 @@ class ComponentUpdaterPingManagerTest : public testing::Test {
   void RunThreadsUntilIdle();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   scoped_ptr<TestConfigurator> config_;
diff --git a/components/component_updater/test/crx_downloader_unittest.cc b/components/component_updater/test/crx_downloader_unittest.cc
index de6d6a2..9dbe8fe9 100644
--- a/components/component_updater/test/crx_downloader_unittest.cc
+++ b/components/component_updater/test/crx_downloader_unittest.cc
@@ -43,8 +43,8 @@ class CrxDownloaderTest : public testing::Test {
   virtual ~CrxDownloaderTest();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void Quit();
   void RunThreads();
diff --git a/components/component_updater/test/request_sender_unittest.cc b/components/component_updater/test/request_sender_unittest.cc
index f93d49d..b1e46d7 100644
--- a/components/component_updater/test/request_sender_unittest.cc
+++ b/components/component_updater/test/request_sender_unittest.cc
@@ -30,8 +30,8 @@ class RequestSenderTest : public testing::Test {
   virtual ~RequestSenderTest();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void RequestSenderComplete(const net::URLFetcher* source);
 
diff --git a/components/component_updater/test/test_configurator.h b/components/component_updater/test/test_configurator.h
index f3dc6ac..e525db7 100644
--- a/components/component_updater/test/test_configurator.h
+++ b/components/component_updater/test/test_configurator.h
@@ -39,29 +39,29 @@ class TestConfigurator : public Configurator {
   virtual ~TestConfigurator();
 
   // 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 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()
-      const OVERRIDE;
-  virtual bool DeltasEnabled() const OVERRIDE;
-  virtual bool UseBackgroundDownloader() const OVERRIDE;
+      const override;
+  virtual bool DeltasEnabled() const override;
+  virtual bool UseBackgroundDownloader() const override;
   virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
-      const OVERRIDE;
+      const override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetSingleThreadTaskRunner() const OVERRIDE;
+      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 00b8c9b..914b52e 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;
+  virtual void OnUpdateError(int error) override;
 
   virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) OVERRIDE;
+                       const base::FilePath& unpack_path) override;
 
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
   int error() const;
 
@@ -49,7 +49,7 @@ class ReadOnlyTestInstaller : public TestInstaller {
   virtual ~ReadOnlyTestInstaller();
 
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
  private:
   base::FilePath install_directory_;
@@ -64,10 +64,10 @@ class VersionedTestInstaller : public TestInstaller {
   virtual ~VersionedTestInstaller();
 
   virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) OVERRIDE;
+                       const base::FilePath& unpack_path) override;
 
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
  private:
   base::FilePath install_directory_;
diff --git a/components/component_updater/test/update_checker_unittest.cc b/components/component_updater/test/update_checker_unittest.cc
index a013dee..574db3f 100644
--- a/components/component_updater/test/update_checker_unittest.cc
+++ b/components/component_updater/test/update_checker_unittest.cc
@@ -41,8 +41,8 @@ class UpdateCheckerTest : public testing::Test {
   virtual ~UpdateCheckerTest();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void UpdateCheckComplete(const GURL& original_url,
                            int error,
diff --git a/components/component_updater/test/url_request_post_interceptor.cc b/components/component_updater/test/url_request_post_interceptor.cc
index 92c4d0c..882db72 100644
--- a/components/component_updater/test/url_request_post_interceptor.cc
+++ b/components/component_updater/test/url_request_post_interceptor.cc
@@ -30,12 +30,12 @@ class URLRequestMockJob : public net::URLRequestSimpleJob {
         response_body_(response_body) {}
 
  protected:
-  virtual int GetResponseCode() const OVERRIDE { return response_code_; }
+  virtual 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 {
+                      const net::CompletionCallback& callback) const override {
     mime_type->assign("text/plain");
     charset->assign("US-ASCII");
     data->assign(response_body_);
@@ -172,7 +172,7 @@ class URLRequestPostInterceptor::Delegate : public net::URLRequestInterceptor {
 
   virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
+      net::NetworkDelegate* network_delegate) const override {
     DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
 
     // Only intercepts POST.
diff --git a/components/component_updater/test/url_request_post_interceptor.h b/components/component_updater/test/url_request_post_interceptor.h
index ea490bf..01a5ef4 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;
+  virtual 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 cef3912..3bfff63 100644
--- a/components/component_updater/update_checker.cc
+++ b/components/component_updater/update_checker.cc
@@ -85,7 +85,7 @@ class UpdateCheckerImpl : public UpdateChecker {
   virtual bool CheckForUpdates(
       const std::vector<CrxUpdateItem*>& items_to_check,
       const std::string& additional_attributes,
-      const UpdateCheckCallback& update_check_callback) OVERRIDE;
+      const UpdateCheckCallback& update_check_callback) override;
 
  private:
   void OnRequestSenderComplete(const net::URLFetcher* source);
diff --git a/components/component_updater/url_fetcher_downloader.h b/components/component_updater/url_fetcher_downloader.h
index 576da6c..7a51c20 100644
--- a/components/component_updater/url_fetcher_downloader.h
+++ b/components/component_updater/url_fetcher_downloader.h
@@ -34,13 +34,13 @@ class UrlFetcherDownloader : public CrxDownloader,
 
  private:
   // Overrides for CrxDownloader.
-  virtual void DoStartDownload(const GURL& url) OVERRIDE;
+  virtual void DoStartDownload(const GURL& url) override;
 
   // Overrides for URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                           int64_t current,
-                                          int64_t total) OVERRIDE;
+                                          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_origin_identifier_value_map.cc b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc
index c197778..7a404db 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
@@ -32,11 +32,11 @@ class RuleIteratorImpl : public RuleIterator {
   }
   virtual ~RuleIteratorImpl() {}
 
-  virtual bool HasNext() const OVERRIDE {
+  virtual bool HasNext() const override {
     return (current_rule_ != rule_end_);
   }
 
-  virtual Rule Next() OVERRIDE {
+  virtual 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 b8f37cb..bff9f65 100644
--- a/components/content_settings/core/browser/content_settings_rule.h
+++ b/components/content_settings/core/browser/content_settings_rule.h
@@ -40,8 +40,8 @@ class RuleIterator {
 class EmptyRuleIterator : public RuleIterator {
  public:
   virtual ~EmptyRuleIterator();
-  virtual bool HasNext() const OVERRIDE;
-  virtual Rule Next() OVERRIDE;
+  virtual bool HasNext() const override;
+  virtual Rule Next() override;
 };
 
 class ConcatenationIterator : public RuleIterator {
@@ -51,8 +51,8 @@ class ConcatenationIterator : public RuleIterator {
   ConcatenationIterator(ScopedVector<RuleIterator>* iterators,
                         base::AutoLock* auto_lock);
   virtual ~ConcatenationIterator();
-  virtual bool HasNext() const OVERRIDE;
-  virtual Rule Next() OVERRIDE;
+  virtual bool HasNext() const override;
+  virtual 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 82cdfbd..1d6cf31 100644
--- a/components/content_settings/core/browser/content_settings_rule_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_rule_unittest.cc
@@ -19,11 +19,11 @@ class ListIterator : public RuleIterator {
 
   virtual ~ListIterator() {}
 
-  virtual bool HasNext() const OVERRIDE {
+  virtual bool HasNext() const override {
     return !rules_.empty();
   }
 
-  virtual Rule Next() OVERRIDE {
+  virtual 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 b928ebd..353d7df 100644
--- a/components/content_settings/core/common/content_settings_pattern.cc
+++ b/components/content_settings/core/common/content_settings_pattern.cc
@@ -90,16 +90,16 @@ class ContentSettingsPattern::Builder :
   virtual ~Builder();
 
   // 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;
+  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;
 
  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 d2a0183..7f14cbc 100644
--- a/components/copresence/copresence_manager_impl.h
+++ b/components/copresence/copresence_manager_impl.h
@@ -40,7 +40,7 @@ class CopresenceManagerImpl : public CopresenceManager {
   virtual ~CopresenceManagerImpl();
   virtual void ExecuteReportRequest(ReportRequest request,
                                     const std::string& app_id,
-                                    const StatusCallback& callback) OVERRIDE;
+                                    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 c2482dd..31c5f58 100644
--- a/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
+++ b/components/copresence/handlers/audio/audio_directive_handler_unittest.cc
@@ -24,13 +24,13 @@ class TestAudioPlayer : public AudioPlayer {
   virtual ~TestAudioPlayer() {}
 
   // AudioPlayer overrides:
-  virtual void Initialize() OVERRIDE {}
+  virtual void Initialize() override {}
   virtual void Play(
-      const scoped_refptr<media::AudioBusRefCounted>& /* samples */) OVERRIDE {
+      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; }
+  virtual void Stop() override { set_is_playing(false); }
+  virtual void Finalize() override { delete this; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestAudioPlayer);
@@ -42,10 +42,10 @@ class TestAudioRecorder : public AudioRecorder {
   virtual ~TestAudioRecorder() {}
 
   // 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; }
+  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; }
 
  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 bac91b8..96c1f0f 100644
--- a/components/copresence/mediums/audio/audio_player.h
+++ b/components/copresence/mediums/audio/audio_player.h
@@ -67,8 +67,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;
+                         uint32 total_bytes_delay) override;
+  virtual 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 5aa7c2e..b978b99 100644
--- a/components/copresence/mediums/audio/audio_player_unittest.cc
+++ b/components/copresence/mediums/audio/audio_player_unittest.cc
@@ -31,15 +31,15 @@ class TestAudioOutputStream : public media::AudioOutputStream {
 
   virtual ~TestAudioOutputStream() {}
 
-  virtual bool Open() OVERRIDE { return true; }
-  virtual void Start(AudioSourceCallback* callback) OVERRIDE {
+  virtual bool Open() override { return true; }
+  virtual 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 {}
+  virtual void Stop() override {}
+  virtual void SetVolume(double volume) override {}
+  virtual void GetVolume(double* volume) override {}
+  virtual 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 eec982d..5c68eca 100644
--- a/components/copresence/mediums/audio/audio_recorder.h
+++ b/components/copresence/mediums/audio/audio_recorder.h
@@ -78,12 +78,12 @@ class AudioRecorder : public media::AudioInputStream::AudioInputCallback,
   virtual void OnData(media::AudioInputStream* stream,
                       const media::AudioBus* source,
                       uint32 hardware_delay_bytes,
-                      double volume) OVERRIDE;
-  virtual void OnError(media::AudioInputStream* stream) OVERRIDE;
+                      double volume) override;
+  virtual void OnError(media::AudioInputStream* stream) override;
 
   // AudioConverter::InputCallback overrides:
   virtual double ProvideInput(media::AudioBus* dest,
-                              base::TimeDelta buffer_delay) OVERRIDE;
+                              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 4f0e6c8..df3f3e5 100644
--- a/components/copresence/mediums/audio/audio_recorder_unittest.cc
+++ b/components/copresence/mediums/audio/audio_recorder_unittest.cc
@@ -31,8 +31,8 @@ class TestAudioInputStream : public media::AudioInputStream {
 
   virtual ~TestAudioInputStream() {}
 
-  virtual bool Open() OVERRIDE { return true; }
-  virtual void Start(AudioInputCallback* callback) OVERRIDE {
+  virtual bool Open() override { return true; }
+  virtual void Start(AudioInputCallback* callback) override {
     DCHECK(callback);
     callback_ = callback;
     media::AudioManager::Get()->GetTaskRunner()->PostTask(
@@ -40,13 +40,13 @@ 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 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; }
 
  private:
   void SimulateRecording() {
diff --git a/components/copresence/rpc/http_post.h b/components/copresence/rpc/http_post.h
index a23dfa8..f324b69 100644
--- a/components/copresence/rpc/http_post.h
+++ b/components/copresence/rpc/http_post.h
@@ -60,7 +60,7 @@ class HttpPost : public net::URLFetcherDelegate {
   friend class HttpPostTest;
 
   // Overridden from net::URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 2bba244..39d7213 100644
--- a/components/copresence/rpc/rpc_handler_unittest.cc
+++ b/components/copresence/rpc/rpc_handler_unittest.cc
@@ -51,13 +51,13 @@ class FakeDirectiveHandler : public DirectiveHandler {
 
   virtual void Initialize(
       const AudioRecorder::DecodeSamplesCallback& decode_cb,
-      const AudioDirectiveHandler::EncodeTokenCallback& encode_cb) OVERRIDE {}
+      const AudioDirectiveHandler::EncodeTokenCallback& encode_cb) override {}
 
-  virtual void AddDirective(const Directive& directive) OVERRIDE {
+  virtual void AddDirective(const Directive& directive) override {
     added_directives_.push_back(directive);
   }
 
-  virtual void RemoveDirectives(const std::string& op_id) OVERRIDE {
+  virtual void RemoveDirectives(const std::string& op_id) override {
     // TODO(ckehoe): Add a parallel implementation when prod has one.
   }
 
@@ -143,24 +143,24 @@ class RpcHandlerTest : public testing::Test, public CopresenceDelegate {
   virtual void HandleMessages(
       const std::string& app_id,
       const std::string& subscription_id,
-      const std::vector<Message>& messages) OVERRIDE {
+      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 {
+  virtual net::URLRequestContextGetter* GetRequestContext() const override {
     return NULL;
   }
 
-  virtual const std::string GetPlatformVersionString() const OVERRIDE {
+  virtual const std::string GetPlatformVersionString() const override {
     return kChromeVersion;
   }
 
-  virtual const std::string GetAPIKey() const OVERRIDE {
+  virtual const std::string GetAPIKey() const override {
     return api_key_;
   }
 
-  virtual WhispernetClient* GetWhispernetClient() OVERRIDE {
+  virtual WhispernetClient* GetWhispernetClient() override {
     return NULL;
   }
 
diff --git a/components/crash/app/breakpad_linux.cc b/components/crash/app/breakpad_linux.cc
index 4419804..3bfd96d 100644
--- a/components/crash/app/breakpad_linux.cc
+++ b/components/crash/app/breakpad_linux.cc
@@ -399,25 +399,25 @@ class CrashReporterWriter : public MimeWriter {
  public:
   explicit CrashReporterWriter(int fd);
 
-  virtual void AddBoundary() OVERRIDE;
+  virtual void AddBoundary() override;
 
-  virtual void AddEnd() OVERRIDE;
+  virtual void AddEnd() override;
 
   virtual void AddPairData(const char* msg_type,
                            size_t msg_type_size,
                           const char* msg_data,
-                           size_t msg_data_size) OVERRIDE;
+                           size_t msg_data_size) override;
 
   virtual void AddPairDataInChunks(const char* msg_type,
                                    size_t msg_type_size,
                                    const char* msg_data,
                                    size_t msg_data_size,
                                    size_t chunk_size,
-                                   bool strip_trailing_spaces) OVERRIDE;
+                                   bool strip_trailing_spaces) override;
 
   virtual void AddFileContents(const char* filename_msg,
                                uint8_t* file_data,
-                               size_t file_size) OVERRIDE;
+                               size_t file_size) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrashReporterWriter);
@@ -760,7 +760,7 @@ class NonBrowserCrashHandler : public google_breakpad::CrashGenerationClient {
   virtual ~NonBrowserCrashHandler() {}
 
   virtual bool RequestDump(const void* crash_context,
-                           size_t crash_context_size) OVERRIDE {
+                           size_t crash_context_size) override {
     int fds[2] = { -1, -1 };
     if (sys_socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) {
       static const char msg[] = "Failed to create socket for crash dumping.\n";
diff --git a/components/crash/app/breakpad_mac.mm b/components/crash/app/breakpad_mac.mm
index 80431f79..95862a7 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 {
+  virtual void ThreadMain() override {
     base::PlatformThread::SetName("CrDumpHelper");
     BreakpadGenerateAndSendReport(gBreakpadRef);
   }
diff --git a/components/crash/browser/crash_dump_manager_android.h b/components/crash/browser/crash_dump_manager_android.h
index 2abf061..7476f81 100644
--- a/components/crash/browser/crash_dump_manager_android.h
+++ b/components/crash/browser/crash_dump_manager_android.h
@@ -53,14 +53,14 @@ class CrashDumpManager : public content::BrowserChildProcessObserver,
 
   // content::BrowserChildProcessObserver implementation:
   virtual void BrowserChildProcessHostDisconnected(
-      const content::ChildProcessData& data) OVERRIDE;
+      const content::ChildProcessData& data) override;
   virtual void BrowserChildProcessCrashed(
-      const content::ChildProcessData& data) OVERRIDE;
+      const content::ChildProcessData& data) override;
 
   // NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Called on child process exit (including crash).
   void OnChildExit(int child_process_id, base::ProcessHandle pid);
diff --git a/components/crash/browser/crash_handler_host_linux.h b/components/crash/browser/crash_handler_host_linux.h
index 9c6b603..f655360f 100644
--- a/components/crash/browser/crash_handler_host_linux.h
+++ b/components/crash/browser/crash_handler_host_linux.h
@@ -49,11 +49,11 @@ class CrashHandlerHostLinux : public base::MessageLoopForIO::Watcher,
   }
 
   // MessagePumbLibevent::Watcher impl:
-  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
+  virtual void OnFileCanWriteWithoutBlocking(int fd) override;
+  virtual void OnFileCanReadWithoutBlocking(int fd) override;
 
   // MessageLoop::DestructionObserver impl:
-  virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
+  virtual void WillDestroyCurrentMessageLoop() override;
 
   // Whether we are shutting down or not.
   bool IsShuttingDown() const;
diff --git a/components/cronet/android/chromium_url_request.cc b/components/cronet/android/chromium_url_request.cc
index b2291b38..778c74e 100644
--- a/components/cronet/android/chromium_url_request.cc
+++ b/components/cronet/android/chromium_url_request.cc
@@ -59,12 +59,12 @@ class JniURLRequestAdapterDelegate
     owner_ = env->NewGlobalRef(owner);
   }
 
-  virtual void OnResponseStarted(URLRequestAdapter* request) OVERRIDE {
+  virtual void OnResponseStarted(URLRequestAdapter* request) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_ChromiumUrlRequest_onResponseStarted(env, owner_);
   }
 
-  virtual void OnBytesRead(URLRequestAdapter* request) OVERRIDE {
+  virtual void OnBytesRead(URLRequestAdapter* request) override {
     int bytes_read = request->bytes_read();
     if (bytes_read != 0) {
       JNIEnv* env = base::android::AttachCurrentThread();
@@ -75,13 +75,13 @@ class JniURLRequestAdapterDelegate
     }
   }
 
-  virtual void OnRequestFinished(URLRequestAdapter* request) OVERRIDE {
+  virtual void OnRequestFinished(URLRequestAdapter* request) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_ChromiumUrlRequest_finish(env, owner_);
   }
 
   virtual int ReadFromUploadChannel(net::IOBuffer* buf,
-                                    int buf_length) OVERRIDE {
+                                    int buf_length) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     base::android::ScopedJavaLocalRef<jobject> java_buffer(
         env, env->NewDirectByteBuffer(buf->data(), buf_length));
diff --git a/components/cronet/android/chromium_url_request_context.cc b/components/cronet/android/chromium_url_request_context.cc
index f870adf..9ef8c88 100644
--- a/components/cronet/android/chromium_url_request_context.cc
+++ b/components/cronet/android/chromium_url_request_context.cc
@@ -31,7 +31,7 @@ class JniURLRequestContextAdapterDelegate
       : owner_(env->NewGlobalRef(owner)) {}
 
   virtual void OnContextInitialized(
-      cronet::URLRequestContextAdapter* context) OVERRIDE {
+      cronet::URLRequestContextAdapter* context) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_ChromiumUrlRequestContext_initNetworkThread(env, owner_);
     // TODO(dplotnikov): figure out if we need to detach from the thread.
diff --git a/components/cronet/android/url_request_adapter.h b/components/cronet/android/url_request_adapter.h
index aad1893..f4c3e54 100644
--- a/components/cronet/android/url_request_adapter.h
+++ b/components/cronet/android/url_request_adapter.h
@@ -112,10 +112,10 @@ class URLRequestAdapter : public net::URLRequest::Delegate {
   // Get NPN or ALPN Negotiated Protocol (if any) from HttpResponseInfo.
   std::string GetNegotiatedProtocol() const;
 
-  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+  virtual void OnResponseStarted(net::URLRequest* request) override;
 
   virtual void OnReadCompleted(net::URLRequest* request,
-                               int bytes_read) OVERRIDE;
+                               int bytes_read) override;
 
  private:
   static void OnDestroyRequest(URLRequestAdapter* self);
diff --git a/components/cronet/android/url_request_context_adapter.cc b/components/cronet/android/url_request_context_adapter.cc
index 7c99244..fc7f921 100644
--- a/components/cronet/android/url_request_context_adapter.cc
+++ b/components/cronet/android/url_request_context_adapter.cc
@@ -33,75 +33,75 @@ class BasicNetworkDelegate : public net::NetworkDelegate {
   // net::NetworkDelegate implementation.
   virtual int OnBeforeURLRequest(net::URLRequest* request,
                                  const net::CompletionCallback& callback,
-                                 GURL* new_url) OVERRIDE {
+                                 GURL* new_url) override {
     return net::OK;
   }
 
   virtual int OnBeforeSendHeaders(net::URLRequest* request,
                                   const net::CompletionCallback& callback,
-                                  net::HttpRequestHeaders* headers) OVERRIDE {
+                                  net::HttpRequestHeaders* headers) override {
     return net::OK;
   }
 
   virtual void OnSendHeaders(net::URLRequest* request,
-                             const net::HttpRequestHeaders& headers) OVERRIDE {}
+                             const net::HttpRequestHeaders& headers) override {}
 
   virtual int OnHeadersReceived(
       net::URLRequest* request,
       const net::CompletionCallback& callback,
       const net::HttpResponseHeaders* original_response_headers,
       scoped_refptr<net::HttpResponseHeaders>* _response_headers,
-      GURL* allowed_unsafe_redirect_url) OVERRIDE {
+      GURL* allowed_unsafe_redirect_url) override {
     return net::OK;
   }
 
   virtual void OnBeforeRedirect(net::URLRequest* request,
-                                const GURL& new_location) OVERRIDE {}
+                                const GURL& new_location) override {}
 
-  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE {}
+  virtual void OnResponseStarted(net::URLRequest* request) override {}
 
   virtual void OnRawBytesRead(const net::URLRequest& request,
-                              int bytes_read) OVERRIDE {}
+                              int bytes_read) override {}
 
-  virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE {}
+  virtual void OnCompleted(net::URLRequest* request, bool started) override {}
 
-  virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE {}
+  virtual void OnURLRequestDestroyed(net::URLRequest* request) override {}
 
   virtual void OnPACScriptError(int line_number,
-                                const base::string16& error) OVERRIDE {}
+                                const base::string16& error) override {}
 
   virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired(
       net::URLRequest* request,
       const net::AuthChallengeInfo& auth_info,
       const AuthCallback& callback,
-      net::AuthCredentials* credentials) OVERRIDE {
+      net::AuthCredentials* credentials) override {
     return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;
   }
 
   virtual bool OnCanGetCookies(const net::URLRequest& request,
-                               const net::CookieList& cookie_list) OVERRIDE {
+                               const net::CookieList& cookie_list) override {
     return false;
   }
 
   virtual bool OnCanSetCookie(const net::URLRequest& request,
                               const std::string& cookie_line,
-                              net::CookieOptions* options) OVERRIDE {
+                              net::CookieOptions* options) override {
     return false;
   }
 
   virtual bool OnCanAccessFile(const net::URLRequest& request,
-                               const base::FilePath& path) const OVERRIDE {
+                               const base::FilePath& path) const override {
     return false;
   }
 
   virtual bool OnCanThrottleRequest(
-      const net::URLRequest& request) const OVERRIDE {
+      const net::URLRequest& request) const override {
     return false;
   }
 
   virtual int OnBeforeSocketStreamConnect(
       net::SocketStream* stream,
-      const net::CompletionCallback& callback) OVERRIDE {
+      const net::CompletionCallback& callback) override {
     return net::OK;
   }
 
diff --git a/components/cronet/android/url_request_context_adapter.h b/components/cronet/android/url_request_context_adapter.h
index 1bb2e70..22cc2a1 100644
--- a/components/cronet/android/url_request_context_adapter.h
+++ b/components/cronet/android/url_request_context_adapter.h
@@ -32,7 +32,7 @@ class NetLogObserver : public net::NetLog::ThreadSafeObserver {
 
   virtual ~NetLogObserver() {}
 
-  virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE;
+  virtual void OnAddEntry(const net::NetLog::Entry& entry) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetLogObserver);
@@ -59,9 +59,9 @@ class URLRequestContextAdapter : public net::URLRequestContextGetter {
   const std::string& GetUserAgent(const GURL& url) const;
 
   // net::URLRequestContextGetter implementation:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
-      const OVERRIDE;
+      const override;
 
   void StartNetLogToFile(const std::string& file_name);
   void StopNetLog();
diff --git a/components/cronet/android/wrapped_channel_upload_element_reader.h b/components/cronet/android/wrapped_channel_upload_element_reader.h
index 251a3ec..6731e53 100644
--- a/components/cronet/android/wrapped_channel_upload_element_reader.h
+++ b/components/cronet/android/wrapped_channel_upload_element_reader.h
@@ -29,13 +29,13 @@ class WrappedChannelElementReader : public net::UploadElementReader {
   virtual ~WrappedChannelElementReader();
 
   // UploadElementReader overrides:
-  virtual int Init(const net::CompletionCallback& callback) OVERRIDE;
-  virtual uint64 GetContentLength() const OVERRIDE;
-  virtual uint64 BytesRemaining() const OVERRIDE;
-  virtual bool IsInMemory() const OVERRIDE;
+  virtual int Init(const net::CompletionCallback& callback) override;
+  virtual uint64 GetContentLength() const override;
+  virtual uint64 BytesRemaining() const override;
+  virtual bool IsInMemory() const override;
   virtual int Read(net::IOBuffer* buf,
                    int buf_length,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
 
  private:
   const uint64 length_;
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc
index 9ad336b..535db8e 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc
@@ -100,15 +100,15 @@ class TestDataReductionProxyAuthRequestHandler
       : DataReductionProxyAuthRequestHandler(
             client, version, params, loop_proxy) {}
 
-  virtual std::string GetDefaultKey() const OVERRIDE {
+  virtual std::string GetDefaultKey() const override {
     return kTestKey;
   }
 
-  virtual base::Time Now() const OVERRIDE {
+  virtual base::Time Now() const override {
     return base::Time::UnixEpoch() + now_offset_;
   }
 
-  virtual void RandBytes(void* output, size_t length) OVERRIDE {
+  virtual 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/browser/data_reduction_proxy_config_service.h b/components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h
index 7c92938..e3b1f6e 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h
@@ -40,12 +40,12 @@ class DataReductionProxyConfigService
 
   // ProxyConfigService implementation:
   virtual void AddObserver(
-      net::ProxyConfigService::Observer* observer) OVERRIDE;
+      net::ProxyConfigService::Observer* observer) override;
   virtual void RemoveObserver(
-      net::ProxyConfigService::Observer* observer) OVERRIDE;
+      net::ProxyConfigService::Observer* observer) override;
   virtual ConfigAvailability GetLatestProxyConfig(
-      net::ProxyConfig* config) OVERRIDE;
-  virtual void OnLazyPoll() OVERRIDE;
+      net::ProxyConfig* config) override;
+  virtual void OnLazyPoll() override;
 
   // Method on IO thread that receives the data reduction proxy settings pushed
   // from DataReductionProxyConfiguratorImpl.
@@ -57,7 +57,7 @@ class DataReductionProxyConfigService
 
   // ProxyConfigService::Observer implementation:
   virtual void OnProxyConfigChanged(const net::ProxyConfig& config,
-                                    ConfigAvailability availability) OVERRIDE;
+                                    ConfigAvailability availability) override;
 
   // Makes sure that the observer registration with the base service is set up.
   void RegisterObserver();
@@ -100,10 +100,10 @@ class DataReductionProxyConfigTracker : public DataReductionProxyConfigurator {
                       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;
+                      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;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigServiceTest,
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_config_service_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_config_service_unittest.cc
index ad46684..916f569 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_config_service_unittest.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_config_service_unittest.cc
@@ -48,17 +48,17 @@ class TestProxyConfigService : public net::ProxyConfigService {
   }
 
   virtual void AddObserver(
-      net::ProxyConfigService::Observer* observer) OVERRIDE {
+      net::ProxyConfigService::Observer* observer) override {
     observers_.AddObserver(observer);
   }
 
   virtual void RemoveObserver(
-      net::ProxyConfigService::Observer* observer) OVERRIDE {
+      net::ProxyConfigService::Observer* observer) override {
     observers_.RemoveObserver(observer);
   }
 
   virtual ConfigAvailability GetLatestProxyConfig(
-      net::ProxyConfig* config) OVERRIDE {
+      net::ProxyConfig* config) override {
     *config = config_;
     return availability_;
   }
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_delegate.h b/components/data_reduction_proxy/browser/data_reduction_proxy_delegate.h
index 59a8b77..11831a4 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_delegate.h
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_delegate.h
@@ -33,23 +33,23 @@ class DataReductionProxyDelegate : public net::ProxyDelegate {
   virtual void OnResolveProxy(const GURL& url,
                               int load_flags,
                               const net::ProxyService& proxy_service,
-                              net::ProxyInfo* result) OVERRIDE;
+                              net::ProxyInfo* result) override;
 
   virtual void OnFallback(const net::ProxyServer& bad_proxy,
-                          int net_error) OVERRIDE;
+                          int net_error) override;
 
   virtual void OnBeforeSendHeaders(net::URLRequest* request,
                                    const net::ProxyInfo& proxy_info,
-                                   net::HttpRequestHeaders* headers) OVERRIDE;
+                                   net::HttpRequestHeaders* headers) override;
 
   virtual void OnBeforeTunnelRequest(
       const net::HostPortPair& proxy_server,
-      net::HttpRequestHeaders* extra_headers) OVERRIDE;
+      net::HttpRequestHeaders* extra_headers) override;
 
   virtual void OnTunnelHeadersReceived(
       const net::HostPortPair& origin,
       const net::HostPortPair& proxy_server,
-      const net::HttpResponseHeaders& response_headers) OVERRIDE;
+      const net::HttpResponseHeaders& response_headers) override;
 
  private:
   DataReductionProxyAuthRequestHandler* auth_handler_;
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_metrics_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_metrics_unittest.cc
index 26c0791..f5827ab 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_metrics_unittest.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_metrics_unittest.cc
@@ -40,7 +40,7 @@ class ChromeNetworkDataSavingMetricsTest : public testing::Test {
  protected:
   ChromeNetworkDataSavingMetricsTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     statistics_prefs_.reset(new DataReductionProxyStatisticsPrefs(
         &pref_service_,
         scoped_refptr<base::TestSimpleTaskRunner>(
@@ -136,7 +136,7 @@ class ChromeNetworkDailyDataSavingMetricsTest
     base::Time::FromString(kLastUpdateTime, &now_);
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeNetworkDataSavingMetricsTest::SetUp();
 
     // Only create two lists in Setup to test that adding new lists is fine.
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_params_test_utils.h b/components/data_reduction_proxy/browser/data_reduction_proxy_params_test_utils.h
index c0427ed..30da1f1 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_params_test_utils.h
+++ b/components/data_reduction_proxy/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;
+  virtual std::string GetDefaultDevOrigin() const override;
 
-  virtual std::string GetDefaultDevFallbackOrigin() const OVERRIDE;
+  virtual std::string GetDefaultDevFallbackOrigin() const override;
 
-  virtual std::string GetDefaultOrigin() const OVERRIDE;
+  virtual std::string GetDefaultOrigin() const override;
 
-  virtual std::string GetDefaultFallbackOrigin() const OVERRIDE;
+  virtual std::string GetDefaultFallbackOrigin() const override;
 
-  virtual std::string GetDefaultSSLOrigin() const OVERRIDE;
+  virtual std::string GetDefaultSSLOrigin() const override;
 
-  virtual std::string GetDefaultAltOrigin() const OVERRIDE;
+  virtual std::string GetDefaultAltOrigin() const override;
 
-  virtual std::string GetDefaultAltFallbackOrigin() const OVERRIDE;
+  virtual std::string GetDefaultAltFallbackOrigin() const override;
 
-  virtual std::string GetDefaultProbeURL() const OVERRIDE;
+  virtual std::string GetDefaultProbeURL() const override;
 
  private:
   std::string GetDefinition(unsigned int has_def,
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc
index 409e4a8..46ccafe 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_protocol_unittest.cc
@@ -59,7 +59,7 @@ class TestDataReductionProxyNetworkDelegate : public net::NetworkDelegate {
       const net::CompletionCallback& callback,
       const HttpResponseHeaders* original_response_headers,
       scoped_refptr<HttpResponseHeaders>* override_response_headers,
-      GURL* allowed_unsafe_redirect_url) OVERRIDE {
+      GURL* allowed_unsafe_redirect_url) override {
     data_reduction_proxy::MaybeBypassProxyAndPrepareToRetry(
         test_data_reduction_proxy_params_,
         request,
@@ -813,7 +813,7 @@ class BadEntropyProvider : public base::FieldTrial::EntropyProvider {
   virtual ~BadEntropyProvider() {}
 
   virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const OVERRIDE {
+                                    uint32 randomization_seed) const override {
     return 0.5;
   }
 };
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
index fdb57c6..91a17dc 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
@@ -179,7 +179,7 @@ class DataReductionProxySettings
   ContentLengthList GetDailyContentLengths(const char* pref_name);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  protected:
   void InitPrefMembers();
@@ -269,7 +269,7 @@ class DataReductionProxySettings
                            TestSetProxyConfigsHoldback);
 
   // NetworkChangeNotifier::IPAddressObserver:
-  virtual void OnIPAddressChanged() OVERRIDE;
+  virtual void OnIPAddressChanged() override;
 
   void OnProxyEnabledPrefChange();
   void OnProxyAlternativeEnabledPrefChange();
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h
index b170e89..10b6a82 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h
@@ -32,10 +32,10 @@ class TestDataReductionProxyConfig : public DataReductionProxyConfigurator {
                       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 {}
+                      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 {}
 
   // True if the proxy has been enabled, i.e., only after |Enable| has been
   // called. Defaults to false.
@@ -86,12 +86,12 @@ class MockDataReductionProxySettings : public C {
   virtual void SetProxyConfigs(bool enabled,
                                bool alternative_enabled,
                                bool restricted,
-                               bool at_startup) OVERRIDE {
+                               bool at_startup) override {
     EXPECT_CALL(*this, LogProxyState(enabled, restricted, at_startup)).Times(1);
     C::SetProxyConfigs(enabled, alternative_enabled, restricted, at_startup);
   }
   virtual void GetNetworkList(net::NetworkInterfaceList* interfaces,
-                              int policy) OVERRIDE {
+                              int policy) override {
     if (!network_interfaces_.get())
       return;
     for (size_t i = 0; i < network_interfaces_->size(); ++i)
@@ -114,7 +114,7 @@ class DataReductionProxySettingsTestBase : public testing::Test {
 
   void AddProxyToCommandLine();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   template <class C> void ResetSettings(bool allowed,
                                         bool fallback_allowed,
@@ -181,7 +181,7 @@ class ConcreteDataReductionProxySettingsTest
                              bool fallback_allowed,
                              bool alt_allowed,
                              bool promo_allowed,
-                             bool holdback) OVERRIDE {
+                             bool holdback) override {
     return DataReductionProxySettingsTestBase::ResetSettings<C>(
         allowed, fallback_allowed, alt_allowed, promo_allowed, holdback);
   }
@@ -190,7 +190,7 @@ class ConcreteDataReductionProxySettingsTest
                               const std::string& response,
                               ProbeURLFetchResult result,
                               bool success,
-                              int expected_calls) OVERRIDE {
+                              int expected_calls) override {
     return DataReductionProxySettingsTestBase::SetProbeResult<C>(
         test_url,
         response,
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs_unittest.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs_unittest.cc
index 4b29fe6..5072960 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs_unittest.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs_unittest.cc
@@ -38,7 +38,7 @@ class DataReductionProxyStatisticsPrefsTest : public testing::Test {
       : task_runner_(scoped_refptr<base::TestSimpleTaskRunner>(
             new base::TestSimpleTaskRunner())) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     RegisterPrefs(simple_pref_service_.registry());
   }
 
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h b/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h
index b56abc6..ea1d0c1 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h
@@ -109,7 +109,7 @@ class DataReductionProxyUsageStats
 
   // NetworkChangeNotifier::NetworkChangeObserver:
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   // Called when request counts change. Resets counts if they exceed thresholds,
   // and calls MaybeNotifyUnavailability otherwise.
diff --git a/components/dom_distiller/content/distiller_page_web_contents.h b/components/dom_distiller/content/distiller_page_web_contents.h
index a7e5a29..a5a46c3 100644
--- a/components/dom_distiller/content/distiller_page_web_contents.h
+++ b/components/dom_distiller/content/distiller_page_web_contents.h
@@ -37,9 +37,9 @@ class DistillerPageWebContentsFactory : public DistillerPageFactory {
   virtual ~DistillerPageWebContentsFactory() {}
 
   virtual scoped_ptr<DistillerPage> CreateDistillerPage(
-      const gfx::Size& render_view_size) const OVERRIDE;
+      const gfx::Size& render_view_size) const override;
   virtual scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
-      scoped_ptr<SourcePageHandle> handle) const OVERRIDE;
+      scoped_ptr<SourcePageHandle> handle) const override;
 
  private:
   content::BrowserContext* browser_context_;
@@ -57,20 +57,20 @@ class DistillerPageWebContents : public DistillerPage,
 
   // content::WebContentsDelegate implementation.
   virtual gfx::Size GetSizeForNewRenderView(
-      content::WebContents* web_contents) const OVERRIDE;
+      content::WebContents* web_contents) const override;
 
   // content::WebContentsObserver implementation.
   virtual void DocumentLoadedInFrame(
-      content::RenderFrameHost* render_frame_host) OVERRIDE;
+      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;
+                           const base::string16& error_description) override;
 
  protected:
   virtual void DistillPageImpl(const GURL& url,
-                               const std::string& script) OVERRIDE;
+                               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 432c958..5a96d14 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 {
+  virtual 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 {
+  virtual 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
@@ -145,7 +145,7 @@ class WebContentsMainFrameHelper : public content::WebContentsObserver {
   virtual void DidCommitProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& url,
-      ui::PageTransition transition_type) OVERRIDE {
+      ui::PageTransition transition_type) override {
     if (wait_for_document_loaded_)
       return;
     if (!render_frame_host->GetParent())
@@ -153,7 +153,7 @@ class WebContentsMainFrameHelper : public content::WebContentsObserver {
   }
 
   virtual void DocumentLoadedInFrame(
-      content::RenderFrameHost* render_frame_host) OVERRIDE {
+      content::RenderFrameHost* render_frame_host) override {
     if (wait_for_document_loaded_) {
       if (!render_frame_host->GetParent())
         callback_.Run();
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source.cc b/components/dom_distiller/content/dom_distiller_viewer_source.cc
index ed51c47..9c844d6 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/dom_distiller_viewer_source.cc
@@ -48,21 +48,21 @@ class DomDistillerViewerSource::RequestViewerHandle
 
   // ViewRequestDelegate implementation:
   virtual void OnArticleReady(
-      const DistilledArticleProto* article_proto) OVERRIDE;
+      const DistilledArticleProto* article_proto) override;
 
   virtual void OnArticleUpdated(
-      ArticleDistillationUpdate article_update) OVERRIDE;
+      ArticleDistillationUpdate article_update) override;
 
   void TakeViewerHandle(scoped_ptr<ViewerHandle> viewer_handle);
 
   // content::WebContentsObserver implementation:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
+      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;
+                             const GURL& validated_url) override;
 
  private:
   // Sends JavaScript to the attached Viewer, buffering data if the viewer isn't
@@ -76,8 +76,8 @@ class DomDistillerViewerSource::RequestViewerHandle
 
   // DistilledPagePrefs::Observer implementation:
   virtual void OnChangeFontFamily(
-      DistilledPagePrefs::FontFamily new_font_family) OVERRIDE;
-  virtual void OnChangeTheme(DistilledPagePrefs::Theme new_theme) OVERRIDE;
+      DistilledPagePrefs::FontFamily new_font_family) override;
+  virtual 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 3f579a1..d9eaf9f 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source.h
+++ b/components/dom_distiller/content/dom_distiller_viewer_source.h
@@ -28,18 +28,18 @@ class DomDistillerViewerSource : public content::URLDataSource {
   class RequestViewerHandle;
 
   // Overridden from content::URLDataSource:
-  virtual std::string GetSource() const OVERRIDE;
+  virtual std::string GetSource() const override;
   virtual 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;
+      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;
+      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* path) const override;
+  virtual std::string GetContentSecurityPolicyObjectSrc() const override;
 
  private:
   friend class DomDistillerViewerSourceTest;
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc b/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc
index 55e5b4b..7d7e8bf 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc
+++ b/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc
@@ -13,7 +13,7 @@ const char kTestScheme[] = "myscheme";
 
 class DomDistillerViewerSourceTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     source_.reset(new DomDistillerViewerSource(NULL, kTestScheme));
   }
 
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 ff24452..7d9a85b 100644
--- a/components/dom_distiller/content/web_contents_main_frame_observer.h
+++ b/components/dom_distiller/content/web_contents_main_frame_observer.h
@@ -28,11 +28,11 @@ class WebContentsMainFrameObserver
 
   // content::WebContentsObserver implementation.
   virtual void DocumentLoadedInFrame(
-      content::RenderFrameHost* render_frame_host) OVERRIDE;
+      content::RenderFrameHost* render_frame_host) override;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
+  virtual 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 ea69ea6..4312b01 100644
--- a/components/dom_distiller/core/distilled_content_store.h
+++ b/components/dom_distiller/core/distilled_content_store.h
@@ -50,9 +50,9 @@ class InMemoryContentStore : public DistilledContentStore {
   // DistilledContentStore implementation
   virtual void SaveContent(const ArticleEntry& entry,
                            const DistilledArticleProto& proto,
-                           SaveCallback callback) OVERRIDE;
+                           SaveCallback callback) override;
   virtual void LoadContent(const ArticleEntry& entry,
-                           LoadCallback callback) OVERRIDE;
+                           LoadCallback callback) override;
 
   // Synchronously saves the content.
   void InjectContent(const ArticleEntry& entry,
diff --git a/components/dom_distiller/core/distilled_content_store_unittest.cc b/components/dom_distiller/core/distilled_content_store_unittest.cc
index f5a43b4..dced364 100644
--- a/components/dom_distiller/core/distilled_content_store_unittest.cc
+++ b/components/dom_distiller/core/distilled_content_store_unittest.cc
@@ -59,7 +59,7 @@ class InMemoryContentStoreTest : public testing::Test {
 
  protected:
   // testing::Test implementation:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     store_.reset(new InMemoryContentStore(kDefaultMaxNumCachedEntries));
     save_success_ = false;
     load_success_ = false;
diff --git a/components/dom_distiller/core/distilled_page_prefs_android.h b/components/dom_distiller/core/distilled_page_prefs_android.h
index cc7f921..bcb96c2 100644
--- a/components/dom_distiller/core/distilled_page_prefs_android.h
+++ b/components/dom_distiller/core/distilled_page_prefs_android.h
@@ -41,8 +41,8 @@ class DistilledPagePrefsObserverAndroid : public DistilledPagePrefs::Observer {
 
   // DistilledPagePrefs::Observer implementation.
   virtual void OnChangeFontFamily(
-      DistilledPagePrefs::FontFamily new_font_family) OVERRIDE;
-  virtual void OnChangeTheme(DistilledPagePrefs::Theme new_theme) OVERRIDE;
+      DistilledPagePrefs::FontFamily new_font_family) override;
+  virtual void OnChangeTheme(DistilledPagePrefs::Theme new_theme) override;
 
   virtual void DestroyObserverAndroid(JNIEnv* env, jobject obj);
 
diff --git a/components/dom_distiller/core/distilled_page_prefs_unittests.cc b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
index fe9df73..665fbc9 100644
--- a/components/dom_distiller/core/distilled_page_prefs_unittests.cc
+++ b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
@@ -20,13 +20,13 @@ class TestingObserver : public DistilledPagePrefs::Observer {
         theme_(DistilledPagePrefs::LIGHT) {}
 
   virtual void OnChangeFontFamily(
-      DistilledPagePrefs::FontFamily new_font) OVERRIDE {
+      DistilledPagePrefs::FontFamily new_font) override {
     font_ = new_font;
   }
 
   DistilledPagePrefs::FontFamily GetFontFamily() { return font_; }
 
-  virtual void OnChangeTheme(DistilledPagePrefs::Theme new_theme) OVERRIDE {
+  virtual void OnChangeTheme(DistilledPagePrefs::Theme new_theme) override {
     theme_ = new_theme;
   }
 
@@ -41,7 +41,7 @@ class TestingObserver : public DistilledPagePrefs::Observer {
 
 class DistilledPagePrefsTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     pref_service_.reset(new user_prefs::TestingPrefServiceSyncable());
     DistilledPagePrefs::RegisterProfilePrefs(pref_service_->registry());
     distilled_page_prefs_.reset(new DistilledPagePrefs(pref_service_.get()));
diff --git a/components/dom_distiller/core/distiller.h b/components/dom_distiller/core/distiller.h
index 9adb4bb..425eed8 100644
--- a/components/dom_distiller/core/distiller.h
+++ b/components/dom_distiller/core/distiller.h
@@ -59,7 +59,7 @@ class DistillerFactoryImpl : public DistillerFactory {
       scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory,
       const dom_distiller::proto::DomDistillerOptions& dom_distiller_options);
   virtual ~DistillerFactoryImpl();
-  virtual scoped_ptr<Distiller> CreateDistiller() OVERRIDE;
+  virtual scoped_ptr<Distiller> CreateDistiller() override;
 
  private:
   scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory_;
@@ -78,7 +78,7 @@ class DistillerImpl : public Distiller {
       const GURL& url,
       scoped_ptr<DistillerPage> distiller_page,
       const DistillationFinishedCallback& finished_cb,
-      const DistillationUpdateCallback& update_cb) OVERRIDE;
+      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 e3378be..573818c 100644
--- a/components/dom_distiller/core/distiller_unittest.cc
+++ b/components/dom_distiller/core/distiller_unittest.cc
@@ -201,7 +201,7 @@ class TestDistillerURLFetcher : public DistillerURLFetcher {
   }
 
   virtual void FetchURL(const string& url,
-                        const URLFetcherCallback& callback) OVERRIDE {
+                        const URLFetcherCallback& callback) override {
     ASSERT_FALSE(callback.is_null());
     url_ = url;
     callback_ = callback;
@@ -229,7 +229,7 @@ class TestDistillerURLFetcherFactory : public DistillerURLFetcherFactory {
   TestDistillerURLFetcherFactory() : DistillerURLFetcherFactory(NULL) {}
 
   virtual ~TestDistillerURLFetcherFactory() {}
-  virtual DistillerURLFetcher* CreateDistillerURLFetcher() const OVERRIDE {
+  virtual 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 346f12e..203136d 100644
--- a/components/dom_distiller/core/distiller_url_fetcher.h
+++ b/components/dom_distiller/core/distiller_url_fetcher.h
@@ -49,7 +49,7 @@ class DistillerURLFetcher : public net::URLFetcherDelegate {
 
  private:
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   scoped_ptr<net::URLFetcher> url_fetcher_;
   URLFetcherCallback callback_;
diff --git a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
index 0f27452..d2b69b1 100644
--- a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
+++ b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
@@ -28,7 +28,7 @@ class DistillerURLFetcherTest : public testing::Test {
 
  protected:
   // testing::Test implementation:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     url_fetcher_.reset(new dom_distiller::DistillerURLFetcher(NULL));
     factory_.reset(new net::FakeURLFetcherFactory(NULL));
     factory_->SetFakeResponse(
diff --git a/components/dom_distiller/core/dom_distiller_service.h b/components/dom_distiller/core/dom_distiller_service.h
index bbf64e6..182cfb3 100644
--- a/components/dom_distiller/core/dom_distiller_service.h
+++ b/components/dom_distiller/core/dom_distiller_service.h
@@ -121,31 +121,31 @@ class DomDistillerService : public DomDistillerServiceInterface {
   virtual ~DomDistillerService();
 
   // DomDistillerServiceInterface implementation.
-  virtual syncer::SyncableService* GetSyncableService() const OVERRIDE;
+  virtual syncer::SyncableService* GetSyncableService() const override;
   virtual 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;
+      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;
+      const std::string& entry_id) override;
   virtual scoped_ptr<ViewerHandle> ViewEntry(
       ViewRequestDelegate* delegate,
       scoped_ptr<DistillerPage> distiller_page,
-      const std::string& entry_id) OVERRIDE;
+      const std::string& entry_id) override;
   virtual scoped_ptr<ViewerHandle> ViewUrl(
       ViewRequestDelegate* delegate,
       scoped_ptr<DistillerPage> distiller_page,
-      const GURL& url) OVERRIDE;
+      const GURL& url) override;
   virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPage(
-      const gfx::Size& render_view_size) OVERRIDE;
+      const gfx::Size& render_view_size) override;
   virtual 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;
+      scoped_ptr<SourcePageHandle> handle) override;
+  virtual void AddObserver(DomDistillerObserver* observer) override;
+  virtual void RemoveObserver(DomDistillerObserver* observer) override;
+  virtual 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 7e24f38..563927b 100644
--- a/components/dom_distiller/core/dom_distiller_store.h
+++ b/components/dom_distiller/core/dom_distiller_store.h
@@ -95,28 +95,28 @@ class DomDistillerStore : public syncer::SyncableService,
   virtual ~DomDistillerStore();
 
   // 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 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;
+                            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 implementation.
   virtual 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;
+      scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
+  virtual void StopSyncing(syncer::ModelType type) override;
   virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE;
+      syncer::ModelType type) const override;
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
 
  private:
   void OnDatabaseInit(bool success);
diff --git a/components/dom_distiller/core/dom_distiller_store_unittest.cc b/components/dom_distiller/core/dom_distiller_store_unittest.cc
index aeb11b5..0f22163 100644
--- a/components/dom_distiller/core/dom_distiller_store_unittest.cc
+++ b/components/dom_distiller/core/dom_distiller_store_unittest.cc
@@ -50,7 +50,7 @@ class FakeSyncErrorFactory : public syncer::SyncErrorFactory {
  public:
   virtual syncer::SyncError CreateAndUploadError(
       const tracked_objects::Location& location,
-      const std::string& message) OVERRIDE {
+      const std::string& message) override {
     return syncer::SyncError();
   }
 };
@@ -60,14 +60,14 @@ class FakeSyncChangeProcessor : public syncer::SyncChangeProcessor {
   explicit FakeSyncChangeProcessor(EntryMap* model) : model_(model) {}
 
   virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE {
+      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 {
+      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/core/dom_distiller_test_util.h b/components/dom_distiller/core/dom_distiller_test_util.h
index dca8fcb..3b7ecd4 100644
--- a/components/dom_distiller/core/dom_distiller_test_util.h
+++ b/components/dom_distiller/core/dom_distiller_test_util.h
@@ -28,9 +28,9 @@ class ObserverUpdatesMatcher
   // MatcherInterface overrides.
   virtual bool MatchAndExplain(
       const std::vector<DomDistillerObserver::ArticleUpdate>& actual_updates,
-      testing::MatchResultListener* listener) const OVERRIDE;
-  virtual void DescribeTo(std::ostream* os) const OVERRIDE;
-  virtual void DescribeNegationTo(std::ostream* os) const OVERRIDE;
+      testing::MatchResultListener* listener) const override;
+  virtual void DescribeTo(std::ostream* os) const override;
+  virtual void DescribeNegationTo(std::ostream* os) const override;
 
  private:
   void DescribeUpdates(std::ostream* os) const;
diff --git a/components/dom_distiller/core/fake_distiller.h b/components/dom_distiller/core/fake_distiller.h
index 62cbcd7..f7d96d7 100644
--- a/components/dom_distiller/core/fake_distiller.h
+++ b/components/dom_distiller/core/fake_distiller.h
@@ -22,7 +22,7 @@ class MockDistillerFactory : public DistillerFactory {
   MockDistillerFactory();
   virtual ~MockDistillerFactory();
   MOCK_METHOD0(CreateDistillerImpl, Distiller*());
-  virtual scoped_ptr<Distiller> CreateDistiller() OVERRIDE {
+  virtual scoped_ptr<Distiller> CreateDistiller() override {
     return scoped_ptr<Distiller>(CreateDistillerImpl());
   }
 };
@@ -44,7 +44,7 @@ class FakeDistiller : public Distiller {
       const GURL& url,
       scoped_ptr<DistillerPage> distiller_page,
       const DistillationFinishedCallback& article_callback,
-      const DistillationUpdateCallback& page_callback) OVERRIDE;
+      const DistillationUpdateCallback& page_callback) override;
 
   void RunDistillerCallback(scoped_ptr<DistilledArticleProto> proto);
   void RunDistillerUpdateCallback(const ArticleDistillationUpdate& update);
diff --git a/components/dom_distiller/core/fake_distiller_page.h b/components/dom_distiller/core/fake_distiller_page.h
index afe4a45..b1df4e8 100644
--- a/components/dom_distiller/core/fake_distiller_page.h
+++ b/components/dom_distiller/core/fake_distiller_page.h
@@ -17,11 +17,11 @@ class MockDistillerPageFactory : public DistillerPageFactory {
   virtual ~MockDistillerPageFactory();
   MOCK_CONST_METHOD0(CreateDistillerPageImpl, DistillerPage*());
   virtual scoped_ptr<DistillerPage> CreateDistillerPage(
-      const gfx::Size& render_view_size) const OVERRIDE {
+      const gfx::Size& render_view_size) const override {
     return scoped_ptr<DistillerPage>(CreateDistillerPageImpl());
   }
   virtual scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
-      scoped_ptr<SourcePageHandle> handle) const OVERRIDE {
+      scoped_ptr<SourcePageHandle> handle) const override {
     return scoped_ptr<DistillerPage>(CreateDistillerPageImpl());
   }
 };
diff --git a/components/dom_distiller/core/task_tracker_unittest.cc b/components/dom_distiller/core/task_tracker_unittest.cc
index 0f2a4b7..435d040 100644
--- a/components/dom_distiller/core/task_tracker_unittest.cc
+++ b/components/dom_distiller/core/task_tracker_unittest.cc
@@ -57,7 +57,7 @@ class MockSaveCallback {
 
 class DomDistillerTaskTrackerTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_.reset(new base::MessageLoop());
     entry_id_ = "id0";
     page_0_url_ = GURL("http://www.example.com/1");
diff --git a/components/dom_distiller/core/viewer_unittest.cc b/components/dom_distiller/core/viewer_unittest.cc
index 15c839d..75080b8 100644
--- a/components/dom_distiller/core/viewer_unittest.cc
+++ b/components/dom_distiller/core/viewer_unittest.cc
@@ -70,12 +70,12 @@ class TestDomDistillerService : public DomDistillerServiceInterface {
       scoped_ptr<SourcePageHandle> handle) {
     return scoped_ptr<DistillerPage>();
   }
-  virtual DistilledPagePrefs* GetDistilledPagePrefs() OVERRIDE;
+  virtual DistilledPagePrefs* GetDistilledPagePrefs() override;
 };
 
 class DomDistillerViewerTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     service_.reset(new TestDomDistillerService());
   }
 
diff --git a/components/dom_distiller/standalone/content_extractor.cc b/components/dom_distiller/standalone/content_extractor.cc
index 8e83963..f6e3278 100644
--- a/components/dom_distiller/standalone/content_extractor.cc
+++ b/components/dom_distiller/standalone/content_extractor.cc
@@ -200,10 +200,10 @@ class ContentExtractionRequest : public ViewRequestDelegate {
   ContentExtractionRequest(const GURL& url) : url_(url) {}
 
   virtual void OnArticleUpdated(ArticleDistillationUpdate article_update)
-      OVERRIDE {}
+      override {}
 
   virtual void OnArticleReady(const DistilledArticleProto* article_proto)
-      OVERRIDE {
+      override {
     article_proto_ = article_proto;
     CHECK(article_proto->pages_size()) << "Failed extracting " << url_;
     base::MessageLoop::current()->PostTask(
@@ -229,7 +229,7 @@ class ContentExtractor : public ContentBrowserTest {
 
   // Change behavior of the default host resolver to avoid DNS lookup errors, so
   // we can make network calls.
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     if (!CommandLine::ForCurrentProcess()->HasSwitch(kDisableDnsSwitch)) {
       EnableDNSLookupForThisTest();
     }
@@ -237,7 +237,7 @@ class ContentExtractor : public ContentBrowserTest {
     AddComponentsResources();
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     DisableDNSLookupForThisTest();
   }
 
diff --git a/components/dom_distiller/webui/dom_distiller_handler.h b/components/dom_distiller/webui/dom_distiller_handler.h
index 09d39da..b0aa026 100644
--- a/components/dom_distiller/webui/dom_distiller_handler.h
+++ b/components/dom_distiller/webui/dom_distiller_handler.h
@@ -23,7 +23,7 @@ class DomDistillerHandler : public content::WebUIMessageHandler {
   virtual ~DomDistillerHandler();
 
   // content::WebUIMessageHandler implementation.
-  virtual void RegisterMessages() OVERRIDE;
+  virtual 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/domain_reliability/service.cc b/components/domain_reliability/service.cc
index 13eca0d..b8afff3 100644
--- a/components/domain_reliability/service.cc
+++ b/components/domain_reliability/service.cc
@@ -42,7 +42,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
   virtual scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
       PrefService* local_state_pref_service,
-      const char* reporting_pref_name) OVERRIDE {
+      const char* reporting_pref_name) override {
     DCHECK(!network_task_runner_.get());
 
     scoped_ptr<DomainReliabilityMonitor> monitor(
@@ -59,7 +59,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
   }
 
   virtual void ClearBrowsingData(DomainReliabilityClearMode clear_mode,
-                                 const base::Closure& callback) OVERRIDE {
+                                 const base::Closure& callback) override {
     DCHECK(network_task_runner_.get());
 
     network_task_runner_->PostTaskAndReply(
@@ -72,7 +72,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
 
   virtual void GetWebUIData(
       const base::Callback<void(scoped_ptr<base::Value>)>& callback)
-      const OVERRIDE {
+      const override {
     DCHECK(network_task_runner_.get());
 
     PostTaskAndReplyWithResult(
diff --git a/components/domain_reliability/test_util.cc b/components/domain_reliability/test_util.cc
index 1a5c836..49d9807 100644
--- a/components/domain_reliability/test_util.cc
+++ b/components/domain_reliability/test_util.cc
@@ -29,7 +29,7 @@ class MockTimer : public MockableTime::Timer {
   // MockableTime::Timer implementation:
   virtual void Start(const tracked_objects::Location& posted_from,
                      base::TimeDelta delay,
-                     const base::Closure& user_task) OVERRIDE {
+                     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 {
+  virtual void Stop() override {
     if (running_) {
       ++callback_sequence_number_;
       running_ = false;
     }
   }
 
-  virtual bool IsRunning() OVERRIDE { return running_; }
+  virtual 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 a53664d..d8ac1b6 100644
--- a/components/domain_reliability/test_util.h
+++ b/components/domain_reliability/test_util.h
@@ -53,9 +53,9 @@ class MockUploader : public DomainReliabilityUploader {
   // DomainReliabilityUploader implementation:
   virtual void UploadReport(const std::string& report_json,
                             const GURL& upload_url,
-                            const UploadCallback& callback) OVERRIDE;
+                            const UploadCallback& callback) override;
 
-  virtual void set_discard_uploads(bool discard_uploads) OVERRIDE;
+  virtual void set_discard_uploads(bool discard_uploads) override;
 
  private:
   UploadRequestCallback callback_;
@@ -72,9 +72,9 @@ class MockTime : public MockableTime {
   virtual ~MockTime();
 
   // MockableTime implementation:
-  virtual base::Time Now() OVERRIDE;
-  virtual base::TimeTicks NowTicks() OVERRIDE;
-  virtual scoped_ptr<MockableTime::Timer> CreateTimer() OVERRIDE;
+  virtual base::Time Now() override;
+  virtual base::TimeTicks NowTicks() override;
+  virtual 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 b00b550..3a9e7b0 100644
--- a/components/domain_reliability/uploader.cc
+++ b/components/domain_reliability/uploader.cc
@@ -56,7 +56,7 @@ class DomainReliabilityUploaderImpl
   virtual void UploadReport(
       const std::string& report_json,
       const GURL& upload_url,
-      const DomainReliabilityUploader::UploadCallback& callback) OVERRIDE {
+      const DomainReliabilityUploader::UploadCallback& callback) override {
     VLOG(1) << "Uploading report to " << upload_url;
     VLOG(2) << "Report JSON: " << report_json;
 
@@ -81,14 +81,14 @@ class DomainReliabilityUploaderImpl
     upload_callbacks_[fetcher] = callback;
   }
 
-  virtual void set_discard_uploads(bool discard_uploads) OVERRIDE {
+  virtual 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 {
+      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 1fc38ba..c7b83b2 100644
--- a/components/domain_reliability/util.cc
+++ b/components/domain_reliability/util.cc
@@ -25,15 +25,15 @@ class ActualTimer : public MockableTime::Timer {
   // MockableTime::Timer implementation:
   virtual void Start(const tracked_objects::Location& posted_from,
                      base::TimeDelta delay,
-                     const base::Closure& user_task) OVERRIDE {
+                     const base::Closure& user_task) override {
     base_timer_.Start(posted_from, delay, user_task);
   }
 
-  virtual void Stop() OVERRIDE {
+  virtual void Stop() override {
     base_timer_.Stop();
   }
 
-  virtual bool IsRunning() OVERRIDE {
+  virtual bool IsRunning() override {
     return base_timer_.IsRunning();
   }
 
diff --git a/components/domain_reliability/util.h b/components/domain_reliability/util.h
index bbb0243..6b142c6 100644
--- a/components/domain_reliability/util.h
+++ b/components/domain_reliability/util.h
@@ -77,9 +77,9 @@ class DOMAIN_RELIABILITY_EXPORT ActualTime : public MockableTime {
   virtual ~ActualTime();
 
   // MockableTime implementation:
-  virtual base::Time Now() OVERRIDE;
-  virtual base::TimeTicks NowTicks() OVERRIDE;
-  virtual scoped_ptr<MockableTime::Timer> CreateTimer() OVERRIDE;
+  virtual base::Time Now() override;
+  virtual base::TimeTicks NowTicks() override;
+  virtual 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 a67211d..67abac7 100644
--- a/components/enhanced_bookmarks/bookmark_image_service.h
+++ b/components/enhanced_bookmarks/bookmark_image_service.h
@@ -39,7 +39,7 @@ class BookmarkImageService : public KeyedService,
   typedef base::Callback<void(const gfx::Image&, const GURL& url)> Callback;
 
   // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  virtual 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
@@ -53,28 +53,28 @@ class BookmarkImageService : public KeyedService,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
+                                   bool ids_reassigned) override;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE;
+                                 int new_index) override;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE;
+                                 int index) override;
   virtual void OnWillChangeBookmarkNode(BookmarkModel* model,
-                                        const BookmarkNode* node) OVERRIDE;
+                                        const BookmarkNode* node) override;
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE;
+                                   const BookmarkNode* node) override;
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE;
+                                          const BookmarkNode* node) override;
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) OVERRIDE;
+                                             const BookmarkNode* node) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      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_search_service.h b/components/enhanced_bookmarks/bookmark_server_search_service.h
index 847c85f..94ea943 100644
--- a/components/enhanced_bookmarks/bookmark_server_search_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_search_service.h
@@ -39,22 +39,22 @@ class BookmarkServerSearchService : public BookmarkServerService {
 
  protected:
 
-  virtual net::URLFetcher* CreateFetcher() OVERRIDE;
+  virtual net::URLFetcher* CreateFetcher() override;
 
   virtual bool ProcessResponse(const std::string& response,
-                               bool* should_notify) OVERRIDE;
+                               bool* should_notify) override;
 
-  virtual void CleanAfterFailure() OVERRIDE;
+  virtual 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 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;
+      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 041b5c6..8df0e2f 100644
--- a/components/enhanced_bookmarks/bookmark_server_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_service.h
@@ -77,7 +77,7 @@ class BookmarkServerService : protected net::URLFetcherDelegate,
   virtual void CleanAfterFailure() = 0;
 
   // EnhancedBookmarkModelObserver:
-  virtual void EnhancedBookmarkModelShuttingDown() OVERRIDE;
+  virtual void EnhancedBookmarkModelShuttingDown() override;
 
   SigninManagerBase* GetSigninManager();
 
@@ -90,14 +90,14 @@ class BookmarkServerService : protected net::URLFetcherDelegate,
                            ClearClusterMapOnRemoveAllBookmarks);
 
   // net::URLFetcherDelegate methods. Called when the query is finished.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
   // The observers.
   ObserverList<BookmarkServerServiceObserver> observers_;
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_model.h b/components/enhanced_bookmarks/enhanced_bookmark_model.h
index c37298589..70fe42e 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model.h
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model.h
@@ -38,7 +38,7 @@ class EnhancedBookmarkModel : public KeyedService,
                         const std::string& version);
   virtual ~EnhancedBookmarkModel();
 
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   void AddObserver(EnhancedBookmarkModelObserver* observer);
   void RemoveObserver(EnhancedBookmarkModelObserver* observer);
@@ -134,24 +134,24 @@ class EnhancedBookmarkModel : public KeyedService,
   typedef std::map<const BookmarkNode*, std::string> NodeToIdMap;
 
   // BaseBookmarkModelObserver:
-  virtual void BookmarkModelChanged() OVERRIDE;
+  virtual void BookmarkModelChanged() override;
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
+                                   bool ids_reassigned) override;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE;
+                                 int index) override;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void OnWillChangeBookmarkMetaInfo(BookmarkModel* model,
-                                            const BookmarkNode* node) OVERRIDE;
+                                            const BookmarkNode* node) override;
   virtual void BookmarkMetaInfoChanged(BookmarkModel* model,
-                                       const BookmarkNode* node) OVERRIDE;
+                                       const BookmarkNode* node) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      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 e7d6eff..b2c0aae 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_model_unittest.cc
@@ -41,7 +41,7 @@ class EnhancedBookmarkModelTest
         last_remote_id_node_(NULL) {}
   virtual ~EnhancedBookmarkModelTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
     bookmark_client_.reset(new bookmarks::TestBookmarkClient());
     bookmark_model_.reset(bookmark_client_->CreateModel().release());
@@ -49,7 +49,7 @@ class EnhancedBookmarkModelTest
     model_->AddObserver(this);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (model_)
       model_->Shutdown();
     model_.reset();
@@ -107,25 +107,25 @@ class EnhancedBookmarkModelTest
   scoped_ptr<EnhancedBookmarkModel> model_;
 
   // EnhancedBookmarkModelObserver implementation:
-  virtual void EnhancedBookmarkModelLoaded() OVERRIDE { loaded_calls_++; }
-  virtual void EnhancedBookmarkModelShuttingDown() OVERRIDE {
+  virtual void EnhancedBookmarkModelLoaded() override { loaded_calls_++; }
+  virtual void EnhancedBookmarkModelShuttingDown() override {
     shutting_down_calls_++;
   }
-  virtual void EnhancedBookmarkAdded(const BookmarkNode* node) OVERRIDE {
+  virtual void EnhancedBookmarkAdded(const BookmarkNode* node) override {
     added_calls_++;
     last_added_ = node;
   }
-  virtual void EnhancedBookmarkRemoved(const BookmarkNode* node) OVERRIDE {
+  virtual void EnhancedBookmarkRemoved(const BookmarkNode* node) override {
     removed_calls_++;
     last_removed_ = node;
   }
-  virtual void EnhancedBookmarkAllUserNodesRemoved() OVERRIDE {
+  virtual 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 {
+      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/image_store_ios_unittest.mm b/components/enhanced_bookmarks/image_store_ios_unittest.mm
index a9d75c2..78c57cb 100644
--- a/components/enhanced_bookmarks/image_store_ios_unittest.mm
+++ b/components/enhanced_bookmarks/image_store_ios_unittest.mm
@@ -106,13 +106,13 @@ class ImageStoreUnitTestIOS : public PlatformTest {
   ImageStoreUnitTestIOS() {}
   virtual ~ImageStoreUnitTestIOS() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     bool success = temp_dir_.CreateUniqueTempDir();
     ASSERT_TRUE(success);
     store_.reset(CreateStore<T>(temp_dir_));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (store_ && use_persistent_store())
       store_->ClearAll();
   }
diff --git a/components/enhanced_bookmarks/image_store_unittest.cc b/components/enhanced_bookmarks/image_store_unittest.cc
index 6d41ff4..7e6aa7f 100644
--- a/components/enhanced_bookmarks/image_store_unittest.cc
+++ b/components/enhanced_bookmarks/image_store_unittest.cc
@@ -90,13 +90,13 @@ class ImageStoreUnitTest : public PlatformTest {
   ImageStoreUnitTest() {}
   virtual ~ImageStoreUnitTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     bool success = tempDir_.CreateUniqueTempDir();
     ASSERT_TRUE(success);
     store_.reset(CreateStore<T>(tempDir_));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (store_ && use_persistent_store())
       store_->ClearAll();
   }
diff --git a/components/enhanced_bookmarks/image_store_util_ios.mm b/components/enhanced_bookmarks/image_store_util_ios.mm
index 4b27dce..8e6b53f 100644
--- a/components/enhanced_bookmarks/image_store_util_ios.mm
+++ b/components/enhanced_bookmarks/image_store_util_ios.mm
@@ -16,11 +16,11 @@ class RefCountedNSDataMemory : public base::RefCountedMemory {
  public:
   explicit RefCountedNSDataMemory(NSData* memory) : data_([memory retain]) {}
 
-  virtual const unsigned char* front() const OVERRIDE {
+  virtual const unsigned char* front() const override {
     return reinterpret_cast<const unsigned char*>([data_ bytes]);
   }
 
-  virtual size_t size() const OVERRIDE {
+  virtual size_t size() const override {
     return [data_ length];
   }
 
diff --git a/components/enhanced_bookmarks/persistent_image_store.h b/components/enhanced_bookmarks/persistent_image_store.h
index 986b98f..5cb0474 100644
--- a/components/enhanced_bookmarks/persistent_image_store.h
+++ b/components/enhanced_bookmarks/persistent_image_store.h
@@ -17,16 +17,16 @@ 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 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;
+                      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;
 
  protected:
   virtual ~PersistentImageStore();
diff --git a/components/enhanced_bookmarks/test_image_store.h b/components/enhanced_bookmarks/test_image_store.h
index 5958ed2..2666ea0 100644
--- a/components/enhanced_bookmarks/test_image_store.h
+++ b/components/enhanced_bookmarks/test_image_store.h
@@ -13,16 +13,16 @@
 class TestImageStore : public ImageStore {
  public:
   TestImageStore();
-  virtual bool HasKey(const GURL& page_url) OVERRIDE;
+  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;
+                      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;
 
  protected:
   virtual ~TestImageStore();
diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc
index 671d732..8df5f8c 100644
--- a/components/favicon_base/select_favicon_frames.cc
+++ b/components/favicon_base/select_favicon_frames.cc
@@ -173,7 +173,7 @@ class FaviconImageSource : public gfx::ImageSkiaSource {
   virtual ~FaviconImageSource() {}
 
   // gfx::ImageSkiaSource:
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+  virtual 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_uploader_chrome.h b/components/feedback/feedback_uploader_chrome.h
index 6c4381d..bf007b1 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;
+  virtual 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 2729f43..d674a10 100644
--- a/components/feedback/feedback_uploader_delegate.h
+++ b/components/feedback/feedback_uploader_delegate.h
@@ -26,7 +26,7 @@ class FeedbackUploaderDelegate : public net::URLFetcherDelegate {
 
  private:
   // Overridden from net::URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 fe9957d..0ad60e4 100644
--- a/components/feedback/feedback_uploader_factory.h
+++ b/components/feedback/feedback_uploader_factory.h
@@ -35,9 +35,9 @@ class FeedbackUploaderFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory overrides:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
   virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
+      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 85b129f..ffe382b 100644
--- a/components/gcm_driver/default_gcm_app_handler.h
+++ b/components/gcm_driver/default_gcm_app_handler.h
@@ -18,15 +18,15 @@ class DefaultGCMAppHandler : public GCMAppHandler {
   virtual ~DefaultGCMAppHandler();
 
   // Overridden from GCMAppHandler:
-  virtual void ShutdownHandler() OVERRIDE;
+  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;
+                         const GCMClient::IncomingMessage& message) override;
+  virtual void OnMessagesDeleted(const std::string& app_id) override;
   virtual void OnSendError(
       const std::string& app_id,
-      const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
+      const GCMClient::SendErrorDetails& send_error_details) override;
   virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) OVERRIDE;
+                                  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 eb09422..4943534 100644
--- a/components/gcm_driver/fake_gcm_app_handler.h
+++ b/components/gcm_driver/fake_gcm_app_handler.h
@@ -38,15 +38,15 @@ class FakeGCMAppHandler : public GCMAppHandler {
   void WaitForNotification();
 
   // GCMAppHandler implementation.
-  virtual void ShutdownHandler() OVERRIDE;
+  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;
+                         const GCMClient::IncomingMessage& message) override;
+  virtual void OnMessagesDeleted(const std::string& app_id) override;
   virtual void OnSendError(
       const std::string& app_id,
-      const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
+      const GCMClient::SendErrorDetails& send_error_details) override;
   virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) OVERRIDE;
+                                  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 fe06a79..649e74e 100644
--- a/components/gcm_driver/fake_gcm_client.h
+++ b/components/gcm_driver/fake_gcm_client.h
@@ -43,24 +43,24 @@ class FakeGCMClient : public GCMClient {
       const scoped_refptr<net::URLRequestContextGetter>&
           url_request_context_getter,
       scoped_ptr<Encryptor> encryptor,
-      Delegate* delegate) OVERRIDE;
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual void CheckOut() OVERRIDE;
+      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;
+                        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;
+                    const OutgoingMessage& message) override;
+  virtual void SetRecording(bool recording) override;
+  virtual void ClearActivityLogs() override;
+  virtual GCMStatistics GetStatistics() const override;
   virtual void SetAccountTokens(
-      const std::vector<AccountTokenInfo>& account_tokens) OVERRIDE;
+      const std::vector<AccountTokenInfo>& account_tokens) override;
   virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) OVERRIDE;
-  virtual void RemoveAccountMapping(const std::string& account_id) OVERRIDE;
+      const AccountMapping& account_mapping) override;
+  virtual 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 a4b2d84..6ccb0e2 100644
--- a/components/gcm_driver/fake_gcm_client_factory.h
+++ b/components/gcm_driver/fake_gcm_client_factory.h
@@ -27,7 +27,7 @@ class FakeGCMClientFactory : public GCMClientFactory {
   virtual ~FakeGCMClientFactory();
 
   // GCMClientFactory:
-  virtual scoped_ptr<GCMClient> BuildInstance() OVERRIDE;
+  virtual 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 6dae94b..37a208b 100644
--- a/components/gcm_driver/fake_gcm_driver.h
+++ b/components/gcm_driver/fake_gcm_driver.h
@@ -17,40 +17,40 @@ class FakeGCMDriver : public GCMDriver {
   virtual ~FakeGCMDriver();
 
   // GCMDriver overrides:
-  virtual void Shutdown() OVERRIDE;
+  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 Purge() OVERRIDE;
-  virtual void AddConnectionObserver(GCMConnectionObserver* observer) OVERRIDE;
+                             GCMAppHandler* handler) override;
+  virtual void RemoveAppHandler(const std::string& app_id) override;
+  virtual void OnSignedIn() 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;
+      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;
+                                bool clear_logs) override;
   virtual void SetGCMRecording(const GetGCMStatisticsCallback& callback,
-                               bool recording) OVERRIDE;
+                               bool recording) override;
   virtual void SetAccountTokens(
-      const std::vector<GCMClient::AccountTokenInfo>& account_tokens) OVERRIDE;
+      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;
+      const AccountMapping& account_mapping) override;
+  virtual void RemoveAccountMapping(const std::string& account_id) override;
 
  protected:
   // GCMDriver implementation:
-  virtual GCMClient::Result EnsureStarted() OVERRIDE;
+  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;
+      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;
+                        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 fd1ca64..39d18b5 100644
--- a/components/gcm_driver/gcm_account_mapper.h
+++ b/components/gcm_driver/gcm_account_mapper.h
@@ -40,16 +40,16 @@ class GCMAccountMapper : public GCMAppHandler {
       const std::vector<GCMClient::AccountTokenInfo>& account_tokens);
 
   // Implementation of GCMAppHandler:
-  virtual void ShutdownHandler() OVERRIDE;
+  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;
+                         const GCMClient::IncomingMessage& message) override;
+  virtual void OnMessagesDeleted(const std::string& app_id) override;
   virtual void OnSendError(
       const std::string& app_id,
-      const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
+      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;
+                                  const std::string& message_id) override;
+  virtual 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 7185979..58fd825 100644
--- a/components/gcm_driver/gcm_account_mapper_unittest.cc
+++ b/components/gcm_driver/gcm_account_mapper_unittest.cc
@@ -82,14 +82,14 @@ class CustomFakeGCMDriver : public FakeGCMDriver {
   virtual ~CustomFakeGCMDriver();
 
   virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) OVERRIDE;
-  virtual void RemoveAccountMapping(const std::string& account_id) OVERRIDE;
+      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;
+                             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;
+      const std::vector<std::string>& sender_ids) override;
 
   void CompleteRegister(const std::string& registration_id,
                         GCMClient::Result result);
@@ -117,7 +117,7 @@ class CustomFakeGCMDriver : public FakeGCMDriver {
  protected:
   virtual void SendImpl(const std::string& app_id,
                         const std::string& receiver_id,
-                        const GCMClient::OutgoingMessage& message) OVERRIDE;
+                        const GCMClient::OutgoingMessage& message) override;
 
  private:
   AccountMapping account_mapping_;
diff --git a/components/gcm_driver/gcm_channel_status_request.h b/components/gcm_driver/gcm_channel_status_request.h
index 6ce1bab..e5635e0 100644
--- a/components/gcm_driver/gcm_channel_status_request.h
+++ b/components/gcm_driver/gcm_channel_status_request.h
@@ -41,7 +41,7 @@ class GCMChannelStatusRequest : public net::URLFetcherDelegate {
 
  private:
   // Overridden from URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 75aad65..6abe149 100644
--- a/components/gcm_driver/gcm_client_impl.h
+++ b/components/gcm_driver/gcm_client_impl.h
@@ -90,32 +90,32 @@ class GCMClientImpl
       const scoped_refptr<net::URLRequestContextGetter>&
           url_request_context_getter,
       scoped_ptr<Encryptor> encryptor,
-      GCMClient::Delegate* delegate) OVERRIDE;
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual void CheckOut() OVERRIDE;
+      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;
+                        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;
+                    const OutgoingMessage& message) override;
+  virtual void SetRecording(bool recording) override;
+  virtual void ClearActivityLogs() override;
+  virtual GCMStatistics GetStatistics() const override;
   virtual void SetAccountTokens(
-      const std::vector<AccountTokenInfo>& account_tokens) OVERRIDE;
+      const std::vector<AccountTokenInfo>& account_tokens) override;
   virtual void UpdateAccountMapping(
-      const AccountMapping& account_mapping) OVERRIDE;
-  virtual void RemoveAccountMapping(const std::string& account_id) OVERRIDE;
+      const AccountMapping& account_mapping) override;
+  virtual void RemoveAccountMapping(const std::string& account_id) override;
 
   // GCMStatsRecorder::Delegate implemenation.
-  virtual void OnActivityRecorded() OVERRIDE;
+  virtual void OnActivityRecorded() override;
 
   // ConnectionFactory::ConnectionListener implementation.
   virtual void OnConnected(const GURL& current_server,
-                           const net::IPEndPoint& ip_endpoint) OVERRIDE;
-  virtual void OnDisconnected() OVERRIDE;
+                           const net::IPEndPoint& ip_endpoint) override;
+  virtual 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 51b4c54..d664e44 100644
--- a/components/gcm_driver/gcm_client_impl_unittest.cc
+++ b/components/gcm_driver/gcm_client_impl_unittest.cc
@@ -93,8 +93,8 @@ class FakeMCSClient : public MCSClient {
                 GCMStore* gcm_store,
                 GCMStatsRecorder* recorder);
   virtual ~FakeMCSClient();
-  virtual void Login(uint64 android_id, uint64 security_token) OVERRIDE;
-  virtual void SendMessage(const MCSMessage& message) OVERRIDE;
+  virtual void Login(uint64 android_id, uint64 security_token) override;
+  virtual void SendMessage(const MCSMessage& message) override;
 
   uint64 last_android_id() const { return last_android_id_; }
   uint64 last_security_token() const { return last_security_token_; }
@@ -142,7 +142,7 @@ class AutoAdvancingTestClock : public base::Clock {
   explicit AutoAdvancingTestClock(base::TimeDelta auto_increment_time_delta);
   virtual ~AutoAdvancingTestClock();
 
-  virtual base::Time Now() OVERRIDE;
+  virtual base::Time Now() override;
   void Advance(TimeDelta delta);
   int call_count() const { return call_count_; }
 
@@ -177,20 +177,20 @@ class FakeGCMInternalsBuilder : public GCMInternalsBuilder {
   FakeGCMInternalsBuilder(base::TimeDelta clock_step);
   virtual ~FakeGCMInternalsBuilder();
 
-  virtual scoped_ptr<base::Clock> BuildClock() OVERRIDE;
+  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;
+      GCMStatsRecorder* recorder) override;
   virtual scoped_ptr<ConnectionFactory> BuildConnectionFactory(
       const std::vector<GURL>& endpoints,
       const net::BackoffEntry::Policy& backoff_policy,
       const scoped_refptr<net::HttpNetworkSession>& gcm_network_session,
       const scoped_refptr<net::HttpNetworkSession>& http_network_session,
       net::NetLog* net_log,
-      GCMStatsRecorder* recorder) OVERRIDE;
+      GCMStatsRecorder* recorder) override;
 
  private:
   base::TimeDelta clock_step_;
@@ -236,7 +236,7 @@ class GCMClientImplTest : public testing::Test,
   GCMClientImplTest();
   virtual ~GCMClientImplTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void BuildGCMClient(base::TimeDelta clock_step);
   void InitializeGCMClient();
@@ -261,26 +261,26 @@ class GCMClientImplTest : public testing::Test,
   // GCMClient::Delegate overrides (for verification).
   virtual void OnRegisterFinished(const std::string& app_id,
                                   const std::string& registration_id,
-                                  GCMClient::Result result) OVERRIDE;
+                                  GCMClient::Result result) override;
   virtual void OnUnregisterFinished(const std::string& app_id,
-                                    GCMClient::Result result) OVERRIDE;
+                                    GCMClient::Result result) override;
   virtual void OnSendFinished(const std::string& app_id,
                               const std::string& message_id,
-                              GCMClient::Result result) OVERRIDE {}
+                              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;
+      override;
+  virtual void OnMessagesDeleted(const std::string& app_id) override;
   virtual void OnMessageSendError(
       const std::string& app_id,
-      const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
+      const gcm::GCMClient::SendErrorDetails& send_error_details) override;
   virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) OVERRIDE;
+                                  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 {}
+      const std::vector<AccountMapping>& account_mappings) override;
+  virtual void OnActivityRecorded() override {}
+  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override {}
+  virtual void OnDisconnected() override {}
 
   GCMClientImpl* gcm_client() const { return gcm_client_.get(); }
   FakeMCSClient* mcs_client() const {
@@ -754,7 +754,7 @@ class GCMClientImplCheckinTest : public GCMClientImplTest {
   GCMClientImplCheckinTest();
   virtual ~GCMClientImplCheckinTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 };
 
 GCMClientImplCheckinTest::GCMClientImplCheckinTest() {
@@ -983,7 +983,7 @@ public:
   GCMClientImplStartAndStopTest();
   virtual ~GCMClientImplStartAndStopTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 };
 
 GCMClientImplStartAndStopTest::GCMClientImplStartAndStopTest() {
diff --git a/components/gcm_driver/gcm_driver_android.h b/components/gcm_driver/gcm_driver_android.h
index 3201a9e..63fe528 100644
--- a/components/gcm_driver/gcm_driver_android.h
+++ b/components/gcm_driver/gcm_driver_android.h
@@ -44,36 +44,36 @@ class GCMDriverAndroid : public GCMDriver {
   static bool RegisterBindings(JNIEnv* env);
 
   // GCMDriver implementation:
-  virtual void OnSignedIn() OVERRIDE;
-  virtual void Purge() OVERRIDE;
-  virtual void Enable() OVERRIDE;
-  virtual void AddConnectionObserver(GCMConnectionObserver* observer) OVERRIDE;
+  virtual void OnSignedIn() override;
+  virtual void Purge() override;
+  virtual void Enable() override;
+  virtual void AddConnectionObserver(GCMConnectionObserver* observer) override;
   virtual void RemoveConnectionObserver(
-      GCMConnectionObserver* observer) OVERRIDE;
-  virtual void Disable() OVERRIDE;
-  virtual GCMClient* GetGCMClientForTesting() const OVERRIDE;
-  virtual bool IsStarted() const OVERRIDE;
-  virtual bool IsConnected() const OVERRIDE;
+      GCMConnectionObserver* observer) 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;
+                                bool clear_logs) override;
   virtual void SetGCMRecording(const GetGCMStatisticsCallback& callback,
-                               bool recording) OVERRIDE;
+                               bool recording) override;
   virtual void SetAccountTokens(
-      const std::vector<GCMClient::AccountTokenInfo>& account_tokens) OVERRIDE;
+      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;
+      const AccountMapping& account_mapping) override;
+  virtual void RemoveAccountMapping(const std::string& account_id) override;
 
  protected:
   // GCMDriver implementation:
-  virtual GCMClient::Result EnsureStarted() OVERRIDE;
+  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;
+      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;
+                        const GCMClient::OutgoingMessage& message) override;
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc
index 29e98b6..0254718 100644
--- a/components/gcm_driver/gcm_driver_desktop.cc
+++ b/components/gcm_driver/gcm_driver_desktop.cc
@@ -37,26 +37,26 @@ class GCMDriverDesktop::IOWorker : public GCMClient::Delegate {
   // Called on IO thread.
   virtual void OnRegisterFinished(const std::string& app_id,
                                   const std::string& registration_id,
-                                  GCMClient::Result result) OVERRIDE;
+                                  GCMClient::Result result) override;
   virtual void OnUnregisterFinished(const std::string& app_id,
-                                    GCMClient::Result result) OVERRIDE;
+                                    GCMClient::Result result) override;
   virtual void OnSendFinished(const std::string& app_id,
                               const std::string& message_id,
-                              GCMClient::Result result) OVERRIDE;
+                              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;
+      const GCMClient::IncomingMessage& message) override;
+  virtual void OnMessagesDeleted(const std::string& app_id) override;
   virtual void OnMessageSendError(
       const std::string& app_id,
-      const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
+      const GCMClient::SendErrorDetails& send_error_details) override;
   virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) OVERRIDE;
+                                  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;
+      const std::vector<AccountMapping>& account_mappings) override;
+  virtual void OnActivityRecorded() override;
+  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override;
+  virtual 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 5a44f58..e56ebfe 100644
--- a/components/gcm_driver/gcm_driver_desktop.h
+++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -57,29 +57,29 @@ class GCMDriverDesktop : public GCMDriver {
   virtual ~GCMDriverDesktop();
 
   // GCMDriver overrides:
-  virtual void Shutdown() OVERRIDE;
-  virtual void OnSignedIn() OVERRIDE;
-  virtual void Purge() OVERRIDE;
+  virtual void Shutdown() override;
+  virtual void OnSignedIn() 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;
+                             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;
+      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;
+                                bool clear_logs) override;
   virtual void SetGCMRecording(const GetGCMStatisticsCallback& callback,
-                               bool recording) OVERRIDE;
+                               bool recording) override;
   virtual void SetAccountTokens(
-      const std::vector<GCMClient::AccountTokenInfo>& account_tokens) OVERRIDE;
+      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;
+      const AccountMapping& account_mapping) override;
+  virtual void RemoveAccountMapping(const std::string& account_id) override;
 
   // Exposed for testing purpose.
   bool gcm_enabled() const { return gcm_enabled_; }
@@ -89,14 +89,14 @@ class GCMDriverDesktop : public GCMDriver {
 
  protected:
   // GCMDriver implementation:
-  virtual GCMClient::Result EnsureStarted() OVERRIDE;
+  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;
+      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;
+                        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 75717bb..e278316 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -48,8 +48,8 @@ class FakeGCMConnectionObserver : public GCMConnectionObserver {
   virtual ~FakeGCMConnectionObserver();
 
   // gcm::GCMConnectionObserver implementation:
-  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) OVERRIDE;
-  virtual void OnDisconnected() OVERRIDE;
+  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override;
+  virtual void OnDisconnected() override;
 
   bool connected() const { return connected_; }
 
@@ -101,8 +101,8 @@ class GCMDriverTest : public testing::Test {
   virtual ~GCMDriverTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   GCMDriverDesktop* driver() { return driver_.get(); }
   FakeGCMAppHandler* gcm_app_handler() { return gcm_app_handler_.get(); }
@@ -665,7 +665,7 @@ class GCMDriverFunctionalTest : public GCMDriverTest {
   virtual ~GCMDriverFunctionalTest();
 
   // GCMDriverTest:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GCMDriverFunctionalTest);
@@ -950,7 +950,7 @@ class GCMChannelStatusSyncerTest : public GCMDriverTest {
   virtual ~GCMChannelStatusSyncerTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void CompleteGCMChannelStatusRequest(bool enabled, int poll_interval_seconds);
   bool CompareDelaySeconds(bool expected_delay_seconds,
diff --git a/components/gcm_driver/gcm_stats_recorder_impl.h b/components/gcm_driver/gcm_stats_recorder_impl.h
index 3c21a0b..16472e1 100644
--- a/components/gcm_driver/gcm_stats_recorder_impl.h
+++ b/components/gcm_driver/gcm_stats_recorder_impl.h
@@ -44,52 +44,52 @@ 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 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;
+                                    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(
-      ConnectionFactory::ConnectionResetReason reason) OVERRIDE;
+      ConnectionFactory::ConnectionResetReason reason) override;
   virtual void RecordRegistrationSent(const std::string& app_id,
-                                      const std::string& sender_ids) OVERRIDE;
+                                      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;
+      RegistrationRequest::Status status) override;
   virtual 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;
+      int retries_left) override;
+  virtual void RecordUnregistrationSent(const std::string& app_id) override;
   virtual void RecordUnregistrationResponse(
       const std::string& app_id,
-      UnregistrationRequest::Status status) OVERRIDE;
+      UnregistrationRequest::Status status) override;
   virtual void RecordUnregistrationRetryDelayed(const std::string& app_id,
-                                                int64 delay_msec) OVERRIDE;
+                                                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;
+      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;
+                                    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;
+                                      int ttl) override;
   virtual void RecordIncomingSendError(const std::string& app_id,
                                        const std::string& receiver_id,
-                                       const std::string& message_id) OVERRIDE;
+                                       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/gcm_stats_recorder_impl_unittest.cc b/components/gcm_driver/gcm_stats_recorder_impl_unittest.cc
index f32ca95d..c6c6fd2 100644
--- a/components/gcm_driver/gcm_stats_recorder_impl_unittest.cc
+++ b/components/gcm_driver/gcm_stats_recorder_impl_unittest.cc
@@ -101,7 +101,7 @@ class GCMStatsRecorderImplTest : public testing::Test {
  public:
   GCMStatsRecorderImplTest();
   virtual ~GCMStatsRecorderImplTest();
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void VerifyRecordedCheckinCount(int expected_count) {
     EXPECT_EQ(expected_count,
diff --git a/components/gcm_driver/system_encryptor.h b/components/gcm_driver/system_encryptor.h
index 48913a6..48c75c8 100644
--- a/components/gcm_driver/system_encryptor.h
+++ b/components/gcm_driver/system_encryptor.h
@@ -16,10 +16,10 @@ class SystemEncryptor : public Encryptor {
   virtual ~SystemEncryptor();
 
   virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) OVERRIDE;
+                             std::string* ciphertext) override;
 
   virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) OVERRIDE;
+                             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 d54dc9b..0c6a80f 100644
--- a/components/google/core/browser/google_url_tracker.h
+++ b/components/google/core/browser/google_url_tracker.h
@@ -128,14 +128,14 @@ class GoogleURLTracker
   static const char kSearchDomainCheckURL[];
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // NetworkChangeNotifier::IPAddressObserver:
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  virtual 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 c422af1..601b4b3 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;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
 
   GoogleURLTrackerNavigationHelper* navigation_helper() {
     return navigation_helper_weak_ptr_;
@@ -58,12 +58,12 @@ class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  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 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;
+      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 4722f01..bfa3ddc 100644
--- a/components/google/core/browser/google_url_tracker_map_entry.h
+++ b/components/google/core/browser/google_url_tracker_map_entry.h
@@ -48,9 +48,9 @@ class GoogleURLTrackerMapEntry : public infobars::InfoBarManager::Observer {
 
   // infobars::InfoBarManager::Observer:
   virtual void OnInfoBarRemoved(infobars::InfoBar* infobar,
-                                bool animate) OVERRIDE;
+                                bool animate) override;
   virtual void OnManagerShuttingDown(
-      infobars::InfoBarManager* manager) OVERRIDE;
+      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 fe15908..a95d392 100644
--- a/components/google/core/browser/google_url_tracker_unittest.cc
+++ b/components/google/core/browser/google_url_tracker_unittest.cc
@@ -74,11 +74,11 @@ class TestGoogleURLTrackerClient : public GoogleURLTrackerClient {
   explicit TestGoogleURLTrackerClient(PrefService* prefs_);
   virtual ~TestGoogleURLTrackerClient();
 
-  virtual void SetListeningForNavigationStart(bool listen) OVERRIDE;
-  virtual bool IsListeningForNavigationStart() OVERRIDE;
-  virtual bool IsBackgroundNetworkingEnabled() OVERRIDE;
-  virtual PrefService* GetPrefs() OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+  virtual void SetListeningForNavigationStart(bool listen) override;
+  virtual bool IsListeningForNavigationStart() override;
+  virtual bool IsBackgroundNetworkingEnabled() override;
+  virtual PrefService* GetPrefs() override;
+  virtual net::URLRequestContextGetter* GetRequestContext() override;
 
  private:
   PrefService* prefs_;
@@ -127,13 +127,13 @@ class TestGoogleURLTrackerNavigationHelper
   explicit TestGoogleURLTrackerNavigationHelper(GoogleURLTracker* tracker);
   virtual ~TestGoogleURLTrackerNavigationHelper();
 
-  virtual void SetListeningForNavigationCommit(bool listen) OVERRIDE;
-  virtual bool IsListeningForNavigationCommit() OVERRIDE;
-  virtual void SetListeningForTabDestruction(bool listen) OVERRIDE;
-  virtual bool IsListeningForTabDestruction() 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;
+                       bool user_clicked_on_link) override;
 
  private:
   bool listening_for_nav_commit_;
@@ -182,7 +182,7 @@ class TestInfoBarManager : public infobars::InfoBarManager {
  public:
   explicit TestInfoBarManager(int unique_id);
   virtual ~TestInfoBarManager();
-  virtual int GetActiveEntryID() OVERRIDE;
+  virtual int GetActiveEntryID() override;
 
  private:
   int unique_id_;
@@ -210,8 +210,8 @@ class GoogleURLTrackerTest : public testing::Test {
   virtual ~GoogleURLTrackerTest();
 
   // testing::Test
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   net::TestURLFetcher* GetFetcher();
   void MockSearchDomainCheckResponse(const std::string& domain);
diff --git a/components/history/core/browser/in_memory_database.h b/components/history/core/browser/in_memory_database.h
index 51a65e6..6a010de 100644
--- a/components/history/core/browser/in_memory_database.h
+++ b/components/history/core/browser/in_memory_database.h
@@ -34,7 +34,7 @@ class InMemoryDatabase : public URLDatabase {
 
  protected:
   // Implemented for URLDatabase.
-  virtual sql::Connection& GetDB() OVERRIDE;
+  virtual 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 8a8d453..804df15 100644
--- a/components/history/core/browser/url_database_unittest.cc
+++ b/components/history/core/browser/url_database_unittest.cc
@@ -41,7 +41,7 @@ class URLDatabaseTest : public testing::Test,
 
  protected:
   // Provided for URL/VisitDatabase.
-  virtual sql::Connection& GetDB() OVERRIDE {
+  virtual sql::Connection& GetDB() override {
     return db_;
   }
 
diff --git a/components/history/core/test/history_client_fake_bookmarks.h b/components/history/core/test/history_client_fake_bookmarks.h
index 71db9fe..b4afeb1 100644
--- a/components/history/core/test/history_client_fake_bookmarks.h
+++ b/components/history/core/test/history_client_fake_bookmarks.h
@@ -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;
+  virtual bool IsBookmarked(const GURL& url) override;
+  virtual 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 399e9c2..f88206c 100644
--- a/components/infobars/core/confirm_infobar_delegate.h
+++ b/components/infobars/core/confirm_infobar_delegate.h
@@ -26,7 +26,7 @@ class ConfirmInfoBarDelegate : public infobars::InfoBarDelegate {
   virtual ~ConfirmInfoBarDelegate();
 
   // Returns the InfoBar type to be displayed for the InfoBar.
-  virtual InfoBarAutomationType GetInfoBarAutomationType() const OVERRIDE;
+  virtual InfoBarAutomationType GetInfoBarAutomationType() const override;
 
   // Returns the message string to be displayed for the InfoBar.
   virtual base::string16 GetMessageText() const = 0;
@@ -71,13 +71,13 @@ class ConfirmInfoBarDelegate : public infobars::InfoBarDelegate {
       scoped_ptr<ConfirmInfoBarDelegate> delegate);
 
   virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const OVERRIDE;
+      const NavigationDetails& details) const override;
 
  private:
   // InfoBarDelegate:
   virtual bool EqualsDelegate(
-      infobars::InfoBarDelegate* delegate) const OVERRIDE;
-  virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() OVERRIDE;
+      infobars::InfoBarDelegate* delegate) const override;
+  virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate() override;
 
   DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBarDelegate);
 };
diff --git a/components/infobars/core/infobar.h b/components/infobars/core/infobar.h
index 007a7ca..86d0f0d 100644
--- a/components/infobars/core/infobar.h
+++ b/components/infobars/core/infobar.h
@@ -98,7 +98,7 @@ class InfoBar : public gfx::AnimationDelegate {
 
  protected:
   // gfx::AnimationDelegate:
-  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual 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;
+  virtual 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 ec8e9c4..eda97aa 100644
--- a/components/infobars/core/infobar_container.h
+++ b/components/infobars/core/infobar_container.h
@@ -102,11 +102,11 @@ 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 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;
+                                 InfoBar* new_infobar) override;
+  virtual 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 db38ed1..7711a2f 100644
--- a/components/invalidation/fake_invalidation_handler.h
+++ b/components/invalidation/fake_invalidation_handler.h
@@ -24,10 +24,10 @@ class FakeInvalidationHandler : public InvalidationHandler {
   int GetInvalidationCount() const;
 
   // InvalidationHandler implementation.
-  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE;
+  virtual void OnInvalidatorStateChange(InvalidatorState state) override;
   virtual void OnIncomingInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
-  virtual std::string GetOwnerName() const OVERRIDE;
+      const ObjectIdInvalidationMap& invalidation_map) override;
+  virtual 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 8bd3b0b..4058f8e 100644
--- a/components/invalidation/fake_invalidation_state_tracker.h
+++ b/components/invalidation/fake_invalidation_state_tracker.h
@@ -20,14 +20,14 @@ class FakeInvalidationStateTracker
   virtual ~FakeInvalidationStateTracker();
 
   // 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 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;
+      const UnackedInvalidationsMap& states) override;
+  virtual UnackedInvalidationsMap GetSavedInvalidations() const override;
+  virtual void Clear() override;
 
   static const int64 kMinVersion;
 
diff --git a/components/invalidation/fake_invalidator.h b/components/invalidation/fake_invalidator.h
index 38e8c56..ef19f07 100644
--- a/components/invalidation/fake_invalidator.h
+++ b/components/invalidation/fake_invalidator.h
@@ -30,16 +30,16 @@ class FakeInvalidator : public Invalidator {
   void EmitOnIncomingInvalidation(
       const ObjectIdInvalidationMap& invalidation_map);
 
-  virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
+  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;
+                                   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;
+      const std::string& email, const std::string& token) override;
   virtual void RequestDetailedStatus(
     base::Callback<void(const base::DictionaryValue&)> callback) const
-    OVERRIDE;
+    override;
 
  private:
   InvalidatorRegistrar registrar_;
diff --git a/components/invalidation/gcm_invalidation_bridge.cc b/components/invalidation/gcm_invalidation_bridge.cc
index 691be33..1ff5aa6 100644
--- a/components/invalidation/gcm_invalidation_bridge.cc
+++ b/components/invalidation/gcm_invalidation_bridge.cc
@@ -41,11 +41,11 @@ class GCMInvalidationBridge::Core : public syncer::GCMNetworkChannelDelegate,
   virtual ~Core();
 
   // 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;
+  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 RequestTokenFinished(RequestTokenCallback callback,
                             const GoogleServiceAuthError& error,
diff --git a/components/invalidation/gcm_invalidation_bridge.h b/components/invalidation/gcm_invalidation_bridge.h
index 7f51927..2a5f7f3 100644
--- a/components/invalidation/gcm_invalidation_bridge.h
+++ b/components/invalidation/gcm_invalidation_bridge.h
@@ -46,25 +46,25 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
   // gcm::GCMAppHandler implementation.
-  virtual void ShutdownHandler() OVERRIDE;
+  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;
+      const gcm::GCMClient::IncomingMessage& message) override;
+  virtual void OnMessagesDeleted(const std::string& app_id) override;
   virtual void OnSendError(
       const std::string& app_id,
-      const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
+      const gcm::GCMClient::SendErrorDetails& send_error_details) override;
   virtual void OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) OVERRIDE;
+                                  const std::string& message_id) override;
 
   // gcm::GCMConnectionObserver implementation.
-  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) OVERRIDE;
-  virtual void OnDisconnected() OVERRIDE;
+  virtual void OnConnected(const net::IPEndPoint& ip_endpoint) override;
+  virtual 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 52bca6e..8fecd5a 100644
--- a/components/invalidation/gcm_network_channel.h
+++ b/components/invalidation/gcm_network_channel.h
@@ -59,23 +59,23 @@ class INVALIDATION_EXPORT_PRIVATE GCMNetworkChannel
   virtual ~GCMNetworkChannel();
 
   // invalidation::NetworkChannel implementation.
-  virtual void SendMessage(const std::string& message) OVERRIDE;
+  virtual void SendMessage(const std::string& message) override;
   virtual void SetMessageReceiver(
-      invalidation::MessageCallback* incoming_receiver) OVERRIDE;
+      invalidation::MessageCallback* incoming_receiver) override;
 
   // SyncNetworkChannel implementation.
   virtual void UpdateCredentials(const std::string& email,
-                                 const std::string& token) OVERRIDE;
-  virtual int GetInvalidationClientType() OVERRIDE;
+                                 const std::string& token) override;
+  virtual int GetInvalidationClientType() override;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> callback) override;
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // NetworkChangeObserver implementation.
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType connection_type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType connection_type) override;
 
  protected:
   void ResetRegisterBackoffEntryForTest(
diff --git a/components/invalidation/gcm_network_channel_unittest.cc b/components/invalidation/gcm_network_channel_unittest.cc
index a974b83..94cd3d2 100644
--- a/components/invalidation/gcm_network_channel_unittest.cc
+++ b/components/invalidation/gcm_network_channel_unittest.cc
@@ -18,24 +18,24 @@ class TestGCMNetworkChannelDelegate : public GCMNetworkChannelDelegate {
       : register_call_count_(0) {}
 
   virtual void Initialize(
-      GCMNetworkChannelDelegate::ConnectionStateCallback callback) OVERRIDE {
+      GCMNetworkChannelDelegate::ConnectionStateCallback callback) override {
     connection_state_callback = callback;
   }
 
-  virtual void RequestToken(RequestTokenCallback callback) OVERRIDE {
+  virtual void RequestToken(RequestTokenCallback callback) override {
     request_token_callback = callback;
   }
 
-  virtual void InvalidateToken(const std::string& token) OVERRIDE {
+  virtual void InvalidateToken(const std::string& token) override {
     invalidated_token = token;
   }
 
-  virtual void Register(RegisterCallback callback) OVERRIDE {
+  virtual void Register(RegisterCallback callback) override {
     ++register_call_count_;
     register_callback = callback;
   }
 
-  virtual void SetMessageReceiver(MessageCallback callback) OVERRIDE {
+  virtual 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 {
+  virtual 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;
+  virtual void AddExtraRequestHeader(const std::string& header_line) override;
 
  private:
   GCMNetworkChannelTest* test_;
@@ -167,7 +167,7 @@ class GCMNetworkChannelTest
   }
 
   virtual void OnNetworkChannelStateChanged(
-      InvalidatorState invalidator_state) OVERRIDE {
+      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 2ee0f8d..929b81d 100644
--- a/components/invalidation/invalidation_logger_unittest.cc
+++ b/components/invalidation/invalidation_logger_unittest.cc
@@ -25,33 +25,33 @@ class InvalidationLoggerObserverTest : public InvalidationLoggerObserver {
   }
 
   virtual void OnRegistrationChange(const std::multiset<std::string>& handlers)
-      OVERRIDE {
+      override {
     registered_handlers = handlers;
     registration_change_received = true;
   }
 
   virtual void OnStateChange(const syncer::InvalidatorState& new_state,
                              const base::Time& last_change_timestamp)
-      OVERRIDE {
+      override {
     state_received = true;
   }
 
   virtual void OnUpdateIds(const std::string& handler,
-                           const syncer::ObjectIdCountMap& details) OVERRIDE {
+                           const syncer::ObjectIdCountMap& details) override {
     update_id_received = true;
     update_id_replicated[handler] = details;
   }
 
-  virtual void OnDebugMessage(const base::DictionaryValue& details) OVERRIDE {
+  virtual void OnDebugMessage(const base::DictionaryValue& details) override {
     debug_message_received = true;
   }
 
   virtual void OnInvalidation(
-      const syncer::ObjectIdInvalidationMap& new_invalidations) OVERRIDE {
+      const syncer::ObjectIdInvalidationMap& new_invalidations) override {
     invalidation_received = true;
   }
 
-  virtual void OnDetailedStatus(const base::DictionaryValue& details) OVERRIDE {
+  virtual 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 c8812db..bf7147d 100644
--- a/components/invalidation/invalidation_notifier.h
+++ b/components/invalidation/invalidation_notifier.h
@@ -53,21 +53,21 @@ class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
   virtual ~InvalidationNotifier();
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
+  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;
+                                   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;
+      const std::string& email, const std::string& token) override;
   virtual void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> callback) const
-      OVERRIDE;
+      override;
 
   // SyncInvalidationListener::Delegate implementation.
   virtual void OnInvalidate(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
-  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE;
+      const ObjectIdInvalidationMap& invalidation_map) override;
+  virtual 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_android.h b/components/invalidation/invalidation_service_android.h
index 6790db3..4a9e77a 100644
--- a/components/invalidation/invalidation_service_android.h
+++ b/components/invalidation/invalidation_service_android.h
@@ -38,19 +38,19 @@ class InvalidationServiceAndroid
   // fetching the invalidator state, or querying the client's ID.  Support for
   // exposing the client ID should be available soon; see crbug.com/172391.
   virtual void RegisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
+      syncer::InvalidationHandler* handler) override;
   virtual void UpdateRegisteredInvalidationIds(
       syncer::InvalidationHandler* handler,
-      const syncer::ObjectIdSet& ids) OVERRIDE;
+      const syncer::ObjectIdSet& ids) override;
   virtual void UnregisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
-  virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
-  virtual std::string GetInvalidatorClientId() const OVERRIDE;
-  virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
+      syncer::InvalidationHandler* handler) override;
+  virtual syncer::InvalidatorState GetInvalidatorState() const override;
+  virtual std::string GetInvalidatorClientId() const override;
+  virtual InvalidationLogger* GetInvalidationLogger() override;
   virtual void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> caller) const
-      OVERRIDE;
-  virtual IdentityProvider* GetIdentityProvider() OVERRIDE;
+      override;
+  virtual IdentityProvider* GetIdentityProvider() override;
 
   void RequestSync(JNIEnv* env,
                    jobject obj,
diff --git a/components/invalidation/invalidation_service_test_template.h b/components/invalidation/invalidation_service_test_template.h
index ae1d04f..d6eb985 100644
--- a/components/invalidation/invalidation_service_test_template.h
+++ b/components/invalidation/invalidation_service_test_template.h
@@ -348,7 +348,7 @@ class BoundFakeInvalidationHandler : public syncer::FakeInvalidationHandler {
 
   // InvalidationHandler implementation.
   virtual void OnInvalidatorStateChange(
-      syncer::InvalidatorState state) OVERRIDE;
+      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 b4d8c1d..77b3746 100644
--- a/components/invalidation/invalidator_registrar_unittest.cc
+++ b/components/invalidation/invalidator_registrar_unittest.cc
@@ -29,30 +29,30 @@ class RegistrarInvalidator : public Invalidator {
   }
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE {
+  virtual void RegisterHandler(InvalidationHandler* handler) override {
     registrar_.RegisterHandler(handler);
   }
 
   virtual void UpdateRegisteredIds(InvalidationHandler* handler,
-                                   const ObjectIdSet& ids) OVERRIDE {
+                                   const ObjectIdSet& ids) override {
     registrar_.UpdateRegisteredIds(handler, ids);
   }
 
-  virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE {
+  virtual void UnregisterHandler(InvalidationHandler* handler) override {
     registrar_.UnregisterHandler(handler);
   }
 
-  virtual InvalidatorState GetInvalidatorState() const OVERRIDE {
+  virtual InvalidatorState GetInvalidatorState() const override {
     return registrar_.GetInvalidatorState();
   }
 
   virtual void UpdateCredentials(
-      const std::string& email, const std::string& token) OVERRIDE {
+      const std::string& email, const std::string& token) override {
     // Do nothing.
   }
 
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> call) const OVERRIDE {
+      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 a55b120..1c922bd 100644
--- a/components/invalidation/invalidator_storage.h
+++ b/components/invalidation/invalidator_storage.h
@@ -37,15 +37,15 @@ 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 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 syncer::UnackedInvalidationsMap& map) OVERRIDE;
+      const syncer::UnackedInvalidationsMap& map) override;
   virtual syncer::UnackedInvalidationsMap GetSavedInvalidations()
-      const OVERRIDE;
-  virtual void Clear() OVERRIDE;
+      const override;
+  virtual 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 95d011d..277d8b3 100644
--- a/components/invalidation/invalidator_test_template.h
+++ b/components/invalidation/invalidator_test_template.h
@@ -340,7 +340,7 @@ class BoundFakeInvalidationHandler : public FakeInvalidationHandler {
   InvalidatorState GetLastRetrievedState() const;
 
   // InvalidationHandler implementation.
-  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE;
+  virtual 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 792c57a..ea4e622 100644
--- a/components/invalidation/mock_ack_handler.h
+++ b/components/invalidation/mock_ack_handler.h
@@ -56,10 +56,10 @@ class INVALIDATION_EXPORT MockAckHandler
   // Implementation of AckHandler.
   virtual void Acknowledge(
       const invalidation::ObjectId& id,
-      const AckHandle& handle) OVERRIDE;
+      const AckHandle& handle) override;
   virtual void Drop(
       const invalidation::ObjectId& id,
-      const AckHandle& handle) OVERRIDE;
+      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 5035b6e..ea99799 100644
--- a/components/invalidation/non_blocking_invalidator.cc
+++ b/components/invalidation/non_blocking_invalidator.cc
@@ -116,10 +116,10 @@ class NonBlockingInvalidator::Core
 
   // InvalidationHandler implementation (all called on I/O thread by
   // InvalidationNotifier).
-  virtual void OnInvalidatorStateChange(InvalidatorState reason) OVERRIDE;
+  virtual void OnInvalidatorStateChange(InvalidatorState reason) override;
   virtual void OnIncomingInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
-  virtual std::string GetOwnerName() const OVERRIDE;
+      const ObjectIdInvalidationMap& invalidation_map) override;
+  virtual std::string GetOwnerName() const override;
 
  private:
   friend class
diff --git a/components/invalidation/non_blocking_invalidator.h b/components/invalidation/non_blocking_invalidator.h
index ab19ce1..853f093 100644
--- a/components/invalidation/non_blocking_invalidator.h
+++ b/components/invalidation/non_blocking_invalidator.h
@@ -54,16 +54,16 @@ class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
   virtual ~NonBlockingInvalidator();
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
+  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;
+                                   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;
+      const std::string& email, const std::string& token) override;
   virtual void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> callback) const
-      OVERRIDE;
+      override;
 
   // Static functions to construct callback that creates network channel for
   // SyncSystemResources. The goal is to pass network channel to invalidator at
@@ -76,14 +76,14 @@ 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 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;
+      const UnackedInvalidationsMap& states) override;
+  virtual UnackedInvalidationsMap GetSavedInvalidations() const override;
+  virtual 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 a2b600b..65cd10f 100644
--- a/components/invalidation/p2p_invalidation_service.h
+++ b/components/invalidation/p2p_invalidation_service.h
@@ -39,18 +39,18 @@ class P2PInvalidationService : public base::NonThreadSafe,
   // InvalidationService implementation.
   // It is an error to have registered handlers when the service is destroyed.
   virtual void RegisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
+      syncer::InvalidationHandler* handler) override;
   virtual void UpdateRegisteredInvalidationIds(
       syncer::InvalidationHandler* handler,
-      const syncer::ObjectIdSet& ids) OVERRIDE;
+      const syncer::ObjectIdSet& ids) override;
   virtual void UnregisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
-  virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
-  virtual std::string GetInvalidatorClientId() const OVERRIDE;
-  virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
+      syncer::InvalidationHandler* handler) override;
+  virtual syncer::InvalidatorState GetInvalidatorState() const override;
+  virtual std::string GetInvalidatorClientId() const override;
+  virtual InvalidationLogger* GetInvalidationLogger() override;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
-  virtual IdentityProvider* GetIdentityProvider() OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> caller) const override;
+  virtual 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 f82914e..932765a 100644
--- a/components/invalidation/p2p_invalidator.h
+++ b/components/invalidation/p2p_invalidator.h
@@ -101,23 +101,23 @@ class INVALIDATION_EXPORT_PRIVATE P2PInvalidator
   virtual ~P2PInvalidator();
 
   // Invalidator implementation.
-  virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
+  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;
+                                   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;
+      const std::string& email, const std::string& token) override;
   virtual void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> callback) const
-      OVERRIDE;
+      override;
 
   // PushClientObserver implementation.
-  virtual void OnNotificationsEnabled() OVERRIDE;
+  virtual void OnNotificationsEnabled() override;
   virtual void OnNotificationsDisabled(
-      notifier::NotificationsDisabledReason reason) OVERRIDE;
+      notifier::NotificationsDisabledReason reason) override;
   virtual void OnIncomingNotification(
-      const notifier::Notification& notification) OVERRIDE;
+      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 53c0db8..ef73f12 100644
--- a/components/invalidation/profile_invalidation_provider.h
+++ b/components/invalidation/profile_invalidation_provider.h
@@ -24,7 +24,7 @@ class ProfileInvalidationProvider : public KeyedService {
   InvalidationService* GetInvalidationService();
 
   // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  virtual 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 37146a3..7e3f002 100644
--- a/components/invalidation/push_client_channel.h
+++ b/components/invalidation/push_client_channel.h
@@ -33,24 +33,24 @@ class INVALIDATION_EXPORT_PRIVATE PushClientChannel
   virtual ~PushClientChannel();
 
   // invalidation::NetworkChannel implementation.
-  virtual void SendMessage(const std::string& message) OVERRIDE;
+  virtual void SendMessage(const std::string& message) override;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) OVERRIDE;
+      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;
+      const std::string& token) override;
+  virtual int GetInvalidationClientType() override;
 
   // notifier::PushClient::Observer implementation.
-  virtual void OnNotificationsEnabled() OVERRIDE;
+  virtual void OnNotificationsEnabled() override;
   virtual void OnNotificationsDisabled(
-      notifier::NotificationsDisabledReason reason) OVERRIDE;
+      notifier::NotificationsDisabledReason reason) override;
   virtual void OnIncomingNotification(
-      const notifier::Notification& notification) OVERRIDE;
+      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 2d5fd44..dd474cb 100644
--- a/components/invalidation/push_client_channel_unittest.cc
+++ b/components/invalidation/push_client_channel_unittest.cc
@@ -34,7 +34,7 @@ class PushClientChannelTest
   }
 
   virtual void OnNetworkChannelStateChanged(
-      InvalidatorState invalidator_state) OVERRIDE {
+      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 2afbd02..30e5865 100644
--- a/components/invalidation/registration_manager_unittest.cc
+++ b/components/invalidation/registration_manager_unittest.cc
@@ -35,7 +35,7 @@ class FakeRegistrationManager : public RegistrationManager {
   }
 
  protected:
-  virtual double GetJitter() OVERRIDE {
+  virtual double GetJitter() override {
     return jitter_;
   }
 
@@ -64,27 +64,27 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
 
   // invalidation::InvalidationClient implementation.
 
-  virtual void Start() OVERRIDE {}
-  virtual void Stop() OVERRIDE {}
-  virtual void Acknowledge(const invalidation::AckHandle& handle) OVERRIDE {}
+  virtual void Start() override {}
+  virtual void Stop() override {}
+  virtual void Acknowledge(const invalidation::AckHandle& handle) override {}
 
-  virtual void Register(const invalidation::ObjectId& oid) OVERRIDE {
+  virtual 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 {
+      const std::vector<invalidation::ObjectId>& oids) override {
     // Unused for now.
   }
 
-  virtual void Unregister(const invalidation::ObjectId& oid) OVERRIDE {
+  virtual 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 {
+      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 3efc4a1..2f22773 100644
--- a/components/invalidation/sync_invalidation_listener.h
+++ b/components/invalidation/sync_invalidation_listener.h
@@ -92,49 +92,49 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
 
   // invalidation::InvalidationListener implementation.
   virtual void Ready(
-      invalidation::InvalidationClient* client) OVERRIDE;
+      invalidation::InvalidationClient* client) override;
   virtual void Invalidate(
       invalidation::InvalidationClient* client,
       const invalidation::Invalidation& invalidation,
-      const invalidation::AckHandle& ack_handle) OVERRIDE;
+      const invalidation::AckHandle& ack_handle) override;
   virtual void InvalidateUnknownVersion(
       invalidation::InvalidationClient* client,
       const invalidation::ObjectId& object_id,
-      const invalidation::AckHandle& ack_handle) OVERRIDE;
+      const invalidation::AckHandle& ack_handle) override;
   virtual void InvalidateAll(
       invalidation::InvalidationClient* client,
-      const invalidation::AckHandle& ack_handle) OVERRIDE;
+      const invalidation::AckHandle& ack_handle) override;
   virtual void InformRegistrationStatus(
       invalidation::InvalidationClient* client,
       const invalidation::ObjectId& object_id,
-      invalidation::InvalidationListener::RegistrationState reg_state) OVERRIDE;
+      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;
+      const std::string& error_message) override;
   virtual void ReissueRegistrations(
       invalidation::InvalidationClient* client,
       const std::string& prefix,
-      int prefix_length) OVERRIDE;
+      int prefix_length) override;
   virtual void InformError(
       invalidation::InvalidationClient* client,
-      const invalidation::ErrorInfo& error_info) OVERRIDE;
+      const invalidation::ErrorInfo& error_info) override;
 
   // AckHandler implementation.
   virtual void Acknowledge(
       const invalidation::ObjectId& id,
-      const syncer::AckHandle& handle) OVERRIDE;
+      const syncer::AckHandle& handle) override;
   virtual void Drop(
       const invalidation::ObjectId& id,
-      const syncer::AckHandle& handle) OVERRIDE;
+      const syncer::AckHandle& handle) override;
 
   // StateWriter implementation.
-  virtual void WriteState(const std::string& state) OVERRIDE;
+  virtual void WriteState(const std::string& state) override;
 
   // SyncNetworkChannel::Observer implementation.
   virtual void OnNetworkChannelStateChanged(
-      InvalidatorState invalidator_state) OVERRIDE;
+      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 141dec5..7231b19 100644
--- a/components/invalidation/sync_invalidation_listener_unittest.cc
+++ b/components/invalidation/sync_invalidation_listener_unittest.cc
@@ -72,15 +72,15 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
 
   // invalidation::InvalidationClient implementation.
 
-  virtual void Start() OVERRIDE {
+  virtual void Start() override {
     started_ = true;
   }
 
-  virtual void Stop() OVERRIDE {
+  virtual void Stop() override {
     started_ = false;
   }
 
-  virtual void Register(const ObjectId& object_id) OVERRIDE {
+  virtual void Register(const ObjectId& object_id) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -89,7 +89,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
   }
 
   virtual void Register(
-      const invalidation::vector<ObjectId>& object_ids) OVERRIDE {
+      const invalidation::vector<ObjectId>& object_ids) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -97,7 +97,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     registered_ids_.insert(object_ids.begin(), object_ids.end());
   }
 
-  virtual void Unregister(const ObjectId& object_id) OVERRIDE {
+  virtual void Unregister(const ObjectId& object_id) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -106,7 +106,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
   }
 
   virtual void Unregister(
-      const invalidation::vector<ObjectId>& object_ids) OVERRIDE {
+      const invalidation::vector<ObjectId>& object_ids) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -117,7 +117,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
     }
   }
 
-  virtual void Acknowledge(const AckHandle& ack_handle) OVERRIDE {
+  virtual void Acknowledge(const AckHandle& ack_handle) override {
     if (!started_) {
       ADD_FAILURE();
       return;
@@ -223,7 +223,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
 
   // SyncInvalidationListener::Delegate implementation.
   virtual void OnInvalidate(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
+      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 +233,7 @@ class FakeDelegate : public SyncInvalidationListener::Delegate {
     }
   }
 
-  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE {
+  virtual void OnInvalidatorStateChange(InvalidatorState state) override {
     state_ = state;
   }
 
diff --git a/components/invalidation/sync_system_resources.h b/components/invalidation/sync_system_resources.h
index f576573..b4b4a34 100644
--- a/components/invalidation/sync_system_resources.h
+++ b/components/invalidation/sync_system_resources.h
@@ -37,10 +37,10 @@ class SyncLogger : public invalidation::Logger {
 
   // invalidation::Logger implementation.
   virtual void Log(LogLevel level, const char* file, int line,
-                   const char* format, ...) OVERRIDE;
+                   const char* format, ...) override;
 
   virtual void SetSystemResources(
-      invalidation::SystemResources* resources) OVERRIDE;
+      invalidation::SystemResources* resources) override;
 };
 
 class SyncInvalidationScheduler : public invalidation::Scheduler {
@@ -55,14 +55,14 @@ class SyncInvalidationScheduler : public invalidation::Scheduler {
 
   // invalidation::Scheduler implementation.
   virtual void Schedule(invalidation::TimeDelta delay,
-                        invalidation::Closure* task) OVERRIDE;
+                        invalidation::Closure* task) override;
 
-  virtual bool IsRunningOnThread() const OVERRIDE;
+  virtual bool IsRunningOnThread() const override;
 
-  virtual invalidation::Time GetCurrentTime() const OVERRIDE;
+  virtual invalidation::Time GetCurrentTime() const override;
 
   virtual void SetSystemResources(
-      invalidation::SystemResources* resources) OVERRIDE;
+      invalidation::SystemResources* resources) override;
 
  private:
   // Runs the task, deletes it, and removes it from |posted_tasks_|.
@@ -105,11 +105,11 @@ class INVALIDATION_EXPORT_PRIVATE SyncNetworkChannel
   // SyncNetworkChannel doesn't implement SendMessage. It is responsibility of
   // subclass to implement it.
   virtual void SetMessageReceiver(
-      invalidation::MessageCallback* incoming_receiver) OVERRIDE;
+      invalidation::MessageCallback* incoming_receiver) override;
   virtual void AddNetworkStatusReceiver(
-      invalidation::NetworkStatusCallback* network_status_receiver) OVERRIDE;
+      invalidation::NetworkStatusCallback* network_status_receiver) override;
   virtual void SetSystemResources(
-      invalidation::SystemResources* resources) OVERRIDE;
+      invalidation::SystemResources* resources) override;
 
   // Subclass should implement UpdateCredentials to pass new token to channel
   // library.
@@ -186,19 +186,19 @@ class SyncStorage : public invalidation::Storage {
 
   // invalidation::Storage implementation.
   virtual void WriteKey(const std::string& key, const std::string& value,
-                        invalidation::WriteKeyCallback* done) OVERRIDE;
+                        invalidation::WriteKeyCallback* done) override;
 
   virtual void ReadKey(const std::string& key,
-                       invalidation::ReadKeyCallback* done) OVERRIDE;
+                       invalidation::ReadKeyCallback* done) override;
 
   virtual void DeleteKey(const std::string& key,
-                         invalidation::DeleteKeyCallback* done) OVERRIDE;
+                         invalidation::DeleteKeyCallback* done) override;
 
   virtual void ReadAllKeys(
-      invalidation::ReadAllKeysCallback* key_callback) OVERRIDE;
+      invalidation::ReadAllKeysCallback* key_callback) override;
 
   virtual void SetSystemResources(
-      invalidation::SystemResources* resources) OVERRIDE;
+      invalidation::SystemResources* resources) override;
 
  private:
   // Runs the given storage callback with SUCCESS status and deletes it.
@@ -223,16 +223,16 @@ class INVALIDATION_EXPORT_PRIVATE SyncSystemResources
   virtual ~SyncSystemResources();
 
   // invalidation::SystemResources implementation.
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual bool IsStarted() const OVERRIDE;
+  virtual void Start() override;
+  virtual void Stop() override;
+  virtual 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;
+  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;
 
  private:
   bool is_started_;
diff --git a/components/invalidation/sync_system_resources_unittest.cc b/components/invalidation/sync_system_resources_unittest.cc
index d264b60..0956b34 100644
--- a/components/invalidation/sync_system_resources_unittest.cc
+++ b/components/invalidation/sync_system_resources_unittest.cc
@@ -185,19 +185,19 @@ class TestSyncNetworkChannel : public SyncNetworkChannel {
   using SyncNetworkChannel::NotifyChannelStateChange;
   using SyncNetworkChannel::DeliverIncomingMessage;
 
-  virtual void SendMessage(const std::string& message) OVERRIDE {
+  virtual void SendMessage(const std::string& message) override {
   }
 
   virtual void UpdateCredentials(const std::string& email,
-      const std::string& token) OVERRIDE {
+      const std::string& token) override {
   }
 
-  virtual int GetInvalidationClientType() OVERRIDE {
+  virtual int GetInvalidationClientType() override {
     return 0;
   }
 
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) OVERRIDE {
+      base::Callback<void(const base::DictionaryValue&)> callback) override {
     base::DictionaryValue value;
     callback.Run(value);
   }
@@ -221,7 +221,7 @@ class SyncNetworkChannelTest
   }
 
   virtual void OnNetworkChannelStateChanged(
-      InvalidatorState invalidator_state) OVERRIDE {
+      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 9de9881..d935d7b 100644
--- a/components/invalidation/ticl_invalidation_service.h
+++ b/components/invalidation/ticl_invalidation_service.h
@@ -73,18 +73,18 @@ class TiclInvalidationService : public base::NonThreadSafe,
   // InvalidationService implementation.
   // It is an error to have registered handlers when the service is destroyed.
   virtual void RegisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
+      syncer::InvalidationHandler* handler) override;
   virtual void UpdateRegisteredInvalidationIds(
       syncer::InvalidationHandler* handler,
-      const syncer::ObjectIdSet& ids) OVERRIDE;
+      const syncer::ObjectIdSet& ids) override;
   virtual void UnregisterInvalidationHandler(
-      syncer::InvalidationHandler* handler) OVERRIDE;
-  virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
-  virtual std::string GetInvalidatorClientId() const OVERRIDE;
-  virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
+      syncer::InvalidationHandler* handler) override;
+  virtual syncer::InvalidatorState GetInvalidatorState() const override;
+  virtual std::string GetInvalidatorClientId() const override;
+  virtual InvalidationLogger* GetInvalidationLogger() override;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
-  virtual IdentityProvider* GetIdentityProvider() OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> caller) const override;
+  virtual IdentityProvider* GetIdentityProvider() override;
 
   void RequestAccessToken();
 
@@ -92,27 +92,27 @@ class TiclInvalidationService : public base::NonThreadSafe,
   virtual void OnGetTokenSuccess(
       const OAuth2TokenService::Request* request,
       const std::string& access_token,
-      const base::Time& expiration_time) OVERRIDE;
+      const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(
       const OAuth2TokenService::Request* request,
-      const GoogleServiceAuthError& error) OVERRIDE;
+      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;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
 
   // IdentityProvider::Observer implementation.
-  virtual void OnActiveAccountLogout() OVERRIDE;
+  virtual void OnActiveAccountLogout() override;
 
   // TiclSettingsProvider::Observer implementation.
-  virtual void OnUseGCMChannelChanged() OVERRIDE;
+  virtual void OnUseGCMChannelChanged() override;
 
   // syncer::InvalidationHandler implementation.
   virtual void OnInvalidatorStateChange(
-      syncer::InvalidatorState state) OVERRIDE;
+      syncer::InvalidatorState state) override;
   virtual void OnIncomingInvalidation(
-      const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
-  virtual std::string GetOwnerName() const OVERRIDE;
+      const syncer::ObjectIdInvalidationMap& invalidation_map) override;
+  virtual 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 68a59c8..059071d 100644
--- a/components/invalidation/ticl_invalidation_service_unittest.cc
+++ b/components/invalidation/ticl_invalidation_service_unittest.cc
@@ -30,7 +30,7 @@ class FakeTiclSettingsProvider : public TiclSettingsProvider {
   virtual ~FakeTiclSettingsProvider();
 
   // TiclSettingsProvider:
-  virtual bool UseGCMChannel() const OVERRIDE;
+  virtual bool UseGCMChannel() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeTiclSettingsProvider);
diff --git a/components/invalidation/unacked_invalidation_set_test_util.cc b/components/invalidation/unacked_invalidation_set_test_util.cc
index fc6ead9..15bf7fd 100644
--- a/components/invalidation/unacked_invalidation_set_test_util.cc
+++ b/components/invalidation/unacked_invalidation_set_test_util.cc
@@ -30,9 +30,9 @@ class UnackedInvalidationSetEqMatcher
 
   virtual bool MatchAndExplain(
       const UnackedInvalidationSet& actual,
-      MatchResultListener* listener) const OVERRIDE;
-  virtual void DescribeTo(::std::ostream* os) const OVERRIDE;
-  virtual void DescribeNegationTo(::std::ostream* os) const OVERRIDE;
+      MatchResultListener* listener) const override;
+  virtual void DescribeTo(::std::ostream* os) const override;
+  virtual void DescribeNegationTo(::std::ostream* os) const override;
 
  private:
   const UnackedInvalidationSet expected_;
diff --git a/components/json_schema/json_schema_validator_unittest.cc b/components/json_schema/json_schema_validator_unittest.cc
index aaa2555..134e5fc 100644
--- a/components/json_schema/json_schema_validator_unittest.cc
+++ b/components/json_schema/json_schema_validator_unittest.cc
@@ -15,7 +15,7 @@ class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase {
   virtual void ExpectValid(const std::string& test_source,
                            base::Value* instance,
                            base::DictionaryValue* schema,
-                           base::ListValue* types) OVERRIDE {
+                           base::ListValue* types) override {
     JSONSchemaValidator validator(schema, types);
     if (validator.Validate(instance))
       return;
@@ -32,7 +32,7 @@ class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase {
       base::Value* instance, base::DictionaryValue* schema,
       base::ListValue* types,
       const std::string& expected_error_path,
-      const std::string& expected_error_message) OVERRIDE {
+      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 6e5abad..e3bbdc1 100644
--- a/components/keyed_service/content/browser_context_dependency_manager_unittest.cc
+++ b/components/keyed_service/content/browser_context_dependency_manager_unittest.cc
@@ -34,13 +34,13 @@ class TestService : public BrowserContextKeyedServiceFactory {
         fill_on_shutdown_(fill_on_shutdown) {}
 
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE {
+      content::BrowserContext* context) const override {
     ADD_FAILURE() << "This isn't part of the tests!";
     return NULL;
   }
 
   virtual void BrowserContextShutdown(content::BrowserContext* context)
-      OVERRIDE {
+      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 2049ccf..31608e3 100644
--- a/components/keyed_service/content/browser_context_keyed_service_factory.h
+++ b/components/keyed_service/content/browser_context_keyed_service_factory.h
@@ -93,14 +93,14 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory
   // and the default implementation removes it from |mapping_| and deletes
   // the pointer.
   virtual void BrowserContextShutdown(content::BrowserContext* context)
-      OVERRIDE;
+      override;
   virtual void BrowserContextDestroyed(content::BrowserContext* context)
-      OVERRIDE;
+      override;
 
   virtual void SetEmptyTestingFactory(content::BrowserContext* context)
-      OVERRIDE;
-  virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE;
-  virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE;
+      override;
+  virtual bool HasTestingFactory(content::BrowserContext* context) override;
+  virtual 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 15fd9d9..3898e20 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
@@ -72,13 +72,13 @@ class KEYED_SERVICE_EXPORT RefcountedBrowserContextKeyedServiceFactory
       BuildServiceInstanceFor(content::BrowserContext* context) const = 0;
 
   virtual void BrowserContextShutdown(content::BrowserContext* context)
-      OVERRIDE;
+      override;
   virtual void BrowserContextDestroyed(content::BrowserContext* context)
-      OVERRIDE;
+      override;
   virtual void SetEmptyTestingFactory(content::BrowserContext* context)
-      OVERRIDE;
-  virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE;
-  virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE;
+      override;
+  virtual bool HasTestingFactory(content::BrowserContext* context) override;
+  virtual void CreateServiceNow(content::BrowserContext* context) override;
 
  private:
   typedef std::map<content::BrowserContext*,
diff --git a/components/leveldb_proto/proto_database_impl.h b/components/leveldb_proto/proto_database_impl.h
index cfa9bd6..cc56221 100644
--- a/components/leveldb_proto/proto_database_impl.h
+++ b/components/leveldb_proto/proto_database_impl.h
@@ -41,13 +41,13 @@ class ProtoDatabaseImpl : public ProtoDatabase<T> {
   // TODO(cjhopman): Perhaps Init() shouldn't be exposed to users and not just
   //     part of the constructor
   virtual void Init(const base::FilePath& database_dir,
-                    typename ProtoDatabase<T>::InitCallback callback) OVERRIDE;
+                    typename ProtoDatabase<T>::InitCallback callback) override;
   virtual void UpdateEntries(
       scoped_ptr<typename ProtoDatabase<T>::KeyEntryVector> entries_to_save,
       scoped_ptr<KeyVector> keys_to_remove,
-      typename ProtoDatabase<T>::UpdateCallback callback) OVERRIDE;
+      typename ProtoDatabase<T>::UpdateCallback callback) override;
   virtual void LoadEntries(
-      typename ProtoDatabase<T>::LoadCallback callback) OVERRIDE;
+      typename ProtoDatabase<T>::LoadCallback callback) override;
 
   // Allow callers to provide their own Database implementation.
   void InitWithDatabase(scoped_ptr<LevelDB> database,
diff --git a/components/leveldb_proto/testing/fake_db.h b/components/leveldb_proto/testing/fake_db.h
index 8e57e0e..3bcc70e 100644
--- a/components/leveldb_proto/testing/fake_db.h
+++ b/components/leveldb_proto/testing/fake_db.h
@@ -29,15 +29,15 @@ class FakeDB : public ProtoDatabase<T> {
 
   virtual void Init(const base::FilePath& database_dir,
                     typename ProtoDatabase<T>::InitCallback callback)
-      OVERRIDE;
+      override;
 
   virtual void UpdateEntries(
       scoped_ptr<typename ProtoDatabase<T>::KeyEntryVector> entries_to_save,
       scoped_ptr<std::vector<std::string> > keys_to_remove,
-      typename ProtoDatabase<T>::UpdateCallback callback) OVERRIDE;
+      typename ProtoDatabase<T>::UpdateCallback callback) override;
 
   virtual void LoadEntries(typename ProtoDatabase<T>::LoadCallback callback)
-      OVERRIDE;
+      override;
   base::FilePath& GetDirectory();
 
   void InitCallback(bool success);
diff --git a/components/metrics/daily_event_unittest.cc b/components/metrics/daily_event_unittest.cc
index 4253c13..a43b60b 100644
--- a/components/metrics/daily_event_unittest.cc
+++ b/components/metrics/daily_event_unittest.cc
@@ -20,7 +20,7 @@ class TestDailyObserver : public DailyEvent::Observer {
 
   bool fired() const { return fired_; }
 
-  virtual void OnDailyEvent() OVERRIDE {
+  virtual void OnDailyEvent() override {
     fired_ = true;
   }
 
diff --git a/components/metrics/gpu/gpu_metrics_provider.h b/components/metrics/gpu/gpu_metrics_provider.h
index d10db56..810ef6e 100644
--- a/components/metrics/gpu/gpu_metrics_provider.h
+++ b/components/metrics/gpu/gpu_metrics_provider.h
@@ -19,7 +19,7 @@ class GPUMetricsProvider : public MetricsProvider {
 
   // MetricsProvider:
   virtual void ProvideSystemProfileMetrics(
-      SystemProfileProto* system_profile_proto) OVERRIDE;
+      SystemProfileProto* system_profile_proto) override;
 
  protected:
   // Exposed for the sake of mocking in test code.
diff --git a/components/metrics/gpu/gpu_metrics_provider_unittest.cc b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
index 1aea17a..c7eb31b 100644
--- a/components/metrics/gpu/gpu_metrics_provider_unittest.cc
+++ b/components/metrics/gpu/gpu_metrics_provider_unittest.cc
@@ -24,15 +24,15 @@ class TestGPUMetricsProvider : public GPUMetricsProvider {
   virtual ~TestGPUMetricsProvider() {}
 
  private:
-  virtual gfx::Size GetScreenSize() const OVERRIDE {
+  virtual gfx::Size GetScreenSize() const override {
     return gfx::Size(kScreenWidth, kScreenHeight);
   }
 
-  virtual float GetScreenDeviceScaleFactor() const OVERRIDE {
+  virtual float GetScreenDeviceScaleFactor() const override {
     return kScreenScaleFactor;
   }
 
-  virtual int GetScreenCount() const OVERRIDE {
+  virtual int GetScreenCount() const override {
     return kScreenCount;
   }
 
diff --git a/components/metrics/metrics_log_unittest.cc b/components/metrics/metrics_log_unittest.cc
index 7dcbfcd..eb85227 100644
--- a/components/metrics/metrics_log_unittest.cc
+++ b/components/metrics/metrics_log_unittest.cc
@@ -71,7 +71,7 @@ class TestMetricsLog : public MetricsLog {
 
   virtual void GetFieldTrialIds(
       std::vector<variations::ActiveGroupId>* field_trial_ids) const
-      OVERRIDE {
+      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 fab5698..c332c8a 100644
--- a/components/metrics/metrics_service.h
+++ b/components/metrics/metrics_service.h
@@ -153,12 +153,12 @@ class MetricsService : public base::HistogramFlattener {
 
   // HistogramFlattener:
   virtual void RecordDelta(const base::HistogramBase& histogram,
-                           const base::HistogramSamples& snapshot) OVERRIDE;
+                           const base::HistogramSamples& snapshot) override;
   virtual void InconsistencyDetected(
-      base::HistogramBase::Inconsistency problem) OVERRIDE;
+      base::HistogramBase::Inconsistency problem) override;
   virtual void UniqueInconsistencyDetected(
-      base::HistogramBase::Inconsistency problem) OVERRIDE;
-  virtual void InconsistencyDetectedInLoggedCount(int amount) OVERRIDE;
+      base::HistogramBase::Inconsistency problem) override;
+  virtual 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 3e4f504..8bfbd54 100644
--- a/components/metrics/metrics_service_unittest.cc
+++ b/components/metrics/metrics_service_unittest.cc
@@ -38,9 +38,9 @@ class TestMetricsProvider : public metrics::MetricsProvider {
       provide_stability_metrics_called_(false) {
   }
 
-  virtual bool HasStabilityMetrics() OVERRIDE { return has_stability_metrics_; }
+  virtual bool HasStabilityMetrics() override { return has_stability_metrics_; }
   virtual void ProvideStabilityMetrics(
-      SystemProfileProto* system_profile_proto) OVERRIDE {
+      SystemProfileProto* system_profile_proto) override {
     provide_stability_metrics_called_ = true;
   }
 
diff --git a/components/metrics/net/net_metrics_log_uploader.h b/components/metrics/net/net_metrics_log_uploader.h
index 52ee753..e011430 100644
--- a/components/metrics/net/net_metrics_log_uploader.h
+++ b/components/metrics/net/net_metrics_log_uploader.h
@@ -34,11 +34,11 @@ class NetMetricsLogUploader : public MetricsLogUploader,
 
   // MetricsLogUploader:
   virtual bool UploadLog(const std::string& compressed_log_data,
-                         const std::string& log_hash) OVERRIDE;
+                         const std::string& log_hash) override;
 
  private:
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 29f0ed7..2d03544 100644
--- a/components/metrics/net/network_metrics_provider.h
+++ b/components/metrics/net/network_metrics_provider.h
@@ -27,13 +27,13 @@ class NetworkMetricsProvider
 
  private:
   // metrics::MetricsProvider:
-  virtual void OnDidCreateMetricsLog() OVERRIDE;
+  virtual void OnDidCreateMetricsLog() override;
   virtual void ProvideSystemProfileMetrics(
-      metrics::SystemProfileProto* system_profile) OVERRIDE;
+      metrics::SystemProfileProto* system_profile) override;
 
   // ConnectionTypeObserver:
   virtual void OnConnectionTypeChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   metrics::SystemProfileProto::Network::ConnectionType
   GetConnectionType() const;
diff --git a/components/metrics/net/wifi_access_point_info_provider_chromeos.h b/components/metrics/net/wifi_access_point_info_provider_chromeos.h
index 6eaebab..520cedd 100644
--- a/components/metrics/net/wifi_access_point_info_provider_chromeos.h
+++ b/components/metrics/net/wifi_access_point_info_provider_chromeos.h
@@ -22,11 +22,11 @@ class WifiAccessPointInfoProviderChromeos
   virtual ~WifiAccessPointInfoProviderChromeos();
 
   // WifiAccessPointInfoProvider
-  virtual bool GetInfo(WifiAccessPointInfo* info) OVERRIDE;
+  virtual bool GetInfo(WifiAccessPointInfo* info) override;
 
   // NetworkStateHandlerObserver overrides.
   virtual void DefaultNetworkChanged(
-      const chromeos::NetworkState* default_network) OVERRIDE;
+      const chromeos::NetworkState* default_network) override;
 
  private:
   // Callback from Shill.Service.GetProperties. Parses |properties| to obtain
diff --git a/components/metrics/profiler/profiler_metrics_provider.h b/components/metrics/profiler/profiler_metrics_provider.h
index f9e7e48..d8bdff3 100644
--- a/components/metrics/profiler/profiler_metrics_provider.h
+++ b/components/metrics/profiler/profiler_metrics_provider.h
@@ -24,7 +24,7 @@ class ProfilerMetricsProvider : public MetricsProvider {
 
   // MetricsDataProvider:
   virtual void ProvideGeneralMetrics(
-      ChromeUserMetricsExtension* uma_proto) OVERRIDE;
+      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 75f1f33..2bc08e7 100644
--- a/components/metrics/profiler/tracking_synchronizer.h
+++ b/components/metrics/profiler/tracking_synchronizer.h
@@ -59,7 +59,7 @@ class TrackingSynchronizer
   // This is called on UI thread.
   virtual void OnPendingProcesses(int sequence_number,
                                   int pending_processes,
-                                  bool end) OVERRIDE;
+                                  bool end) override;
 
  private:
   friend class base::RefCountedThreadSafe<TrackingSynchronizer>;
@@ -75,7 +75,7 @@ class TrackingSynchronizer
   virtual void OnProfilerDataCollected(
       int sequence_number,
       const tracked_objects::ProcessDataSnapshot& profiler_data,
-      int process_type) OVERRIDE;
+      int process_type) override;
 
   // Establish a new sequence_number_, and use it to notify all the processes of
   // the need to supply, to the browser, their tracking data. It also registers
diff --git a/components/metrics/serialization/serialization_utils_unittest.cc b/components/metrics/serialization/serialization_utils_unittest.cc
index e8f0e14..aa1c724 100644
--- a/components/metrics/serialization/serialization_utils_unittest.cc
+++ b/components/metrics/serialization/serialization_utils_unittest.cc
@@ -25,7 +25,7 @@ class SerializationUtilsTest : public testing::Test {
     }
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     base::DeleteFile(filepath, false);
   }
 
diff --git a/components/metrics/test_metrics_service_client.h b/components/metrics/test_metrics_service_client.h
index 43600df..8565ca9 100644
--- a/components/metrics/test_metrics_service_client.h
+++ b/components/metrics/test_metrics_service_client.h
@@ -21,22 +21,22 @@ class TestMetricsServiceClient : public MetricsServiceClient {
   virtual ~TestMetricsServiceClient();
 
   // 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 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;
+      const base::Closure& done_callback) override;
   virtual void CollectFinalMetrics(const base::Closure& done_callback)
-      OVERRIDE;
+      override;
   virtual scoped_ptr<MetricsLogUploader> CreateUploader(
       const std::string& server_url,
       const std::string& mime_type,
-      const base::Callback<void(int)>& on_upload_complete) OVERRIDE;
+      const base::Callback<void(int)>& on_upload_complete) override;
 
   const std::string& get_client_id() const { return client_id_; }
   void set_version_string(const std::string& str) { version_string_ = str; }
diff --git a/components/nacl/broker/nacl_broker_listener.h b/components/nacl/broker/nacl_broker_listener.h
index 0b0fff5..3d0d3ca 100644
--- a/components/nacl/broker/nacl_broker_listener.h
+++ b/components/nacl/broker/nacl_broker_listener.h
@@ -27,12 +27,12 @@ class NaClBrokerListener : public content::SandboxedProcessLauncherDelegate,
 
   // content::SandboxedProcessLauncherDelegate implementation:
   virtual void PreSpawnTarget(sandbox::TargetPolicy* policy,
-                              bool* success) OVERRIDE;
+                              bool* success) override;
 
   // IPC::Listener implementation.
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  virtual void OnChannelError() override;
 
  private:
   void OnLaunchLoaderThroughBroker(const std::string& loader_channel_id);
diff --git a/components/nacl/browser/nacl_broker_host_win.cc b/components/nacl/browser/nacl_broker_host_win.cc
index f42cb7f..b6839ad 100644
--- a/components/nacl/browser/nacl_broker_host_win.cc
+++ b/components/nacl/browser/nacl_broker_host_win.cc
@@ -28,7 +28,7 @@ class NaClBrokerSandboxedProcessLauncherDelegate
   NaClBrokerSandboxedProcessLauncherDelegate() {}
   virtual ~NaClBrokerSandboxedProcessLauncherDelegate() {}
 
-  virtual bool ShouldSandbox() OVERRIDE {
+  virtual bool ShouldSandbox() override {
     return false;
   }
 
diff --git a/components/nacl/browser/nacl_file_host_unittest.cc b/components/nacl/browser/nacl_file_host_unittest.cc
index 0a83b7f..c3da2de 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 {
+  virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) override {
     *pnacl_dir = pnacl_path_;
     return true;
   }
@@ -37,12 +37,12 @@ class NaClFileHostTest : public testing::Test {
   NaClFileHostTest();
   virtual ~NaClFileHostTest();
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     nacl_browser_delegate_ = new FileHostTestNaClBrowserDelegate;
     nacl::NaClBrowser::SetDelegate(nacl_browser_delegate_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // This deletes nacl_browser_delegate_.
     nacl::NaClBrowser::SetDelegate(NULL);
   }
diff --git a/components/nacl/browser/nacl_host_message_filter.h b/components/nacl/browser/nacl_host_message_filter.h
index 341cc64..93ea0d4 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;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelClosing() override;
 
   int render_process_id() { return render_process_id_; }
   bool off_the_record() { return off_the_record_; }
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 9b7dcdb8..3b6ddcf 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -176,10 +176,10 @@ class NaClSandboxedProcessLauncherDelegate
     }
   }
 #elif defined(OS_POSIX)
-  virtual bool ShouldUseZygote() OVERRIDE {
+  virtual bool ShouldUseZygote() override {
     return true;
   }
-  virtual int GetIpcFd() OVERRIDE {
+  virtual int GetIpcFd() override {
     return ipc_fd_;
   }
 #endif  // OS_WIN
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index 54d3e60..1bb5288 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -69,7 +69,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
                   const base::FilePath& profile_directory);
   virtual ~NaClProcessHost();
 
-  virtual void OnProcessCrashed(int exit_status) OVERRIDE;
+  virtual 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;
+  virtual 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;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  virtual 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 3e8e8ce..9aa5784 100644
--- a/components/nacl/browser/test_nacl_browser_delegate.h
+++ b/components/nacl/browser/test_nacl_browser_delegate.h
@@ -23,25 +23,25 @@ class TestNaClBrowserDelegate : public NaClBrowserDelegate {
   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;
+                                      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(
-      content::BrowserPpapiHost* ppapi_host) OVERRIDE;
+      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;
+                                     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;
+      GetOnKeepaliveCallback() override;
   virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory,
-                                   const GURL& manifest_url) OVERRIDE;
+                                   const GURL& manifest_url) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestNaClBrowserDelegate);
diff --git a/components/nacl/common/nacl_debug_exception_handler_win.cc b/components/nacl/common/nacl_debug_exception_handler_win.cc
index bc3427e..9819869 100644
--- a/components/nacl/common/nacl_debug_exception_handler_win.cc
+++ b/components/nacl/common/nacl_debug_exception_handler_win.cc
@@ -23,7 +23,7 @@ class DebugExceptionHandler : public base::PlatformThread::Delegate {
         on_connected_(on_connected) {
   }
 
-  virtual void ThreadMain() OVERRIDE {
+  virtual void ThreadMain() override {
     // In the Windows API, the set of processes being debugged is
     // thread-local, so we have to attach to the process (using
     // DebugActiveProcess()) on the same thread on which
diff --git a/components/nacl/loader/nacl_ipc_adapter.h b/components/nacl/loader/nacl_ipc_adapter.h
index 2948f00..84e756d 100644
--- a/components/nacl/loader/nacl_ipc_adapter.h
+++ b/components/nacl/loader/nacl_ipc_adapter.h
@@ -110,9 +110,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;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
   typedef base::Callback<void(IPC::PlatformFileForTransit, base::FilePath)>
       ResolveFileTokenReplyCallback;
diff --git a/components/nacl/loader/nacl_ipc_adapter_unittest.cc b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
index 80fd408..fc812a6 100644
--- a/components/nacl/loader/nacl_ipc_adapter_unittest.cc
+++ b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
@@ -24,7 +24,7 @@ class NaClIPCAdapterTest : public testing::Test {
   NaClIPCAdapterTest() {}
 
   // testing::Test implementation.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     sink_ = new IPC::TestSink;
 
     // Takes ownership of the sink_ pointer. Note we provide the current message
@@ -33,7 +33,7 @@ class NaClIPCAdapterTest : public testing::Test {
     adapter_ = new NaClIPCAdapter(scoped_ptr<IPC::Channel>(sink_),
                                   base::MessageLoopProxy::current().get());
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     sink_ = NULL;  // This pointer is actually owned by the IPCAdapter.
     adapter_ = NULL;
     // The adapter destructor has to post a task to destroy the Channel on the
@@ -279,7 +279,7 @@ TEST_F(NaClIPCAdapterTest, ReadWithChannelError) {
     explicit MyThread(NaClIPCAdapter* adapter)
         : SimpleThread("NaClIPCAdapterThread"),
           adapter_(adapter) {}
-    virtual void Run() OVERRIDE {
+    virtual 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 e523c68..ed7f05d 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 {
+  virtual 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 {
+  virtual 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.";
@@ -187,7 +187,7 @@ class BrowserValidationDBProxy : public NaClValidationDB {
   // used for resolving the main nexe.
   // TODO(teravest): Remove this.
   virtual bool ResolveFileToken(struct NaClFileToken* file_token,
-                                int32* fd, std::string* path) OVERRIDE {
+                                int32* fd, std::string* path) override {
     *fd = -1;
     *path = "";
     if (!NaClFileTokenIsValid(file_token)) {
@@ -262,7 +262,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 {
+  virtual bool OnMessageReceived(const IPC::Message& msg) override {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FileTokenMessageFilter, msg)
       IPC_MESSAGE_HANDLER(NaClProcessMsg_ResolveFileTokenAsyncReply,
diff --git a/components/nacl/loader/nacl_listener.h b/components/nacl/loader/nacl_listener.h
index e24fea5..6a6e8c2 100644
--- a/components/nacl/loader/nacl_listener.h
+++ b/components/nacl/loader/nacl_listener.h
@@ -59,7 +59,7 @@ class NaClListener : public IPC::Listener {
                            base::FilePath file_path);
 
  private:
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual 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 75d7551..497dd68 100644
--- a/components/nacl/loader/nacl_trusted_listener.h
+++ b/components/nacl/loader/nacl_trusted_listener.h
@@ -24,8 +24,8 @@ class NaClTrustedListener : public base::RefCounted<NaClTrustedListener>,
   IPC::ChannelHandle TakeClientChannelHandle();
 
   // Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelError() override;
 
   bool Send(IPC::Message* msg);
 
diff --git a/components/nacl/loader/nacl_validation_query_unittest.cc b/components/nacl/loader/nacl_validation_query_unittest.cc
index 3846eff..288f1c4 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 {
+  virtual 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 {
+  virtual 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,
@@ -68,7 +68,7 @@ class MockValidationDB : public NaClValidationDB {
   }
 
   virtual bool ResolveFileToken(struct NaClFileToken* file_token, int32* fd,
-                                std::string* path) OVERRIDE {
+                                std::string* path) override {
     *fd = -1;
     *path = "";
     return false;
diff --git a/components/nacl/loader/nonsfi/nonsfi_listener.h b/components/nacl/loader/nonsfi/nonsfi_listener.h
index a2acc61..de869f2 100644
--- a/components/nacl/loader/nonsfi/nonsfi_listener.h
+++ b/components/nacl/loader/nonsfi/nonsfi_listener.h
@@ -36,7 +36,7 @@ class NonSfiListener : public IPC::Listener {
   bool Send(IPC::Message* msg);
 
  private:
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
   void OnStart(const nacl::NaClStartParams& params);
 
   base::Thread io_thread_;
diff --git a/components/nacl/loader/nonsfi/nonsfi_main.cc b/components/nacl/loader/nonsfi/nonsfi_main.cc
index 8ec6995..c053586 100644
--- a/components/nacl/loader/nonsfi/nonsfi_main.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_main.cc
@@ -31,7 +31,7 @@ class PluginMainDelegate : public base::PlatformThread::Delegate {
   virtual ~PluginMainDelegate() {
   }
 
-  virtual void ThreadMain() OVERRIDE {
+  virtual void ThreadMain() override {
     base::PlatformThread::SetName("NaClMainThread");
 
     // This will only happen once per process, so we give the permission to
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox.h b/components/nacl/loader/nonsfi/nonsfi_sandbox.h
index ae9f892..bc57635 100644
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox.h
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox.h
@@ -21,8 +21,8 @@ class NaClNonSfiBPFSandboxPolicy
   virtual ~NaClNonSfiBPFSandboxPolicy() {}
 
   virtual sandbox::bpf_dsl::ResultExpr EvaluateSyscall(
-      int sysno) const OVERRIDE;
-  virtual sandbox::bpf_dsl::ResultExpr InvalidSyscall() const OVERRIDE;
+      int sysno) const override;
+  virtual sandbox::bpf_dsl::ResultExpr InvalidSyscall() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NaClNonSfiBPFSandboxPolicy);
diff --git a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
index 20d6d1f..a1449cf 100644
--- a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
+++ b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
@@ -39,8 +39,8 @@ class NaClBPFSandboxPolicy : public sandbox::bpf_dsl::SandboxBPFDSLPolicy {
       : baseline_policy_(content::GetBPFSandboxBaselinePolicy()) {}
   virtual ~NaClBPFSandboxPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int system_call_number) const OVERRIDE;
-  virtual ResultExpr InvalidSyscall() const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int system_call_number) const override;
+  virtual ResultExpr InvalidSyscall() const override {
     return baseline_policy_->InvalidSyscall();
   }
 
diff --git a/components/nacl/renderer/manifest_service_channel.h b/components/nacl/renderer/manifest_service_channel.h
index 71a1034..c62dd23 100644
--- a/components/nacl/renderer/manifest_service_channel.h
+++ b/components/nacl/renderer/manifest_service_channel.h
@@ -55,9 +55,9 @@ class ManifestServiceChannel : public IPC::Listener {
   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;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
 
  private:
   void OnStartupInitializationComplete();
diff --git a/components/nacl/renderer/nacl_helper.h b/components/nacl/renderer/nacl_helper.h
index be3a52d..4c28bf7 100644
--- a/components/nacl/renderer/nacl_helper.h
+++ b/components/nacl/renderer/nacl_helper.h
@@ -20,7 +20,7 @@ class NaClHelper : public content::RenderFrameObserver {
   virtual ~NaClHelper();
 
   // RenderFrameObserver.
-  virtual void DidCreatePepperPlugin(content::RendererPpapiHost* host) OVERRIDE;
+  virtual 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 18441ce..94d1e45 100644
--- a/components/nacl/renderer/pnacl_translation_resource_host.h
+++ b/components/nacl/renderer/pnacl_translation_resource_host.h
@@ -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;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnFilterAdded(IPC::Sender* sender) override;
+  virtual void OnFilterRemoved() override;
+  virtual 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 0966ccd..5af4c17 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -167,7 +167,7 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
 
   virtual ~ManifestServiceProxy() { }
 
-  virtual void StartupInitializationComplete() OVERRIDE {
+  virtual void StartupInitializationComplete() override {
     if (StartPpapiProxy(pp_instance_) == PP_TRUE) {
       JsonManifest* manifest = GetJsonManifest(pp_instance_);
       NexeLoadManager* load_manager = NexeLoadManager::Get(pp_instance_);
@@ -189,7 +189,7 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
 
   virtual void OpenResource(
       const std::string& key,
-      const ManifestServiceChannel::OpenResourceCallback& callback) OVERRIDE {
+      const ManifestServiceChannel::OpenResourceCallback& callback) override {
     DCHECK(ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->
                BelongsToCurrentThread());
 
diff --git a/components/nacl/renderer/trusted_plugin_channel.h b/components/nacl/renderer/trusted_plugin_channel.h
index 5f49f12..dfc92c0 100644
--- a/components/nacl/renderer/trusted_plugin_channel.h
+++ b/components/nacl/renderer/trusted_plugin_channel.h
@@ -34,8 +34,8 @@ class TrustedPluginChannel : public IPC::Listener {
   bool Send(IPC::Message* message);
 
   // Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelError() override;
 
   void OnReportExitStatus(int exit_status);
 
diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.h b/components/nacl/zygote/nacl_fork_delegate_linux.h
index 6a72a01..5d7b6b8 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.h
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.h
@@ -36,18 +36,18 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
   explicit NaClForkDelegate(bool nonsfi_mode);
   virtual ~NaClForkDelegate();
 
-  virtual void Init(int sandboxdesc, bool enable_layer1_sandbox) OVERRIDE;
+  virtual void Init(int sandboxdesc, bool enable_layer1_sandbox) override;
   virtual void InitialUMA(std::string* uma_name,
                           int* uma_sample,
-                          int* uma_boundary_value) OVERRIDE;
+                          int* uma_boundary_value) override;
   virtual bool CanHelp(const std::string& process_type, std::string* uma_name,
-                          int* uma_sample, int* uma_boundary_value) OVERRIDE;
+                          int* uma_sample, int* uma_boundary_value) override;
   virtual pid_t Fork(const std::string& process_type,
                      const std::vector<int>& fds,
-                     const std::string& channel_id) OVERRIDE;
+                     const std::string& channel_id) override;
   virtual bool GetTerminationStatus(pid_t pid, bool known_dead,
                                     base::TerminationStatus* status,
-                                    int* exit_code) OVERRIDE;
+                                    int* exit_code) override;
 
  private:
   static void AddPassthroughEnvToOptions(base::LaunchOptions* options);
diff --git a/components/navigation_interception/intercept_navigation_resource_throttle.h b/components/navigation_interception/intercept_navigation_resource_throttle.h
index 2e80ca0..b77a5f7 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle.h
+++ b/components/navigation_interception/intercept_navigation_resource_throttle.h
@@ -40,9 +40,9 @@ class InterceptNavigationResourceThrottle : public content::ResourceThrottle {
   virtual ~InterceptNavigationResourceThrottle();
 
   // 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;
+  virtual void WillStartRequest(bool* defer) override;
+  virtual void WillRedirectRequest(const GURL& new_url, bool* defer) override;
+  virtual 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 54fb91d..b39078ed 100644
--- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
+++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc
@@ -86,16 +86,16 @@ class MockResourceController : public content::ResourceController {
   Status status() const { return status_; }
 
   // ResourceController:
-  virtual void Cancel() OVERRIDE {
+  virtual void Cancel() override {
     NOTREACHED();
   }
-  virtual void CancelAndIgnore() OVERRIDE {
+  virtual void CancelAndIgnore() override {
     status_ = CANCELLED;
   }
-  virtual void CancelWithError(int error_code) OVERRIDE {
+  virtual void CancelWithError(int error_code) override {
     NOTREACHED();
   }
-  virtual void Resume() OVERRIDE {
+  virtual void Resume() override {
     DCHECK(status_ == UNKNOWN);
     status_ = RESUMED;
   }
@@ -190,11 +190,11 @@ class InterceptNavigationResourceThrottleTest
         io_thread_state_(NULL) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     RenderViewHostTestHarness::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (web_contents())
       web_contents()->SetDelegate(NULL);
 
diff --git a/components/network_time/network_time_tracker_unittest.cc b/components/network_time/network_time_tracker_unittest.cc
index 3febae8..60d316e 100644
--- a/components/network_time/network_time_tracker_unittest.cc
+++ b/components/network_time/network_time_tracker_unittest.cc
@@ -32,7 +32,7 @@ class TestTickClock : public base::TickClock {
   explicit TestTickClock(base::TimeTicks* ticks_now) : ticks_now_(ticks_now) {}
   virtual ~TestTickClock() {}
 
-  virtual base::TimeTicks NowTicks() OVERRIDE {
+  virtual base::TimeTicks NowTicks() override {
     return *ticks_now_;
   }
 
@@ -46,7 +46,7 @@ class NetworkTimeTrackerTest : public testing::Test {
  public:
   virtual ~NetworkTimeTrackerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     NetworkTimeTracker::RegisterPrefs(pref_service_.registry());
 
     now_ = base::Time::NowFromSystemTime();
diff --git a/components/omaha_query_params/omaha_query_params_unittest.cc b/components/omaha_query_params/omaha_query_params_unittest.cc
index 37a97e9..dd4055d 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"; }
+  virtual std::string GetExtraParams() override { return "&cat=dog"; }
 };
 
 }  // namespace
diff --git a/components/omnibox/autocomplete_result_unittest.cc b/components/omnibox/autocomplete_result_unittest.cc
index d80f7e6..4692849 100644
--- a/components/omnibox/autocomplete_result_unittest.cc
+++ b/components/omnibox/autocomplete_result_unittest.cc
@@ -89,7 +89,7 @@ class AutocompleteResultTest : public testing::Test  {
     variations::testing::ClearAllVariationParams();
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
 #if defined(OS_ANDROID)
     TemplateURLPrepopulateData::InitCountryCode(
         std::string() /* unknown country code */);
diff --git a/components/omnibox/base_search_provider.cc b/components/omnibox/base_search_provider.cc
index 4e19930..5f054ad 100644
--- a/components/omnibox/base_search_provider.cc
+++ b/components/omnibox/base_search_provider.cc
@@ -40,7 +40,7 @@ class SuggestionDeletionHandler : public net::URLFetcherDelegate {
 
  private:
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 f4d3e79..0ec9d1d 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;
+  virtual void DeleteMatch(const AutocompleteMatch& match) override;
+  virtual void AddProviderInfo(ProvidersInfo* provider_info) const override;
 
   bool field_trial_triggered_in_session() const {
     return field_trial_triggered_in_session_;
diff --git a/components/omnibox/keyword_provider.h b/components/omnibox/keyword_provider.h
index f714791..aa7c44a 100644
--- a/components/omnibox/keyword_provider.h
+++ b/components/omnibox/keyword_provider.h
@@ -95,8 +95,8 @@ class KeywordProvider : public AutocompleteProvider {
 
   // AutocompleteProvider:
   virtual void Start(const AutocompleteInput& input,
-                     bool minimal_changes) OVERRIDE;
-  virtual void Stop(bool clear_cached_results) OVERRIDE;
+                     bool minimal_changes) override;
+  virtual void Stop(bool clear_cached_results) override;
 
  private:
   friend class KeywordExtensionsDelegateImpl;
diff --git a/components/omnibox/keyword_provider_unittest.cc b/components/omnibox/keyword_provider_unittest.cc
index 8dd3479..dd550d4 100644
--- a/components/omnibox/keyword_provider_unittest.cc
+++ b/components/omnibox/keyword_provider_unittest.cc
@@ -22,7 +22,7 @@ namespace {
 class TestingSchemeClassifier : public AutocompleteSchemeClassifier {
  public:
   virtual metrics::OmniboxInputType::Type GetInputTypeForScheme(
-      const std::string& scheme) const OVERRIDE {
+      const std::string& scheme) const override {
     if (net::URLRequest::IsHandledProtocol(scheme))
       return metrics::OmniboxInputType::URL;
     return metrics::OmniboxInputType::INVALID;
diff --git a/components/omnibox/search_provider.h b/components/omnibox/search_provider.h
index e0dbe81..83eeaa3 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;
+  virtual 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) {
@@ -159,18 +159,18 @@ class SearchProvider : public BaseSearchProvider,
 
   // AutocompleteProvider:
   virtual void Start(const AutocompleteInput& input,
-                     bool minimal_changes) OVERRIDE;
-  virtual void Stop(bool clear_cached_results) OVERRIDE;
+                     bool minimal_changes) override;
+  virtual 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 const TemplateURL* GetTemplateURL(bool is_keyword) const override;
+  virtual const AutocompleteInput GetInput(bool is_keyword) const override;
   virtual bool ShouldAppendExtraParams(
-      const SearchSuggestionParser::SuggestResult& result) const OVERRIDE;
-  virtual void RecordDeletionResult(bool success) OVERRIDE;
+      const SearchSuggestionParser::SuggestResult& result) const override;
+  virtual void RecordDeletionResult(bool success) override;
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 8e8ba3d..f5493f1 100644
--- a/components/omnibox/search_suggestion_parser.h
+++ b/components/omnibox/search_suggestion_parser.h
@@ -151,7 +151,7 @@ class SearchSuggestionParser {
     // Result:
     virtual int CalculateRelevance(
         const AutocompleteInput& input,
-        bool keyword_provider_requested) const OVERRIDE;
+        bool keyword_provider_requested) const override;
 
    private:
     // The search terms to be used for this suggestion.
@@ -211,7 +211,7 @@ class SearchSuggestionParser {
     // Result:
     virtual int CalculateRelevance(
         const AutocompleteInput& input,
-        bool keyword_provider_requested) const OVERRIDE;
+        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 b9326d9..3217950 100644
--- a/components/omnibox/test_scheme_classifier.h
+++ b/components/omnibox/test_scheme_classifier.h
@@ -16,7 +16,7 @@ class TestSchemeClassifier : public AutocompleteSchemeClassifier {
 
   // Overridden from AutocompleteInputSchemeChecker:
   virtual metrics::OmniboxInputType::Type GetInputTypeForScheme(
-      const std::string& scheme) const OVERRIDE;
+      const std::string& scheme) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestSchemeClassifier);
diff --git a/components/os_crypt/os_crypt_unittest.cc b/components/os_crypt/os_crypt_unittest.cc
index ef9fde0..bd7aef7 100644
--- a/components/os_crypt/os_crypt_unittest.cc
+++ b/components/os_crypt/os_crypt_unittest.cc
@@ -17,7 +17,7 @@ class OSCryptTest : public testing::Test {
  public:
   OSCryptTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
 #if defined(OS_MACOSX)
     OSCrypt::UseMockKeychain(true);
 #endif
diff --git a/components/ownership/mock_owner_key_util.h b/components/ownership/mock_owner_key_util.h
index 821f075..79e071b 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;
+  virtual bool ImportPublicKey(std::vector<uint8>* output) override;
 #if defined(USE_NSS)
   virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
       const std::vector<uint8>& key,
-      PK11SlotInfo* slot) OVERRIDE;
+      PK11SlotInfo* slot) override;
 #endif  // defined(USE_NSS)
-  virtual bool IsPublicKeyPresent() OVERRIDE;
+  virtual bool IsPublicKeyPresent() override;
 
   // Clears the public and private keys.
   void Clear();
diff --git a/components/ownership/owner_key_util_impl.h b/components/ownership/owner_key_util_impl.h
index 279e57fa..1bd8c23 100644
--- a/components/ownership/owner_key_util_impl.h
+++ b/components/ownership/owner_key_util_impl.h
@@ -20,13 +20,13 @@ class OWNERSHIP_EXPORT OwnerKeyUtilImpl : public OwnerKeyUtil {
   explicit OwnerKeyUtilImpl(const base::FilePath& public_key_file);
 
   // OwnerKeyUtil implementation:
-  virtual bool ImportPublicKey(std::vector<uint8>* output) OVERRIDE;
+  virtual bool ImportPublicKey(std::vector<uint8>* output) override;
 #if defined(USE_NSS)
   virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot(
       const std::vector<uint8>& key,
-      PK11SlotInfo* slot) OVERRIDE;
+      PK11SlotInfo* slot) override;
 #endif  // defined(USE_NSS)
-  virtual bool IsPublicKeyPresent() OVERRIDE;
+  virtual bool IsPublicKeyPresent() override;
 
  private:
   virtual ~OwnerKeyUtilImpl();
diff --git a/components/ownership/owner_key_util_impl_unittest.cc b/components/ownership/owner_key_util_impl_unittest.cc
index f434ee4..950201e 100644
--- a/components/ownership/owner_key_util_impl_unittest.cc
+++ b/components/ownership/owner_key_util_impl_unittest.cc
@@ -51,7 +51,7 @@ class OwnerKeyUtilImplTest : public testing::Test {
   OwnerKeyUtilImplTest() {}
   virtual ~OwnerKeyUtilImplTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(tmpdir_.CreateUniqueTempDir());
     key_file_ = tmpdir_.path().Append(FILE_PATH_LITERAL("key"));
     util_ = new OwnerKeyUtilImpl(key_file_);
diff --git a/components/pairing/bluetooth_controller_pairing_controller.h b/components/pairing/bluetooth_controller_pairing_controller.h
index cbc5cd8..e0297e9 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.h
+++ b/components/pairing/bluetooth_controller_pairing_controller.h
@@ -57,55 +57,55 @@ class BluetoothControllerPairingController
 
   // ControllerPairingController:
   virtual void AddObserver(
-      ControllerPairingController::Observer* observer) OVERRIDE;
+      ControllerPairingController::Observer* observer) override;
   virtual void RemoveObserver(
-      ControllerPairingController::Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual DeviceIdList GetDiscoveredDevices() OVERRIDE;
-  virtual void ChooseDeviceForPairing(const std::string& device_id) OVERRIDE;
-  virtual void RepeatDiscovery() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual void SetConfirmationCodeIsCorrect(bool correct) OVERRIDE;
+      ControllerPairingController::Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual DeviceIdList GetDiscoveredDevices() override;
+  virtual void ChooseDeviceForPairing(const std::string& device_id) override;
+  virtual void RepeatDiscovery() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual void SetConfirmationCodeIsCorrect(bool correct) override;
   virtual void SetHostConfiguration(
       bool accepted_eula,
       const std::string& lang,
       const std::string& timezone,
       bool send_reports,
-      const std::string& keyboard_layout) OVERRIDE;
+      const std::string& keyboard_layout) override;
   virtual void OnAuthenticationDone(const std::string& domain,
-                                    const std::string& auth_token) OVERRIDE;
-  virtual void StartSession() OVERRIDE;
+                                    const std::string& auth_token) override;
+  virtual void StartSession() override;
 
   // ProtoDecoder::Observer:
   virtual void OnHostStatusMessage(
-      const pairing_api::HostStatus& message) OVERRIDE;
+      const pairing_api::HostStatus& message) override;
   virtual void OnConfigureHostMessage(
-      const pairing_api::ConfigureHost& message) OVERRIDE;
+      const pairing_api::ConfigureHost& message) override;
   virtual void OnPairDevicesMessage(
-      const pairing_api::PairDevices& message) OVERRIDE;
+      const pairing_api::PairDevices& message) override;
   virtual void OnCompleteSetupMessage(
-      const pairing_api::CompleteSetup& message) OVERRIDE;
-  virtual void OnErrorMessage(const pairing_api::Error& message) OVERRIDE;
+      const pairing_api::CompleteSetup& message) override;
+  virtual void OnErrorMessage(const pairing_api::Error& message) override;
 
   // BluetoothAdapter::Observer:
   virtual void DeviceAdded(device::BluetoothAdapter* adapter,
-                           device::BluetoothDevice* device) OVERRIDE;
+                           device::BluetoothDevice* device) override;
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) OVERRIDE;
+                             device::BluetoothDevice* device) override;
 
   // device::BluetoothDevice::PairingDelegate:
-  virtual void RequestPinCode(device::BluetoothDevice* device) OVERRIDE;
-  virtual void RequestPasskey(device::BluetoothDevice* device) OVERRIDE;
+  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;
+                              const std::string& pincode) override;
   virtual void DisplayPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
+                              uint32 passkey) override;
   virtual void KeysEntered(device::BluetoothDevice* device,
-                           uint32 entered) OVERRIDE;
+                           uint32 entered) override;
   virtual void ConfirmPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
-  virtual void AuthorizePairing(device::BluetoothDevice* device) OVERRIDE;
+                              uint32 passkey) override;
+  virtual void AuthorizePairing(device::BluetoothDevice* device) override;
 
   Stage current_stage_;
   bool got_initial_status_;
diff --git a/components/pairing/bluetooth_host_pairing_controller.h b/components/pairing/bluetooth_host_pairing_controller.h
index 05feab1..edc39fa 100644
--- a/components/pairing/bluetooth_host_pairing_controller.h
+++ b/components/pairing/bluetooth_host_pairing_controller.h
@@ -62,43 +62,43 @@ class BluetoothHostPairingController
                       const std::string& error_message);
 
   // HostPairingController:
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual std::string GetDeviceName() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual std::string GetEnrollmentDomain() OVERRIDE;
-  virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE;
-  virtual void SetEnrollmentComplete(bool success) OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual std::string GetDeviceName() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual std::string GetEnrollmentDomain() override;
+  virtual void OnUpdateStatusChanged(UpdateStatus update_status) override;
+  virtual void SetEnrollmentComplete(bool success) override;
 
   // ProtoDecoder::Observer:
   virtual void OnHostStatusMessage(
-      const pairing_api::HostStatus& message) OVERRIDE;
+      const pairing_api::HostStatus& message) override;
   virtual void OnConfigureHostMessage(
-      const pairing_api::ConfigureHost& message) OVERRIDE;
+      const pairing_api::ConfigureHost& message) override;
   virtual void OnPairDevicesMessage(
-      const pairing_api::PairDevices& message) OVERRIDE;
+      const pairing_api::PairDevices& message) override;
   virtual void OnCompleteSetupMessage(
-      const pairing_api::CompleteSetup& message) OVERRIDE;
-  virtual void OnErrorMessage(const pairing_api::Error& message) OVERRIDE;
+      const pairing_api::CompleteSetup& message) override;
+  virtual void OnErrorMessage(const pairing_api::Error& message) override;
 
   // BluetoothAdapter::Observer:
   virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter,
-                                     bool present) OVERRIDE;
+                                     bool present) override;
 
   // device::BluetoothDevice::PairingDelegate:
-  virtual void RequestPinCode(device::BluetoothDevice* device) OVERRIDE;
-  virtual void RequestPasskey(device::BluetoothDevice* device) OVERRIDE;
+  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;
+                              const std::string& pincode) override;
   virtual void DisplayPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
+                              uint32 passkey) override;
   virtual void KeysEntered(device::BluetoothDevice* device,
-                           uint32 entered) OVERRIDE;
+                           uint32 entered) override;
   virtual void ConfirmPasskey(device::BluetoothDevice* device,
-                              uint32 passkey) OVERRIDE;
-  virtual void AuthorizePairing(device::BluetoothDevice* device) OVERRIDE;
+                              uint32 passkey) override;
+  virtual void AuthorizePairing(device::BluetoothDevice* device) override;
 
   Stage current_stage_;
   std::string device_name_;
diff --git a/components/pairing/fake_controller_pairing_controller.h b/components/pairing/fake_controller_pairing_controller.h
index 99ac3de..edb3666 100644
--- a/components/pairing/fake_controller_pairing_controller.h
+++ b/components/pairing/fake_controller_pairing_controller.h
@@ -64,24 +64,24 @@ class FakeControllerPairingController
   void SetDiscoveryScenario(const DiscoveryScenario& discovery_scenario);
 
   // Overridden from ControllerPairingController:
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual DeviceIdList GetDiscoveredDevices() OVERRIDE;
-  virtual void ChooseDeviceForPairing(const std::string& device_id) OVERRIDE;
-  virtual void RepeatDiscovery() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual void SetConfirmationCodeIsCorrect(bool correct) OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual DeviceIdList GetDiscoveredDevices() override;
+  virtual void ChooseDeviceForPairing(const std::string& device_id) override;
+  virtual void RepeatDiscovery() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual void SetConfirmationCodeIsCorrect(bool correct) override;
   virtual void SetHostConfiguration(
       bool accepted_eula,
       const std::string& lang,
       const std::string& timezone,
       bool send_reports,
-      const std::string& keyboard_layout) OVERRIDE;
+      const std::string& keyboard_layout) override;
   virtual void OnAuthenticationDone(const std::string& domain,
-                                    const std::string& auth_token) OVERRIDE;
-  virtual void StartSession() OVERRIDE;
+                                    const std::string& auth_token) override;
+  virtual void StartSession() override;
 
  private:
   void ChangeStage(Stage new_stage);
@@ -91,8 +91,8 @@ class FakeControllerPairingController
   void DeviceLost(const std::string& device_id);
 
   // Overridden from ui::ControllerPairingController::Observer:
-  virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
-  virtual void DiscoveredDevicesListChanged() OVERRIDE;
+  virtual void PairingStageChanged(Stage new_stage) override;
+  virtual void DiscoveredDevicesListChanged() override;
 
   ObserverList<ControllerPairingController::Observer> observers_;
   Stage current_stage_;
diff --git a/components/pairing/fake_host_pairing_controller.h b/components/pairing/fake_host_pairing_controller.h
index f665aa6..138963a 100644
--- a/components/pairing/fake_host_pairing_controller.h
+++ b/components/pairing/fake_host_pairing_controller.h
@@ -34,28 +34,28 @@ class FakeHostPairingController
   void ApplyConfig(const std::string& config);
 
   // Overridden from HostPairingFlow:
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual Stage GetCurrentStage() OVERRIDE;
-  virtual void StartPairing() OVERRIDE;
-  virtual std::string GetDeviceName() OVERRIDE;
-  virtual std::string GetConfirmationCode() OVERRIDE;
-  virtual std::string GetEnrollmentDomain() OVERRIDE;
-  virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE;
-  virtual void SetEnrollmentComplete(bool success) OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual Stage GetCurrentStage() override;
+  virtual void StartPairing() override;
+  virtual std::string GetDeviceName() override;
+  virtual std::string GetConfirmationCode() override;
+  virtual std::string GetEnrollmentDomain() override;
+  virtual void OnUpdateStatusChanged(UpdateStatus update_status) override;
+  virtual void SetEnrollmentComplete(bool success) override;
 
  private:
   void ChangeStage(Stage new_stage);
   void ChangeStageLater(Stage new_stage);
 
   // HostPairingFlow::Observer:
-  virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
+  virtual void PairingStageChanged(Stage new_stage) override;
   virtual void ConfigureHost(bool accepted_eula,
                              const std::string& lang,
                              const std::string& timezone,
                              bool send_reports,
-                             const std::string& keyboard_layout) OVERRIDE;
-  virtual void EnrollHost(const std::string& auth_token) OVERRIDE;
+                             const std::string& keyboard_layout) override;
+  virtual void EnrollHost(const std::string& auth_token) override;
 
   ObserverList<Observer> observers_;
   Stage current_stage_;
diff --git a/components/pairing/shark_connection_listener.h b/components/pairing/shark_connection_listener.h
index e2e786b..e2f9b06 100644
--- a/components/pairing/shark_connection_listener.h
+++ b/components/pairing/shark_connection_listener.h
@@ -29,13 +29,13 @@ class SharkConnectionListener : public HostPairingController::Observer {
   typedef HostPairingController::Stage Stage;
 
   // HostPairingController::Observer overrides:
-  virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
+  virtual void PairingStageChanged(Stage new_stage) override;
   virtual void ConfigureHost(bool accepted_eula,
                              const std::string& lang,
                              const std::string& timezone,
                              bool send_reports,
-                             const std::string& keyboard_layout) OVERRIDE;
-  virtual void EnrollHost(const std::string& auth_token) OVERRIDE;
+                             const std::string& keyboard_layout) override;
+  virtual void EnrollHost(const std::string& auth_token) override;
 
   OnConnectedCallback callback_;
   scoped_ptr<HostPairingController> controller_;
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 839f991..b952e5c 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,7 +33,7 @@ class TestPasswordManagerClient
       : store_(store) {}
   virtual ~TestPasswordManagerClient() {}
 
-  virtual password_manager::PasswordStore* GetPasswordStore() OVERRIDE {
+  virtual password_manager::PasswordStore* GetPasswordStore() override {
     return store_;
   }
 
@@ -77,7 +77,7 @@ class ContentCredentialManagerDispatcherTest
     EXPECT_TRUE(store_->IsEmpty());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     store_->Shutdown();
     content::RenderViewHostTestHarness::TearDown();
   }
diff --git a/components/pdf/browser/pdf_web_contents_helper.h b/components/pdf/browser/pdf_web_contents_helper.h
index d37b57f..7948768e 100644
--- a/components/pdf/browser/pdf_web_contents_helper.h
+++ b/components/pdf/browser/pdf_web_contents_helper.h
@@ -43,10 +43,10 @@ class PDFWebContentsHelper
   virtual ~PDFWebContentsHelper();
 
   // content::WebContentsObserver overrides:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
 
   // Internal helpers ----------------------------------------------------------
 
diff --git a/components/pdf/renderer/pepper_pdf_host.h b/components/pdf/renderer/pepper_pdf_host.h
index 2fa49af..59be516 100644
--- a/components/pdf/renderer/pepper_pdf_host.h
+++ b/components/pdf/renderer/pepper_pdf_host.h
@@ -45,7 +45,7 @@ class PepperPDFHost : public ppapi::host::ResourceHost {
 
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
  private:
   int32_t OnHostMsgGetLocalizedString(ppapi::host::HostMessageContext* context,
diff --git a/components/plugins/renderer/mobile_youtube_plugin.h b/components/plugins/renderer/mobile_youtube_plugin.h
index 288daa1..9e68277 100644
--- a/components/plugins/renderer/mobile_youtube_plugin.h
+++ b/components/plugins/renderer/mobile_youtube_plugin.h
@@ -32,11 +32,11 @@ class MobileYouTubePlugin : public PluginPlaceholder {
   void OpenYoutubeUrlCallback();
 
   // WebViewPlugin::Delegate (via PluginPlaceholder) method
-  virtual void BindWebFrame(blink::WebFrame* frame) OVERRIDE;
+  virtual void BindWebFrame(blink::WebFrame* frame) override;
 
   // gin::Wrappable (via PluginPlaceholder) method
   virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) OVERRIDE;
+      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 3427d40..2d3733f 100644
--- a/components/plugins/renderer/plugin_placeholder.h
+++ b/components/plugins/renderer/plugin_placeholder.h
@@ -68,15 +68,15 @@ class PluginPlaceholder : public content::RenderFrameObserver,
 
   // gin::Wrappable method:
   virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) OVERRIDE;
+      v8::Isolate* isolate) override;
 
  private:
   // WebViewPlugin::Delegate methods:
-  virtual void ShowContextMenu(const blink::WebMouseEvent&) OVERRIDE;
-  virtual void PluginDestroyed() OVERRIDE;
+  virtual void ShowContextMenu(const blink::WebMouseEvent&) override;
+  virtual void PluginDestroyed() override;
 
   // RenderFrameObserver methods:
-  virtual void OnDestruct() OVERRIDE;
+  virtual 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 983e973..67b90be 100644
--- a/components/policy/core/browser/autofill_policy_handler.h
+++ b/components/policy/core/browser/autofill_policy_handler.h
@@ -18,7 +18,7 @@ class POLICY_EXPORT AutofillPolicyHandler : public TypeCheckingPolicyHandler {
 
   // ConfigurationPolicyHandler methods:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutofillPolicyHandler);
diff --git a/components/policy/core/browser/browser_policy_connector_ios.h b/components/policy/core/browser/browser_policy_connector_ios.h
index 9d0d5ce..3013500 100644
--- a/components/policy/core/browser/browser_policy_connector_ios.h
+++ b/components/policy/core/browser/browser_policy_connector_ios.h
@@ -31,7 +31,7 @@ class POLICY_EXPORT BrowserPolicyConnectorIOS : public BrowserPolicyConnector {
 
   virtual void Init(
       PrefService* local_state,
-      scoped_refptr<net::URLRequestContextGetter> request_context) OVERRIDE;
+      scoped_refptr<net::URLRequestContextGetter> request_context) override;
 
  private:
   std::string user_agent_;
diff --git a/components/policy/core/browser/browser_policy_connector_ios.mm b/components/policy/core/browser/browser_policy_connector_ios.mm
index 5a11238..51d41c5 100644
--- a/components/policy/core/browser/browser_policy_connector_ios.mm
+++ b/components/policy/core/browser/browser_policy_connector_ios.mm
@@ -24,15 +24,15 @@ class DeviceManagementServiceConfiguration
 
   virtual ~DeviceManagementServiceConfiguration() {}
 
-  virtual std::string GetServerUrl() OVERRIDE {
+  virtual std::string GetServerUrl() override {
     return BrowserPolicyConnector::GetDeviceManagementUrl();
   }
 
-  virtual std::string GetAgentParameter() OVERRIDE {
+  virtual std::string GetAgentParameter() override {
     return user_agent_;
   }
 
-  virtual std::string GetPlatformParameter() OVERRIDE {
+  virtual std::string GetPlatformParameter() override {
     std::string os_name = base::SysInfo::OperatingSystemName();
     std::string os_hardware = base::SysInfo::OperatingSystemArchitecture();
     std::string os_version("-");
diff --git a/components/policy/core/browser/configuration_policy_handler.h b/components/policy/core/browser/configuration_policy_handler.h
index 60314b0..16cf7f4 100644
--- a/components/policy/core/browser/configuration_policy_handler.h
+++ b/components/policy/core/browser/configuration_policy_handler.h
@@ -82,7 +82,7 @@ class POLICY_EXPORT TypeCheckingPolicyHandler
 
   // ConfigurationPolicyHandler methods:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
 
   const char* policy_name() const;
 
@@ -115,7 +115,7 @@ class POLICY_EXPORT IntRangePolicyHandlerBase
 
   // ConfigurationPolicyHandler:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
 
  protected:
   virtual ~IntRangePolicyHandlerBase();
@@ -151,7 +151,7 @@ class POLICY_EXPORT SimplePolicyHandler : public TypeCheckingPolicyHandler {
 
   // ConfigurationPolicyHandler methods:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   // The DictionaryValue path of the preference the policy maps to.
@@ -186,9 +186,9 @@ class POLICY_EXPORT StringMappingListPolicyHandler
 
   // ConfigurationPolicyHandler methods:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   // Attempts to convert the list in |input| to |output| according to the table,
@@ -227,7 +227,7 @@ class POLICY_EXPORT IntRangePolicyHandler : public IntRangePolicyHandlerBase {
 
   // ConfigurationPolicyHandler:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   // Name of the pref to write.
@@ -250,7 +250,7 @@ class POLICY_EXPORT IntPercentageToDoublePolicyHandler
 
   // ConfigurationPolicyHandler:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   // Name of the pref to write.
@@ -272,7 +272,7 @@ class POLICY_EXPORT SchemaValidatingPolicyHandler
 
   // ConfigurationPolicyHandler:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
 
   const char* policy_name() const;
 
@@ -313,9 +313,9 @@ class POLICY_EXPORT SimpleSchemaValidatingPolicyHandler
 
   // ConfigurationPolicyHandler:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   const char* pref_path_;
@@ -338,9 +338,9 @@ class POLICY_EXPORT LegacyPoliciesDeprecatingPolicyHandler
 
   // ConfigurationPolicyHandler:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   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 a969219..83861ab 100644
--- a/components/policy/core/browser/configuration_policy_handler_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc
@@ -37,7 +37,7 @@ class TestSchemaValidatingPolicyHandler : public SchemaValidatingPolicyHandler {
   virtual ~TestSchemaValidatingPolicyHandler() {}
 
   virtual void ApplyPolicySettings(const policy::PolicyMap&,
-                                   PrefValueMap*) OVERRIDE {
+                                   PrefValueMap*) override {
   }
 
   bool CheckAndGetValueForTest(const PolicyMap& policies,
diff --git a/components/policy/core/browser/configuration_policy_pref_store.h b/components/policy/core/browser/configuration_policy_pref_store.h
index 2a7b526..6ebdcbd 100644
--- a/components/policy/core/browser/configuration_policy_pref_store.h
+++ b/components/policy/core/browser/configuration_policy_pref_store.h
@@ -38,18 +38,18 @@ 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 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;
+                        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;
+                               const PolicyMap& current) override;
+  virtual void OnPolicyServiceInitialized(PolicyDomain domain) override;
 
  private:
   virtual ~ConfigurationPolicyPrefStore();
diff --git a/components/policy/core/browser/configuration_policy_pref_store_test.h b/components/policy/core/browser/configuration_policy_pref_store_test.h
index d22d2c2..cc60dca 100644
--- a/components/policy/core/browser/configuration_policy_pref_store_test.h
+++ b/components/policy/core/browser/configuration_policy_pref_store_test.h
@@ -25,7 +25,7 @@ class ConfigurationPolicyPrefStoreTest : public testing::Test {
  protected:
   ConfigurationPolicyPrefStoreTest();
   virtual ~ConfigurationPolicyPrefStoreTest();
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
   void UpdateProviderPolicy(const PolicyMap& policy);
 
   // A unit test can override this method to populate the policy handler
diff --git a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
index 35d91ee..c1d3cfc 100644
--- a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
@@ -39,7 +39,7 @@ namespace policy {
 // Test cases for list-valued policy settings.
 class ConfigurationPolicyPrefStoreListTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_LIST)));
@@ -67,7 +67,7 @@ TEST_F(ConfigurationPolicyPrefStoreListTest, SetValue) {
 // Test cases for string-valued policy settings.
 class ConfigurationPolicyPrefStoreStringTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_STRING)));
@@ -95,7 +95,7 @@ TEST_F(ConfigurationPolicyPrefStoreStringTest, SetValue) {
 // Test cases for boolean-valued policy settings.
 class ConfigurationPolicyPrefStoreBooleanTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_BOOLEAN)));
@@ -139,7 +139,7 @@ TEST_F(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
 // Test cases for integer-valued policy settings.
 class ConfigurationPolicyPrefStoreIntegerTest
     : public ConfigurationPolicyPrefStoreTest {
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     handler_list_.AddHandler(
         make_scoped_ptr<ConfigurationPolicyHandler>(new SimplePolicyHandler(
             kTestPolicy, kTestPref, base::Value::TYPE_INTEGER)));
@@ -167,7 +167,7 @@ TEST_F(ConfigurationPolicyPrefStoreIntegerTest, SetValue) {
 class ConfigurationPolicyPrefStoreRefreshTest
     : public ConfigurationPolicyPrefStoreTest {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ConfigurationPolicyPrefStoreTest::SetUp();
     store_->AddObserver(&observer_);
     handler_list_.AddHandler(
@@ -175,7 +175,7 @@ class ConfigurationPolicyPrefStoreRefreshTest
             kTestPolicy, kTestPref, base::Value::TYPE_STRING)));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     store_->RemoveObserver(&observer_);
     ConfigurationPolicyPrefStoreTest::TearDown();
   }
diff --git a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
index 5119764..5903e05 100644
--- a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
+++ b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
@@ -34,13 +34,13 @@ class ManagedBookmarksTrackerTest : public testing::Test {
   ManagedBookmarksTrackerTest() : managed_node_(NULL) {}
   virtual ~ManagedBookmarksTrackerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     prefs_.registry()->RegisterListPref(bookmarks::prefs::kManagedBookmarks);
     prefs_.registry()->RegisterListPref(
         bookmarks::prefs::kBookmarkEditorExpandedNodes);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (model_)
       model_->RemoveObserver(&observer_);
   }
diff --git a/components/policy/core/browser/policy_error_map.cc b/components/policy/core/browser/policy_error_map.cc
index f132f65..4d9c59d 100644
--- a/components/policy/core/browser/policy_error_map.cc
+++ b/components/policy/core/browser/policy_error_map.cc
@@ -43,7 +43,7 @@ class SimplePendingError : public PolicyErrorMap::PendingError {
         replacement_(replacement) {}
   virtual ~SimplePendingError() {}
 
-  virtual base::string16 GetMessage() const OVERRIDE {
+  virtual base::string16 GetMessage() const override {
     if (message_id_ >= 0) {
       if (replacement_.empty())
         return l10n_util::GetStringUTF16(message_id_);
@@ -70,7 +70,7 @@ class DictSubkeyPendingError : public SimplePendingError {
         subkey_(subkey) {}
   virtual ~DictSubkeyPendingError() {}
 
-  virtual base::string16 GetMessage() const OVERRIDE {
+  virtual base::string16 GetMessage() const override {
     return l10n_util::GetStringFUTF16(IDS_POLICY_SUBKEY_ERROR,
                                       base::ASCIIToUTF16(subkey_),
                                       SimplePendingError::GetMessage());
@@ -92,7 +92,7 @@ class ListItemPendingError : public SimplePendingError {
         index_(index) {}
   virtual ~ListItemPendingError() {}
 
-  virtual base::string16 GetMessage() const OVERRIDE {
+  virtual base::string16 GetMessage() const override {
     return l10n_util::GetStringFUTF16(IDS_POLICY_LIST_ENTRY_ERROR,
                                       base::IntToString16(index_),
                                       SimplePendingError::GetMessage());
@@ -113,7 +113,7 @@ class SchemaValidatingPendingError : public SimplePendingError {
         error_path_(error_path) {};
   virtual ~SchemaValidatingPendingError() {}
 
-  virtual base::string16 GetMessage() const OVERRIDE {
+  virtual 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 3a4f901..bf399d6 100644
--- a/components/policy/core/browser/url_blacklist_policy_handler.h
+++ b/components/policy/core/browser/url_blacklist_policy_handler.h
@@ -21,9 +21,9 @@ class POLICY_EXPORT URLBlacklistPolicyHandler
 
   // ConfigurationPolicyHandler methods:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   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 301f15d..88fbeea 100644
--- a/components/policy/core/common/async_policy_provider.h
+++ b/components/policy/core/common/async_policy_provider.h
@@ -37,9 +37,9 @@ class POLICY_EXPORT AsyncPolicyProvider : public ConfigurationPolicyProvider,
   virtual ~AsyncPolicyProvider();
 
   // ConfigurationPolicyProvider implementation.
-  virtual void Init(SchemaRegistry* registry) OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
-  virtual void RefreshPolicies() OVERRIDE;
+  virtual void Init(SchemaRegistry* registry) override;
+  virtual void Shutdown() override;
+  virtual void RefreshPolicies() override;
 
  private:
   // Helper for RefreshPolicies().
diff --git a/components/policy/core/common/async_policy_provider_unittest.cc b/components/policy/core/common/async_policy_provider_unittest.cc
index 6a9aaff..2768de7 100644
--- a/components/policy/core/common/async_policy_provider_unittest.cc
+++ b/components/policy/core/common/async_policy_provider_unittest.cc
@@ -47,7 +47,7 @@ class MockPolicyLoader : public AsyncPolicyLoader {
   // scoped_ptr is moveable but not copyable. This override forwards the
   // call to MockLoad() which returns a PolicyBundle*, and returns a copy
   // wrapped in a passed scoped_ptr.
-  virtual scoped_ptr<PolicyBundle> Load() OVERRIDE;
+  virtual scoped_ptr<PolicyBundle> Load() override;
 
   MOCK_METHOD0(MockLoad, const PolicyBundle*());
   MOCK_METHOD0(InitOnBackgroundThread, void());
@@ -80,8 +80,8 @@ class AsyncPolicyProviderTest : public testing::Test {
   AsyncPolicyProviderTest();
   virtual ~AsyncPolicyProviderTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   base::MessageLoop loop_;
   SchemaRegistry schema_registry_;
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 24b9293..46ddb17 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
@@ -46,9 +46,9 @@ class CloudPolicyClientRegistrationHelper::TokenServiceHelper
   // OAuth2TokenService::Consumer implementation:
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
   StringCallback callback_;
   scoped_ptr<OAuth2TokenService::Request> token_request_;
@@ -108,9 +108,9 @@ class CloudPolicyClientRegistrationHelper::LoginTokenHelper
  private:
   // OAuth2AccessTokenConsumer implementation:
   virtual void OnGetTokenSuccess(const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      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 81f10f0..26d8b53 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
@@ -75,14 +75,14 @@ class POLICY_EXPORT CloudPolicyClientRegistrationHelper
 
   // UserInfoFetcher::Delegate implementation:
   virtual void OnGetUserInfoSuccess(
-      const base::DictionaryValue* response) OVERRIDE;
+      const base::DictionaryValue* response) override;
   virtual void OnGetUserInfoFailure(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      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;
+  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
+  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  virtual 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_client_unittest.cc b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
index d6e3655..852a45c 100644
--- a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
@@ -97,7 +97,7 @@ class CloudPolicyClientTest : public testing::Test {
     upload_certificate_response_.mutable_cert_upload_response();
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(status_provider_, GetDeviceStatus(_))
         .WillRepeatedly(Return(false));
     EXPECT_CALL(status_provider_, GetSessionStatus(_))
@@ -105,7 +105,7 @@ class CloudPolicyClientTest : public testing::Test {
     CreateClient(USER_AFFILIATION_NONE);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     client_->RemoveObserver(&observer_);
   }
 
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 ea6efe9..db09083 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 {
+  virtual 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 {
+  virtual 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 {
+  virtual 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 c029e67..f655916 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager.h
+++ b/components/policy/core/common/cloud/cloud_policy_manager.h
@@ -61,16 +61,16 @@ class POLICY_EXPORT CloudPolicyManager
   const CloudPolicyCore* core() const { return &core_; }
 
   // ConfigurationPolicyProvider:
-  virtual void Shutdown() OVERRIDE;
-  virtual bool IsInitializationComplete(PolicyDomain domain) const OVERRIDE;
-  virtual void RefreshPolicies() OVERRIDE;
+  virtual void Shutdown() override;
+  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
+  virtual void RefreshPolicies() override;
 
   // CloudPolicyStore::Observer:
-  virtual void OnStoreLoaded(CloudPolicyStore* cloud_policy_store) OVERRIDE;
-  virtual void OnStoreError(CloudPolicyStore* cloud_policy_store) OVERRIDE;
+  virtual void OnStoreLoaded(CloudPolicyStore* cloud_policy_store) override;
+  virtual void OnStoreError(CloudPolicyStore* cloud_policy_store) override;
 
   // ComponentCloudPolicyService::Delegate:
-  virtual void OnComponentCloudPolicyUpdated() OVERRIDE;
+  virtual 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 9dab86b..41d7a90 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
@@ -33,25 +33,25 @@ class TestHarness : public PolicyProviderTestHarness {
   explicit TestHarness(PolicyLevel level);
   virtual ~TestHarness();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() OVERRIDE;
+  virtual void InstallEmptyPolicy() override;
   virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) OVERRIDE;
+                                   const std::string& policy_value) override;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) OVERRIDE;
+                                    int policy_value) override;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) OVERRIDE;
+                                    bool policy_value) override;
   virtual void InstallStringListPolicy(
       const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
+      const base::ListValue* policy_value) override;
   virtual void InstallDictionaryPolicy(
       const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
+      const base::DictionaryValue* policy_value) override;
 
   // Creates harnesses for mandatory and recommended levels, respectively.
   static PolicyProviderTestHarness* CreateMandatory();
@@ -177,7 +177,7 @@ class CloudPolicyManagerTest : public testing::Test {
   CloudPolicyManagerTest()
       : policy_ns_key_(dm_protocol::kChromeUserPolicyType, std::string()) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Set up a policy map for testing.
     policy_map_.Set("key",
                     POLICY_LEVEL_MANDATORY,
@@ -198,7 +198,7 @@ class CloudPolicyManagerTest : public testing::Test {
     manager_->AddObserver(&observer_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     manager_->RemoveObserver(&observer_);
     manager_->Shutdown();
   }
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 efdb37b..0febc48 100644
--- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h
+++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h
@@ -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;
+  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
+  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  virtual void OnClientError(CloudPolicyClient* client) override;
 
   // CloudPolicyStore::Observer:
-  virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE;
-  virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE;
+  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
+  virtual void OnStoreError(CloudPolicyStore* store) override;
 
   // net::NetworkChangeNotifier::IPAddressObserver:
-  virtual void OnIPAddressChanged() OVERRIDE;
+  virtual 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_refresh_scheduler_unittest.cc b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
index d0f8671..7a1ea6f 100644
--- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
@@ -35,7 +35,7 @@ class CloudPolicyRefreshSchedulerTest : public testing::Test {
       : task_runner_(new base::TestSimpleTaskRunner()),
         network_change_notifier_(net::NetworkChangeNotifier::CreateMock()) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     client_.SetDMToken("token");
 
     // Set up the protobuf timestamp to be one minute in the past. Since the
@@ -314,7 +314,7 @@ class CloudPolicyRefreshSchedulerSteadyStateTest
  protected:
   CloudPolicyRefreshSchedulerSteadyStateTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     refresh_scheduler_.reset(CreateRefreshScheduler());
     refresh_scheduler_->SetRefreshDelay(kPolicyRefreshRate);
     CloudPolicyRefreshSchedulerTest::SetUp();
diff --git a/components/policy/core/common/cloud/cloud_policy_service.h b/components/policy/core/common/cloud/cloud_policy_service.h
index a6139a3..3a68fd9 100644
--- a/components/policy/core/common/cloud/cloud_policy_service.h
+++ b/components/policy/core/common/cloud/cloud_policy_service.h
@@ -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;
+  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
+  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  virtual void OnClientError(CloudPolicyClient* client) override;
 
   // CloudPolicyStore::Observer:
-  virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE;
-  virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE;
+  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
+  virtual 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 54db230..7cb6335 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_service.cc
@@ -75,7 +75,7 @@ class ComponentCloudPolicyService::Backend
   void UpdateExternalPolicy(scoped_ptr<em::PolicyFetchResponse> response);
 
   // ComponentCloudPolicyStore::Delegate implementation:
-  virtual void OnComponentCloudPolicyStoreUpdated() OVERRIDE;
+  virtual 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 616597a..7358cc5 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service.h
+++ b/components/policy/core/common/cloud/component_cloud_policy_service.h
@@ -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;
+  virtual void OnSchemaRegistryReady() override;
+  virtual 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;
+  virtual void OnCoreConnected(CloudPolicyCore* core) override;
+  virtual void OnCoreDisconnecting(CloudPolicyCore* core) override;
+  virtual void OnRefreshSchedulerStarted(CloudPolicyCore* core) override;
 
   // CloudPolicyStore::Observer implementation:
-  virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE;
-  virtual void OnStoreError(CloudPolicyStore* store) OVERRIDE;
+  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
+  virtual 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;
+  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
+  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  virtual 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 6908620..61ce1c4 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,11 +89,11 @@ class TestURLRequestContextGetter : public net::URLRequestContextGetter {
   explicit TestURLRequestContextGetter(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner)
       : task_runner_(task_runner) {}
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE {
+  virtual net::URLRequestContext* GetURLRequestContext() override {
     return NULL;
   }
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE {
+      GetNetworkTaskRunner() const override {
     return task_runner_;
   }
 
@@ -113,7 +113,7 @@ class ComponentCloudPolicyServiceTest : public testing::Test {
               &store_,
               loop_.message_loop_proxy()) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     cache_ = new ResourceCache(temp_dir_.path(), loop_.message_loop_proxy());
@@ -146,7 +146,7 @@ class ComponentCloudPolicyServiceTest : public testing::Test {
                          NULL);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // The service cleans up its backend on the background thread.
     service_.reset();
     RunUntilIdle();
diff --git a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
index a49b76c..ddacf55d 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
@@ -68,7 +68,7 @@ class MockComponentCloudPolicyStoreDelegate
 
 class ComponentCloudPolicyStoreTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     cache_.reset(new ResourceCache(
         temp_dir_.path(),
diff --git a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
index 09e2bd4d..2d0c50d 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
@@ -66,8 +66,8 @@ class MockComponentCloudPolicyStoreDelegate
 
 class ComponentCloudPolicyUpdaterTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   scoped_ptr<em::PolicyFetchResponse> CreateResponse();
 
diff --git a/components/policy/core/common/cloud/device_management_service.cc b/components/policy/core/common/cloud/device_management_service.cc
index 417b46f..da9b53e 100644
--- a/components/policy/core/common/cloud/device_management_service.cc
+++ b/components/policy/core/common/cloud/device_management_service.cc
@@ -165,7 +165,7 @@ class DeviceManagementRequestJobImpl : public DeviceManagementRequestJob {
 
  protected:
   // DeviceManagementRequestJob:
-  virtual void Run() OVERRIDE;
+  virtual 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 4609221..56fe07d 100644
--- a/components/policy/core/common/cloud/device_management_service.h
+++ b/components/policy/core/common/cloud/device_management_service.h
@@ -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;
+  virtual 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 8f42aa8..5f9fc45 100644
--- a/components/policy/core/common/cloud/external_policy_data_fetcher.h
+++ b/components/policy/core/common/cloud/external_policy_data_fetcher.h
@@ -156,10 +156,10 @@ class POLICY_EXPORT ExternalPolicyDataFetcherBackend
                  const base::Closure& callback);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                           int64 current,
-                                          int64 total) OVERRIDE;
+                                          int64 total) override;
 
  private:
   scoped_refptr<base::SequencedTaskRunner> io_task_runner_;
diff --git a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
index 7c403fb..e75726a 100644
--- a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
+++ b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
@@ -38,7 +38,7 @@ class ExternalPolicyDataFetcherTest : public testing::Test {
   virtual ~ExternalPolicyDataFetcherTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void StartJob(int index);
   void CancelJob(int index);
diff --git a/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc b/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
index 284eb2a..2f4df01 100644
--- a/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
+++ b/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
@@ -59,7 +59,7 @@ ExternalPolicyDataUpdater::FetchSuccessCallback
 
 class ExternalPolicyDataUpdaterTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void CreateUpdater(size_t max_parallel_fetches);
   ExternalPolicyDataUpdater::Request CreateRequest(
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 f79ee82..b8c0421 100644
--- a/components/policy/core/common/cloud/mock_device_management_service.cc
+++ b/components/policy/core/common/cloud/mock_device_management_service.cc
@@ -29,7 +29,7 @@ class MockRequestJobBase : public DeviceManagementRequestJob {
   virtual ~MockRequestJobBase() {}
 
  protected:
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     service_->StartJob(ExtractParameter(dm_protocol::kParamRequest),
                        gaia_token_,
                        ExtractParameter(dm_protocol::kParamOAuthToken),
@@ -70,7 +70,7 @@ class SyncRequestJob : public MockRequestJobBase {
   virtual ~SyncRequestJob() {}
 
  protected:
-  virtual void Run() OVERRIDE {
+  virtual void Run() override {
     MockRequestJobBase::Run();
     callback_.Run(status_, net::OK, response_);
   }
@@ -91,7 +91,7 @@ class AsyncRequestJob : public MockRequestJobBase,
   virtual ~AsyncRequestJob() {}
 
  protected:
-  virtual void RetryJob() OVERRIDE {
+  virtual void RetryJob() override {
     if (!retry_callback_.is_null())
       retry_callback_.Run(this);
     Run();
@@ -99,7 +99,7 @@ class AsyncRequestJob : public MockRequestJobBase,
 
   virtual void SendResponse(
       DeviceManagementStatus status,
-      const em::DeviceManagementResponse& response) OVERRIDE {
+      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 407046a..84e3e83 100644
--- a/components/policy/core/common/cloud/mock_device_management_service.h
+++ b/components/policy/core/common/cloud/mock_device_management_service.h
@@ -31,9 +31,9 @@ class MockDeviceManagementServiceConfiguration
       const std::string& server_url);
   virtual ~MockDeviceManagementServiceConfiguration();
 
-  virtual std::string GetServerUrl() OVERRIDE;
-  virtual std::string GetAgentParameter() OVERRIDE;
-  virtual std::string GetPlatformParameter() OVERRIDE;
+  virtual std::string GetServerUrl() override;
+  virtual std::string GetAgentParameter() override;
+  virtual std::string GetPlatformParameter() override;
 
  private:
   const std::string server_url_;
diff --git a/components/policy/core/common/cloud/policy_builder.h b/components/policy/core/common/cloud/policy_builder.h
index ae223f6..c0dd099 100644
--- a/components/policy/core/common/cloud/policy_builder.h
+++ b/components/policy/core/common/cloud/policy_builder.h
@@ -134,7 +134,7 @@ class TypedPolicyBuilder : public PolicyBuilder {
   }
 
   // PolicyBuilder:
-  virtual void Build() OVERRIDE {
+  virtual void Build() override {
     if (payload_.get())
       CHECK(payload_->SerializeToString(policy_data().mutable_policy_value()));
 
diff --git a/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc b/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
index 862cb58..082bcf3 100644
--- a/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
+++ b/components/policy/core/common/cloud/policy_header_io_helper_unittest.cc
@@ -24,13 +24,13 @@ class PolicyHeaderIOHelperTest : public testing::Test {
   }
   virtual ~PolicyHeaderIOHelperTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     helper_ = make_scoped_ptr(new PolicyHeaderIOHelper(kDMServerURL,
                                                        kInitialPolicyHeader,
                                                        task_runner_));
     task_runner_->RunUntilIdle();
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     task_runner_->RunUntilIdle();
     helper_.reset();
   }
diff --git a/components/policy/core/common/cloud/policy_header_service.h b/components/policy/core/common/cloud/policy_header_service.h
index 2c577a1..c786533 100644
--- a/components/policy/core/common/cloud/policy_header_service.h
+++ b/components/policy/core/common/cloud/policy_header_service.h
@@ -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;
+  virtual void OnStoreLoaded(CloudPolicyStore* store) override;
+  virtual 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/policy_header_service_unittest.cc b/components/policy/core/common/cloud/policy_header_service_unittest.cc
index d81f1f7..7b2ef53 100644
--- a/components/policy/core/common/cloud/policy_header_service_unittest.cc
+++ b/components/policy/core/common/cloud/policy_header_service_unittest.cc
@@ -39,7 +39,7 @@ class PolicyHeaderServiceTest : public testing::Test {
   }
   virtual ~PolicyHeaderServiceTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     service_.reset(new PolicyHeaderService(kDMServerURL,
                                            kPolicyVerificationKeyHash,
                                            &user_store_,
@@ -47,7 +47,7 @@ class PolicyHeaderServiceTest : public testing::Test {
     helper_ = service_->CreatePolicyHeaderIOHelper(task_runner_).Pass();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     task_runner_->RunUntilIdle();
     // Helper should outlive the service.
     service_.reset();
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 b421714..7c0a288 100644
--- a/components/policy/core/common/cloud/system_policy_request_context.h
+++ b/components/policy/core/common/cloud/system_policy_request_context.h
@@ -24,9 +24,9 @@ class POLICY_EXPORT SystemPolicyRequestContext
       const std::string& user_agent);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+      GetNetworkTaskRunner() const override;
 
  protected:
   virtual ~SystemPolicyRequestContext();
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 7d5f3f5..a7cf584 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_manager.h
+++ b/components/policy/core/common/cloud/user_cloud_policy_manager.h
@@ -49,7 +49,7 @@ class POLICY_EXPORT UserCloudPolicyManager : public CloudPolicyManager {
   virtual ~UserCloudPolicyManager();
 
   // ConfigurationPolicyProvider overrides:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   void SetSigninUsername(const std::string& username);
 
diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
index 86d5829..9080f5b 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
@@ -31,7 +31,7 @@ class UserCloudPolicyManagerTest : public testing::Test {
  protected:
   UserCloudPolicyManagerTest() : store_(NULL) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Set up a policy map for testing.
     policy_map_.Set("key",
                     POLICY_LEVEL_MANDATORY,
@@ -42,7 +42,7 @@ class UserCloudPolicyManagerTest : public testing::Test {
         .CopyFrom(policy_map_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (manager_) {
       manager_->RemoveObserver(&observer_);
       manager_->Shutdown();
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 ebc75e6..0862ba47 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store.h
+++ b/components/policy/core/common/cloud/user_cloud_policy_store.h
@@ -53,9 +53,9 @@ class POLICY_EXPORT UserCloudPolicyStore : public UserCloudPolicyStoreBase {
   virtual void Clear();
 
   // CloudPolicyStore implementation.
-  virtual void Load() OVERRIDE;
+  virtual void Load() override;
   virtual void Store(
-      const enterprise_management::PolicyFetchResponse& policy) OVERRIDE;
+      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_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
index 4e533d7..8af301a 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
@@ -55,7 +55,7 @@ class UserCloudPolicyStoreTest : public testing::Test {
  public:
   UserCloudPolicyStoreTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
     store_.reset(
         new UserCloudPolicyStore(policy_file(),
@@ -77,7 +77,7 @@ class UserCloudPolicyStoreTest : public testing::Test {
     policy_.Build();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     store_->RemoveObserver(&observer_);
     external_data_manager_.reset();
     store_.reset();
diff --git a/components/policy/core/common/cloud/user_info_fetcher.h b/components/policy/core/common/cloud/user_info_fetcher.h
index c248d81..927799e 100644
--- a/components/policy/core/common/cloud/user_info_fetcher.h
+++ b/components/policy/core/common/cloud/user_info_fetcher.h
@@ -49,7 +49,7 @@ class POLICY_EXPORT UserInfoFetcher : public net::URLFetcherDelegate {
   void Start(const std::string& access_token);
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 e1e1845..2f249d6 100644
--- a/components/policy/core/common/cloud/user_policy_request_context.h
+++ b/components/policy/core/common/cloud/user_policy_request_context.h
@@ -25,9 +25,9 @@ class POLICY_EXPORT UserPolicyRequestContext
       const std::string& user_agent);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+      GetNetworkTaskRunner() const override;
 
  protected:
   virtual ~UserPolicyRequestContext();
diff --git a/components/policy/core/common/config_dir_policy_loader.h b/components/policy/core/common/config_dir_policy_loader.h
index 054844b..8defe4a 100644
--- a/components/policy/core/common/config_dir_policy_loader.h
+++ b/components/policy/core/common/config_dir_policy_loader.h
@@ -30,9 +30,9 @@ class POLICY_EXPORT ConfigDirPolicyLoader : public AsyncPolicyLoader {
   virtual ~ConfigDirPolicyLoader();
 
   // AsyncPolicyLoader implementation.
-  virtual void InitOnBackgroundThread() OVERRIDE;
-  virtual scoped_ptr<PolicyBundle> Load() OVERRIDE;
-  virtual base::Time LastModificationTime() OVERRIDE;
+  virtual void InitOnBackgroundThread() override;
+  virtual scoped_ptr<PolicyBundle> Load() override;
+  virtual 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 91cc913..2d2e2c7 100644
--- a/components/policy/core/common/config_dir_policy_loader_unittest.cc
+++ b/components/policy/core/common/config_dir_policy_loader_unittest.cc
@@ -30,27 +30,27 @@ class TestHarness : public PolicyProviderTestHarness {
   TestHarness();
   virtual ~TestHarness();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() OVERRIDE;
+  virtual void InstallEmptyPolicy() override;
   virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) OVERRIDE;
+                                   const std::string& policy_value) override;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) OVERRIDE;
+                                    int policy_value) override;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) OVERRIDE;
+                                    bool policy_value) override;
   virtual void InstallStringListPolicy(
       const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
+      const base::ListValue* policy_value) override;
   virtual void InstallDictionaryPolicy(
       const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
+      const base::DictionaryValue* policy_value) override;
   virtual void Install3rdPartyPolicy(
-      const base::DictionaryValue* policies) OVERRIDE;
+      const base::DictionaryValue* policies) override;
 
   const base::FilePath& test_dir() { return test_dir_.path(); }
 
@@ -175,7 +175,7 @@ INSTANTIATE_TEST_CASE_P(
 // Some tests that exercise special functionality in ConfigDirPolicyLoader.
 class ConfigDirPolicyLoaderTest : public PolicyTestBase {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     PolicyTestBase::SetUp();
     harness_.SetUp();
   }
diff --git a/components/policy/core/common/configuration_policy_provider.h b/components/policy/core/common/configuration_policy_provider.h
index f2b746d..b01be0a 100644
--- a/components/policy/core/common/configuration_policy_provider.h
+++ b/components/policy/core/common/configuration_policy_provider.h
@@ -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;
+  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  virtual void OnSchemaRegistryReady() override;
 
  protected:
   // Subclasses must invoke this to update the policies currently served by
diff --git a/components/policy/core/common/configuration_policy_provider_test.h b/components/policy/core/common/configuration_policy_provider_test.h
index 231d437..0cf8e6a 100644
--- a/components/policy/core/common/configuration_policy_provider_test.h
+++ b/components/policy/core/common/configuration_policy_provider_test.h
@@ -44,8 +44,8 @@ class PolicyTestBase : public testing::Test {
   virtual ~PolicyTestBase();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   bool RegisterSchema(const PolicyNamespace& ns,
@@ -120,8 +120,8 @@ class ConfigurationPolicyProviderTest
   ConfigurationPolicyProviderTest();
   virtual ~ConfigurationPolicyProviderTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Installs a valid policy and checks whether the provider returns the
   // |expected_value|.
diff --git a/components/policy/core/common/forwarding_policy_provider.h b/components/policy/core/common/forwarding_policy_provider.h
index db24ff6..7ca47c2 100644
--- a/components/policy/core/common/forwarding_policy_provider.h
+++ b/components/policy/core/common/forwarding_policy_provider.h
@@ -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;
+  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;
 
   // ConfigurationPolicyProvider::Observer:
-  virtual void OnUpdatePolicy(ConfigurationPolicyProvider* provider) OVERRIDE;
+  virtual void OnUpdatePolicy(ConfigurationPolicyProvider* provider) override;
 
  private:
   enum InitializationState {
diff --git a/components/policy/core/common/policy_loader_ios.h b/components/policy/core/common/policy_loader_ios.h
index 90f37ebb..ee378f4 100644
--- a/components/policy/core/common/policy_loader_ios.h
+++ b/components/policy/core/common/policy_loader_ios.h
@@ -23,9 +23,9 @@ class POLICY_EXPORT PolicyLoaderIOS : public AsyncPolicyLoader {
   virtual ~PolicyLoaderIOS();
 
   // AsyncPolicyLoader implementation.
-  virtual void InitOnBackgroundThread() OVERRIDE;
-  virtual scoped_ptr<PolicyBundle> Load() OVERRIDE;
-  virtual base::Time LastModificationTime() OVERRIDE;
+  virtual void InitOnBackgroundThread() override;
+  virtual scoped_ptr<PolicyBundle> Load() override;
+  virtual base::Time LastModificationTime() override;
 
  private:
   void UserDefaultsChanged();
diff --git a/components/policy/core/common/policy_loader_ios_unittest.mm b/components/policy/core/common/policy_loader_ios_unittest.mm
index e73a269..ddb46ce 100644
--- a/components/policy/core/common/policy_loader_ios_unittest.mm
+++ b/components/policy/core/common/policy_loader_ios_unittest.mm
@@ -33,25 +33,25 @@ class TestHarness : public PolicyProviderTestHarness {
   explicit TestHarness(bool use_encoded_key);
   virtual ~TestHarness();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() OVERRIDE;
+  virtual void InstallEmptyPolicy() override;
   virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) OVERRIDE;
+                                   const std::string& policy_value) override;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) OVERRIDE;
+                                    int policy_value) override;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) OVERRIDE;
+                                    bool policy_value) override;
   virtual void InstallStringListPolicy(
       const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
+      const base::ListValue* policy_value) override;
   virtual void InstallDictionaryPolicy(
       const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
+      const base::DictionaryValue* policy_value) override;
 
   static PolicyProviderTestHarness* Create();
   static PolicyProviderTestHarness* CreateWithEncodedKey();
diff --git a/components/policy/core/common/policy_loader_mac.h b/components/policy/core/common/policy_loader_mac.h
index 46b8bc7..e86a565 100644
--- a/components/policy/core/common/policy_loader_mac.h
+++ b/components/policy/core/common/policy_loader_mac.h
@@ -36,9 +36,9 @@ class POLICY_EXPORT PolicyLoaderMac : public AsyncPolicyLoader {
   virtual ~PolicyLoaderMac();
 
   // AsyncPolicyLoader implementation.
-  virtual void InitOnBackgroundThread() OVERRIDE;
-  virtual scoped_ptr<PolicyBundle> Load() OVERRIDE;
-  virtual base::Time LastModificationTime() OVERRIDE;
+  virtual void InitOnBackgroundThread() override;
+  virtual scoped_ptr<PolicyBundle> Load() override;
+  virtual 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 e2feecf..db22e74 100644
--- a/components/policy/core/common/policy_loader_mac_unittest.cc
+++ b/components/policy/core/common/policy_loader_mac_unittest.cc
@@ -31,25 +31,25 @@ class TestHarness : public PolicyProviderTestHarness {
   TestHarness();
   virtual ~TestHarness();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() OVERRIDE;
+  virtual void InstallEmptyPolicy() override;
   virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) OVERRIDE;
+                                   const std::string& policy_value) override;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) OVERRIDE;
+                                    int policy_value) override;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) OVERRIDE;
+                                    bool policy_value) override;
   virtual void InstallStringListPolicy(
       const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
+      const base::ListValue* policy_value) override;
   virtual void InstallDictionaryPolicy(
       const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
+      const base::DictionaryValue* policy_value) override;
 
   static PolicyProviderTestHarness* Create();
 
@@ -140,7 +140,7 @@ class PolicyLoaderMacTest : public PolicyTestBase {
       : prefs_(new MockPreferences()) {}
   virtual ~PolicyLoaderMacTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     PolicyTestBase::SetUp();
     scoped_ptr<AsyncPolicyLoader> loader(new PolicyLoaderMac(
         loop_.message_loop_proxy(), base::FilePath(), prefs_));
@@ -148,7 +148,7 @@ class PolicyLoaderMacTest : public PolicyTestBase {
     provider_->Init(&schema_registry_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     provider_->Shutdown();
     PolicyTestBase::TearDown();
   }
diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc
index 9af20c5..b2316dd 100644
--- a/components/policy/core/common/policy_loader_win.cc
+++ b/components/policy/core/common/policy_loader_win.cc
@@ -292,12 +292,12 @@ class WinGPOListProvider : public AppliedGPOListProvider {
                                   LPCTSTR machine_name,
                                   PSID sid_user,
                                   GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) OVERRIDE {
+                                  PGROUP_POLICY_OBJECT* gpo_list) override {
     return ::GetAppliedGPOList(flags, machine_name, sid_user, extension_guid,
                                gpo_list);
   }
 
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) OVERRIDE {
+  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
     return ::FreeGPOList(gpo_list);
   }
 };
diff --git a/components/policy/core/common/policy_loader_win.h b/components/policy/core/common/policy_loader_win.h
index cdcd88c..72ba64d 100644
--- a/components/policy/core/common/policy_loader_win.h
+++ b/components/policy/core/common/policy_loader_win.h
@@ -62,8 +62,8 @@ class POLICY_EXPORT PolicyLoaderWin
       const base::string16& chrome_policy_key);
 
   // AsyncPolicyLoader implementation.
-  virtual void InitOnBackgroundThread() OVERRIDE;
-  virtual scoped_ptr<PolicyBundle> Load() OVERRIDE;
+  virtual void InitOnBackgroundThread() override;
+  virtual scoped_ptr<PolicyBundle> Load() override;
 
  private:
   // Reads Chrome Policy from a PReg file at the given path and stores the
@@ -104,7 +104,7 @@ class POLICY_EXPORT PolicyLoaderWin
   void SetupWatches();
 
   // ObjectWatcher::Delegate overrides:
-  virtual void OnObjectSignaled(HANDLE object) OVERRIDE;
+  virtual void OnObjectSignaled(HANDLE object) override;
 
   bool is_initialized_;
   const base::string16 chrome_policy_key_;
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index 02f0e04..88205b4 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -173,35 +173,35 @@ class RegistryTestHarness : public PolicyProviderTestHarness,
   virtual ~RegistryTestHarness();
 
   // PolicyProviderTestHarness:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() OVERRIDE;
+  virtual void InstallEmptyPolicy() override;
   virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) OVERRIDE;
+                                   const std::string& policy_value) override;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) OVERRIDE;
+                                    int policy_value) override;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) OVERRIDE;
+                                    bool policy_value) override;
   virtual void InstallStringListPolicy(
       const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
+      const base::ListValue* policy_value) override;
   virtual void InstallDictionaryPolicy(
       const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
+      const base::DictionaryValue* policy_value) override;
   virtual void Install3rdPartyPolicy(
-      const base::DictionaryValue* policies) OVERRIDE;
+      const base::DictionaryValue* policies) override;
 
   // AppliedGPOListProvider:
   virtual DWORD GetAppliedGPOList(DWORD flags,
                                   LPCTSTR machine_name,
                                   PSID sid_user,
                                   GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) OVERRIDE;
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) OVERRIDE;
+                                  PGROUP_POLICY_OBJECT* gpo_list) override;
+  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override;
 
   // Creates a harness instance that will install policy in HKCU or HKLM,
   // respectively.
@@ -224,35 +224,35 @@ class PRegTestHarness : public PolicyProviderTestHarness,
   virtual ~PRegTestHarness();
 
   // PolicyProviderTestHarness:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   virtual ConfigurationPolicyProvider* CreateProvider(
       SchemaRegistry* registry,
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void InstallEmptyPolicy() OVERRIDE;
+  virtual void InstallEmptyPolicy() override;
   virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) OVERRIDE;
+                                   const std::string& policy_value) override;
   virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) OVERRIDE;
+                                    int policy_value) override;
   virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) OVERRIDE;
+                                    bool policy_value) override;
   virtual void InstallStringListPolicy(
       const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
+      const base::ListValue* policy_value) override;
   virtual void InstallDictionaryPolicy(
       const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
+      const base::DictionaryValue* policy_value) override;
   virtual void Install3rdPartyPolicy(
-      const base::DictionaryValue* policies) OVERRIDE;
+      const base::DictionaryValue* policies) override;
 
   // AppliedGPOListProvider:
   virtual DWORD GetAppliedGPOList(DWORD flags,
                                   LPCTSTR machine_name,
                                   PSID sid_user,
                                   GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) OVERRIDE;
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) OVERRIDE;
+                                  PGROUP_POLICY_OBJECT* gpo_list) override;
+  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override;
 
   // Creates a harness instance.
   static PolicyProviderTestHarness* Create();
@@ -704,7 +704,7 @@ class PolicyLoaderWinTest : public PolicyTestBase,
         gpo_list_status_(ERROR_ACCESS_DENIED) {}
   virtual ~PolicyLoaderWinTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     base::win::SetDomainStateForTesting(false);
     PolicyTestBase::SetUp();
 
@@ -721,11 +721,11 @@ class PolicyLoaderWinTest : public PolicyTestBase,
                                   LPCTSTR machine_name,
                                   PSID sid_user,
                                   GUID* extension_guid,
-                                  PGROUP_POLICY_OBJECT* gpo_list) OVERRIDE {
+                                  PGROUP_POLICY_OBJECT* gpo_list) override {
     *gpo_list = gpo_list_;
     return gpo_list_status_;
   }
-  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) OVERRIDE {
+  virtual BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
     return TRUE;
   }
 
diff --git a/components/policy/core/common/policy_provider_android.h b/components/policy/core/common/policy_provider_android.h
index c9d900c..c09f95f 100644
--- a/components/policy/core/common/policy_provider_android.h
+++ b/components/policy/core/common/policy_provider_android.h
@@ -33,9 +33,9 @@ class POLICY_EXPORT PolicyProviderAndroid : public ConfigurationPolicyProvider {
   void SetPolicies(scoped_ptr<PolicyBundle> policy);
 
   // ConfigurationPolicyProvider:
-  virtual void Shutdown() OVERRIDE;
-  virtual bool IsInitializationComplete(PolicyDomain domain) const OVERRIDE;
-  virtual void RefreshPolicies() OVERRIDE;
+  virtual void Shutdown() override;
+  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
+  virtual void RefreshPolicies() override;
 
  private:
   PolicyProviderAndroidDelegate* delegate_;
diff --git a/components/policy/core/common/policy_provider_android_unittest.cc b/components/policy/core/common/policy_provider_android_unittest.cc
index 2061508..bdfe765 100644
--- a/components/policy/core/common/policy_provider_android_unittest.cc
+++ b/components/policy/core/common/policy_provider_android_unittest.cc
@@ -62,8 +62,8 @@ class PolicyProviderAndroidTest : public ::testing::Test {
   PolicyProviderAndroidTest();
   virtual ~PolicyProviderAndroidTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PolicyProviderAndroidTest);
diff --git a/components/policy/core/common/policy_service.h b/components/policy/core/common/policy_service.h
index dbc09ae..a9e3b81 100644
--- a/components/policy/core/common/policy_service.h
+++ b/components/policy/core/common/policy_service.h
@@ -99,7 +99,7 @@ class POLICY_EXPORT PolicyChangeRegistrar : public PolicyService::Observer {
   // Implementation of PolicyService::Observer:
   virtual void OnPolicyUpdated(const PolicyNamespace& ns,
                                const PolicyMap& previous,
-                               const PolicyMap& current) OVERRIDE;
+                               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 1a67a41..96a50cd 100644
--- a/components/policy/core/common/policy_service_impl.h
+++ b/components/policy/core/common/policy_service_impl.h
@@ -39,20 +39,20 @@ class POLICY_EXPORT PolicyServiceImpl
 
   // PolicyService overrides:
   virtual void AddObserver(PolicyDomain domain,
-                           PolicyService::Observer* observer) OVERRIDE;
+                           PolicyService::Observer* observer) override;
   virtual void RemoveObserver(PolicyDomain domain,
-                              PolicyService::Observer* observer) OVERRIDE;
+                              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;
+      const PolicyNamespace& ns) const override;
+  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
+  virtual 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;
+  virtual 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 e814519..ee0360b 100644
--- a/components/policy/core/common/policy_service_impl_unittest.cc
+++ b/components/policy/core/common/policy_service_impl_unittest.cc
@@ -77,7 +77,7 @@ class ChangePolicyObserver : public PolicyService::Observer {
 
   virtual void OnPolicyUpdated(const PolicyNamespace&,
                                const PolicyMap& previous,
-                               const PolicyMap& current) OVERRIDE {
+                               const PolicyMap& current) override {
     PolicyMap new_policy;
     new_policy.Set("foo",
                    POLICY_LEVEL_MANDATORY,
@@ -100,7 +100,7 @@ class ChangePolicyObserver : public PolicyService::Observer {
 class PolicyServiceTest : public testing::Test {
  public:
   PolicyServiceTest() {}
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(provider0_, IsInitializationComplete(_))
         .WillRepeatedly(Return(true));
     EXPECT_CALL(provider1_, IsInitializationComplete(_))
@@ -126,7 +126,7 @@ class PolicyServiceTest : public testing::Test {
     policy_service_.reset(new PolicyServiceImpl(providers));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     provider0_.Shutdown();
     provider1_.Shutdown();
     provider2_.Shutdown();
diff --git a/components/policy/core/common/policy_service_stub.h b/components/policy/core/common/policy_service_stub.h
index f7dee23..532bf52 100644
--- a/components/policy/core/common/policy_service_stub.h
+++ b/components/policy/core/common/policy_service_stub.h
@@ -20,17 +20,17 @@ class POLICY_EXPORT PolicyServiceStub : public PolicyService {
   virtual ~PolicyServiceStub();
 
   virtual void AddObserver(PolicyDomain domain,
-                           Observer* observer) OVERRIDE;
+                           Observer* observer) override;
 
   virtual void RemoveObserver(PolicyDomain domain,
-                              Observer* observer) OVERRIDE;
+                              Observer* observer) override;
 
   virtual const PolicyMap& GetPolicies(
-      const PolicyNamespace& ns) const OVERRIDE;
+      const PolicyNamespace& ns) const override;
 
-  virtual bool IsInitializationComplete(PolicyDomain domain) const OVERRIDE;
+  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
 
-  virtual void RefreshPolicies(const base::Closure& callback) OVERRIDE;
+  virtual void RefreshPolicies(const base::Closure& callback) override;
  private:
   const PolicyMap kEmpty_;
 
diff --git a/components/policy/core/common/policy_statistics_collector_unittest.cc b/components/policy/core/common/policy_statistics_collector_unittest.cc
index 4736c07..3387681 100644
--- a/components/policy/core/common/policy_statistics_collector_unittest.cc
+++ b/components/policy/core/common/policy_statistics_collector_unittest.cc
@@ -77,7 +77,7 @@ class PolicyStatisticsCollectorTest : public testing::Test {
         task_runner_(new base::TestSimpleTaskRunner()) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     std::string error;
     chrome_schema_ = Schema::Parse(kTestChromeSchema, &error);
     ASSERT_TRUE(chrome_schema_.valid()) << error;
diff --git a/components/policy/core/common/preferences_mock_mac.h b/components/policy/core/common/preferences_mock_mac.h
index f28f8fe..1ae517e 100644
--- a/components/policy/core/common/preferences_mock_mac.h
+++ b/components/policy/core/common/preferences_mock_mac.h
@@ -15,13 +15,13 @@ class POLICY_EXPORT MockPreferences : public MacPreferences {
   MockPreferences();
   virtual ~MockPreferences();
 
-  virtual Boolean AppSynchronize(CFStringRef applicationID) OVERRIDE;
+  virtual Boolean AppSynchronize(CFStringRef applicationID) override;
 
   virtual CFPropertyListRef CopyAppValue(CFStringRef key,
-                                         CFStringRef applicationID) OVERRIDE;
+                                         CFStringRef applicationID) override;
 
   virtual Boolean AppValueIsForced(CFStringRef key,
-                                   CFStringRef applicationID) OVERRIDE;
+                                   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/proxy_policy_provider.h b/components/policy/core/common/proxy_policy_provider.h
index ee5f223..0809522 100644
--- a/components/policy/core/common/proxy_policy_provider.h
+++ b/components/policy/core/common/proxy_policy_provider.h
@@ -24,11 +24,11 @@ class POLICY_EXPORT ProxyPolicyProvider
   void SetDelegate(ConfigurationPolicyProvider* delegate);
 
   // ConfigurationPolicyProvider:
-  virtual void Shutdown() OVERRIDE;
-  virtual void RefreshPolicies() OVERRIDE;
+  virtual void Shutdown() override;
+  virtual void RefreshPolicies() override;
 
   // ConfigurationPolicyProvider::Observer:
-  virtual void OnUpdatePolicy(ConfigurationPolicyProvider* provider) OVERRIDE;
+  virtual void OnUpdatePolicy(ConfigurationPolicyProvider* provider) override;
 
  private:
   ConfigurationPolicyProvider* delegate_;
diff --git a/components/policy/core/common/schema_registry.h b/components/policy/core/common/schema_registry.h
index 6df4db2..c0e492f 100644
--- a/components/policy/core/common/schema_registry.h
+++ b/components/policy/core/common/schema_registry.h
@@ -108,15 +108,15 @@ class POLICY_EXPORT CombinedSchemaRegistry
 
   // SchemaRegistry:
   virtual void RegisterComponents(PolicyDomain domain,
-                                  const ComponentMap& components) OVERRIDE;
-  virtual void UnregisterComponent(const PolicyNamespace& ns) OVERRIDE;
+                                  const ComponentMap& components) override;
+  virtual void UnregisterComponent(const PolicyNamespace& ns) override;
 
   // SchemaRegistry::Observer:
-  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) OVERRIDE;
-  virtual void OnSchemaRegistryReady() OVERRIDE;
+  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  virtual void OnSchemaRegistryReady() override;
 
   // SchemaRegistry::InternalObserver:
-  virtual void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) OVERRIDE;
+  virtual void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) override;
 
  private:
   void Combine(bool has_new_schemas);
@@ -140,15 +140,15 @@ class POLICY_EXPORT ForwardingSchemaRegistry
 
   // SchemaRegistry:
   virtual void RegisterComponents(PolicyDomain domain,
-                                  const ComponentMap& components) OVERRIDE;
-  virtual void UnregisterComponent(const PolicyNamespace& ns) OVERRIDE;
+                                  const ComponentMap& components) override;
+  virtual void UnregisterComponent(const PolicyNamespace& ns) override;
 
   // SchemaRegistry::Observer:
-  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) OVERRIDE;
-  virtual void OnSchemaRegistryReady() OVERRIDE;
+  virtual void OnSchemaRegistryUpdated(bool has_new_schemas) override;
+  virtual void OnSchemaRegistryReady() override;
 
   // SchemaRegistry::InternalObserver:
-  virtual void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) OVERRIDE;
+  virtual void OnSchemaRegistryShuttingDown(SchemaRegistry* registry) override;
 
  private:
   SchemaRegistry* wrapped_;
diff --git a/components/power/origin_power_map_factory.h b/components/power/origin_power_map_factory.h
index c772a2b..fc6c2bb 100644
--- a/components/power/origin_power_map_factory.h
+++ b/components/power/origin_power_map_factory.h
@@ -25,7 +25,7 @@ class OriginPowerMapFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
+      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 e274881..592a3cf 100644
--- a/components/precache/content/precache_manager.h
+++ b/components/precache/content/precache_manager.h
@@ -74,10 +74,10 @@ class PrecacheManager : public KeyedService,
 
  private:
   // From KeyedService.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // From PrecacheFetcher::PrecacheDelegate.
-  virtual void OnDone() OVERRIDE;
+  virtual 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 6b4b093..51f77e8 100644
--- a/components/precache/content/precache_manager_factory.h
+++ b/components/precache/content/precache_manager_factory.h
@@ -31,7 +31,7 @@ class PrecacheManagerFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* browser_context) const OVERRIDE;
+      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 bd11130..360e9fc 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 {
+  virtual void GetURLs(const GetURLsCallback& callback) override {
     was_get_urls_called_ = true;
 
     if (run_immediately_) {
@@ -140,7 +140,7 @@ class PrecacheManagerTest : public testing::Test {
                                   base::Unretained(&url_callback_))) {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     base::StatisticsRecorder::Initialize();
 
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
diff --git a/components/precache/core/precache_database_unittest.cc b/components/precache/core/precache_database_unittest.cc
index 575bd4d..6de5086 100644
--- a/components/precache/core/precache_database_unittest.cc
+++ b/components/precache/core/precache_database_unittest.cc
@@ -57,7 +57,7 @@ class PrecacheDatabaseTest : public testing::Test {
   virtual ~PrecacheDatabaseTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     base::StatisticsRecorder::Initialize();
     precache_database_ = new PrecacheDatabase();
 
diff --git a/components/precache/core/precache_fetcher.cc b/components/precache/core/precache_fetcher.cc
index 81053ce5..650ca53b 100644
--- a/components/precache/core/precache_fetcher.cc
+++ b/components/precache/core/precache_fetcher.cc
@@ -106,7 +106,7 @@ class PrecacheFetcher::Fetcher : public net::URLFetcherDelegate {
   Fetcher(net::URLRequestContextGetter* request_context, const GURL& url,
           const base::Callback<void(const URLFetcher&)>& callback);
   virtual ~Fetcher() {}
-  virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE;
+  virtual 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 acdd59d..0961a3c 100644
--- a/components/precache/core/precache_fetcher_unittest.cc
+++ b/components/precache/core/precache_fetcher_unittest.cc
@@ -60,7 +60,7 @@ class TestPrecacheDelegate : public PrecacheFetcher::PrecacheDelegate {
  public:
   TestPrecacheDelegate() : was_on_done_called_(false) {}
 
-  virtual void OnDone() OVERRIDE {
+  virtual void OnDone() override {
     was_on_done_called_ = true;
   }
 
diff --git a/components/precache/core/precache_url_table_unittest.cc b/components/precache/core/precache_url_table_unittest.cc
index 7b9316e..05c9299 100644
--- a/components/precache/core/precache_url_table_unittest.cc
+++ b/components/precache/core/precache_url_table_unittest.cc
@@ -22,7 +22,7 @@ class PrecacheURLTableTest : public testing::Test {
   virtual ~PrecacheURLTableTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     precache_url_table_.reset(new PrecacheURLTable());
     db_.reset(new sql::Connection());
     ASSERT_TRUE(db_->OpenInMemory());
diff --git a/components/proximity_auth/bluetooth_connection.h b/components/proximity_auth/bluetooth_connection.h
index f126688..8b09a6f 100644
--- a/components/proximity_auth/bluetooth_connection.h
+++ b/components/proximity_auth/bluetooth_connection.h
@@ -37,13 +37,13 @@ class BluetoothConnection : public Connection,
 
  protected:
   // Connection:
-  virtual void Connect() OVERRIDE;
-  virtual void Disconnect() OVERRIDE;
-  virtual void SendMessageImpl(scoped_ptr<WireMessage> message) OVERRIDE;
+  virtual void Connect() override;
+  virtual void Disconnect() override;
+  virtual void SendMessageImpl(scoped_ptr<WireMessage> message) override;
 
   // BluetoothAdapter::Observer:
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) OVERRIDE;
+                             device::BluetoothDevice* device) override;
 
   // Exposed for testing.
   virtual void ConnectToService(
diff --git a/components/proximity_auth/bluetooth_connection_unittest.cc b/components/proximity_auth/bluetooth_connection_unittest.cc
index bfa99e3..7eb7a82 100644
--- a/components/proximity_auth/bluetooth_connection_unittest.cc
+++ b/components/proximity_auth/bluetooth_connection_unittest.cc
@@ -74,7 +74,7 @@ class MockBluetoothConnection : public BluetoothConnection {
   MOCK_METHOD2(OnDidSendMessage,
                void(const WireMessage& message, bool success));
 
-  virtual void SetStatus(Status status) OVERRIDE {
+  virtual void SetStatus(Status status) override {
     SetStatusProxy(status);
     BluetoothConnection::SetStatus(status);
   }
@@ -93,7 +93,7 @@ class TestWireMessage : public WireMessage {
   TestWireMessage() : WireMessage("permit id", "payload") {}
   virtual ~TestWireMessage() {}
 
-  virtual std::string Serialize() const OVERRIDE { return kSerializedMessage; }
+  virtual std::string Serialize() const override { return kSerializedMessage; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestWireMessage);
diff --git a/components/proximity_auth/connection_unittest.cc b/components/proximity_auth/connection_unittest.cc
index 5df73c7..e3c335f 100644
--- a/components/proximity_auth/connection_unittest.cc
+++ b/components/proximity_auth/connection_unittest.cc
@@ -35,12 +35,12 @@ class MockConnection : public Connection {
 
   // Gmock only supports copyable types, so create simple wrapper methods for
   // ease of mocking.
-  virtual void SendMessageImpl(scoped_ptr<WireMessage> message) OVERRIDE {
+  virtual void SendMessageImpl(scoped_ptr<WireMessage> message) override {
     SendMessageImplProxy(message.get());
   }
 
   virtual scoped_ptr<WireMessage> DeserializeWireMessage(
-      bool* is_incomplete_message) OVERRIDE {
+      bool* is_incomplete_message) override {
     return make_scoped_ptr(DeserializeWireMessageProxy(is_incomplete_message));
   }
 
diff --git a/components/query_parser/query_parser.cc b/components/query_parser/query_parser.cc
index d09edff..10703f0 100644
--- a/components/query_parser/query_parser.cc
+++ b/components/query_parser/query_parser.cc
@@ -74,15 +74,15 @@ class QueryNodeWord : public QueryNode {
   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 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;
+      Snippet::MatchPositions* match_positions) const override;
   virtual bool HasMatchIn(
-      const QueryWordVector& words) const OVERRIDE;
-  virtual void AppendWords(std::vector<base::string16>* words) const OVERRIDE;
+      const QueryWordVector& words) const override;
+  virtual void AppendWords(std::vector<base::string16>* words) const override;
 
  private:
   base::string16 word_;
@@ -158,14 +158,14 @@ 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 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;
+      Snippet::MatchPositions* match_positions) const override;
+  virtual bool HasMatchIn(const QueryWordVector& words) const override;
+  virtual void AppendWords(std::vector<base::string16>* words) const override;
 
  protected:
   int AppendChildrenToString(base::string16* query) const;
@@ -248,11 +248,11 @@ class QueryNodePhrase : public QueryNodeList {
   virtual ~QueryNodePhrase();
 
   // QueryNodeList:
-  virtual int AppendToSQLiteQuery(base::string16* query) const OVERRIDE;
+  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;
+      Snippet::MatchPositions* match_positions) const override;
+  virtual 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 3bc0936..a3f5f06 100644
--- a/components/rappor/byte_vector_utils.h
+++ b/components/rappor/byte_vector_utils.h
@@ -95,7 +95,7 @@ class HmacByteVectorGenerator : public ByteVectorGenerator {
   explicit HmacByteVectorGenerator(const HmacByteVectorGenerator& prev_request);
 
   // ByteVector implementation:
-  virtual ByteVector GetRandomByteVector() OVERRIDE;
+  virtual 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 a446a34..18661b5 100644
--- a/components/rappor/log_uploader.h
+++ b/components/rappor/log_uploader.h
@@ -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;
+  virtual 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 ac37ed9..a065786 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 {
+  virtual 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 {
+  virtual void ScheduleNextUpload(base::TimeDelta interval) override {
     EXPECT_EQ(last_interval_set(), base::TimeDelta());
     last_interval_set_ = interval;
   }
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 776a81b..f3a822a 100644
--- a/components/renderer_context_menu/render_view_context_menu_base.h
+++ b/components/renderer_context_menu/render_view_context_menu_base.h
@@ -84,27 +84,27 @@ 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;
+  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;
 
   // RenderViewContextMenuProxy implementation.
   virtual void AddMenuItem(int command_id,
-                           const base::string16& title) OVERRIDE;
+                           const base::string16& title) override;
   virtual void AddCheckItem(int command_id,
-                            const base::string16& title) OVERRIDE;
-  virtual void AddSeparator() OVERRIDE;
+                            const base::string16& title) override;
+  virtual void AddSeparator() override;
   virtual void AddSubMenu(int command_id,
                           const base::string16& label,
-                          ui::MenuModel* model) OVERRIDE;
+                          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;
+                              const base::string16& title) override;
+  virtual content::RenderViewHost* GetRenderViewHost() const override;
+  virtual content::WebContents* GetWebContents() const override;
+  virtual content::BrowserContext* GetBrowserContext() const override;
 
  protected:
   friend class RenderViewContextMenuTest;
diff --git a/components/renderer_context_menu/render_view_context_menu_observer.h b/components/renderer_context_menu/render_view_context_menu_observer.h
index d5d24e0..3ae47d9 100644
--- a/components/renderer_context_menu/render_view_context_menu_observer.h
+++ b/components/renderer_context_menu/render_view_context_menu_observer.h
@@ -32,10 +32,10 @@ struct ContextMenuParams;
 //    MyMenuObserver(RenderViewContextMenuProxy* p);
 //    ~MyMenuObserver();
 //
-//    virtual void InitMenu(const content::ContextMenuParams& params) OVERRIDE;
-//    virtual bool IsCommandIdSupported(int command_id) OVERRIDE;
-//    virtual bool IsCommandIdEnabled(int command_id) OVERRIDE;
-//    virtual void ExecuteCommand(int command_id) OVERRIDE;
+//    virtual void InitMenu(const content::ContextMenuParams& params) override;
+//    virtual bool IsCommandIdSupported(int command_id) override;
+//    virtual bool IsCommandIdEnabled(int command_id) override;
+//    virtual void ExecuteCommand(int command_id) override;
 //
 //   private:
 //    RenderViewContextMenuProxy* proxy_;
diff --git a/components/renderer_context_menu/views/toolkit_delegate_views.h b/components/renderer_context_menu/views/toolkit_delegate_views.h
index ec6d2a0..b56a76e 100644
--- a/components/renderer_context_menu/views/toolkit_delegate_views.h
+++ b/components/renderer_context_menu/views/toolkit_delegate_views.h
@@ -34,12 +34,12 @@ class ToolkitDelegateViews : public RenderViewContextMenuBase::ToolkitDelegate {
 
  private:
   // ToolkitDelegate:
-  virtual void Init(ui::SimpleMenuModel* menu_model) OVERRIDE;
-  virtual void Cancel() OVERRIDE;
+  virtual void Init(ui::SimpleMenuModel* menu_model) override;
+  virtual void Cancel() override;
   virtual void UpdateMenuItem(int command_id,
                               bool enabled,
                               bool hidden,
-                              const base::string16& title) OVERRIDE;
+                              const base::string16& title) override;
 
   scoped_ptr<views::MenuModelAdapter> menu_adapter_;
   scoped_ptr<views::MenuRunner> menu_runner_;
diff --git a/components/search_engines/default_search_manager_unittest.cc b/components/search_engines/default_search_manager_unittest.cc
index fd5e7f4..9c9bb91 100644
--- a/components/search_engines/default_search_manager_unittest.cc
+++ b/components/search_engines/default_search_manager_unittest.cc
@@ -141,7 +141,7 @@ class DefaultSearchManagerTest : public testing::Test {
  public:
   DefaultSearchManagerTest() {};
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     pref_service_.reset(new user_prefs::TestingPrefServiceSyncable);
     DefaultSearchManager::RegisterProfilePrefs(pref_service_->registry());
     TemplateURLPrepopulateData::RegisterProfilePrefs(pref_service_->registry());
diff --git a/components/search_engines/default_search_policy_handler.h b/components/search_engines/default_search_policy_handler.h
index 0ebbfaa..1a53a48 100644
--- a/components/search_engines/default_search_policy_handler.h
+++ b/components/search_engines/default_search_policy_handler.h
@@ -20,7 +20,7 @@ class DefaultSearchEncodingsPolicyHandler
 
   // ConfigurationPolicyHandler methods:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultSearchEncodingsPolicyHandler);
@@ -34,9 +34,9 @@ class DefaultSearchPolicyHandler : public ConfigurationPolicyHandler {
 
   // ConfigurationPolicyHandler methods:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   void HandleDictionaryPref(const PolicyMap& policies, PrefValueMap* prefs);
diff --git a/components/search_engines/default_search_policy_handler_unittest.cc b/components/search_engines/default_search_policy_handler_unittest.cc
index 94620de..e5376c0 100644
--- a/components/search_engines/default_search_policy_handler_unittest.cc
+++ b/components/search_engines/default_search_policy_handler_unittest.cc
@@ -29,7 +29,7 @@ class DefaultSearchPolicyHandlerTest
         "http://www.google.com/search#q={searchTerms}");
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     handler_list_.AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
         new DefaultSearchPolicyHandler));
   }
diff --git a/components/search_engines/keyword_table.h b/components/search_engines/keyword_table.h
index 5ff36b4..7c8bc2a 100644
--- a/components/search_engines/keyword_table.h
+++ b/components/search_engines/keyword_table.h
@@ -97,11 +97,11 @@ class KeywordTable : public WebDatabaseTable {
   // 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 WebDatabaseTable::TypeKey GetTypeKey() const override;
+  virtual bool CreateTablesIfNecessary() override;
+  virtual bool IsSyncable() override;
   virtual bool MigrateToVersion(int version,
-                                bool* update_compatible_version) OVERRIDE;
+                                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/template_url_fetcher.cc b/components/search_engines/template_url_fetcher.cc
index 5b964be..3423939 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;
+  virtual 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_unittest.cc b/components/search_engines/template_url_fetcher_unittest.cc
index 7984764..7ab8c9e 100644
--- a/components/search_engines/template_url_fetcher_unittest.cc
+++ b/components/search_engines/template_url_fetcher_unittest.cc
@@ -26,7 +26,7 @@ class TemplateURLFetcherTest : public testing::Test {
  public:
   TemplateURLFetcherTest();
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     TestingProfile* profile = test_util_.profile();
     ASSERT_TRUE(profile->GetRequestContext());
     template_url_fetcher_.reset(new TemplateURLFetcher(
@@ -35,7 +35,7 @@ class TemplateURLFetcherTest : public testing::Test {
     ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
   }
 
diff --git a/components/search_engines/template_url_parser_unittest.cc b/components/search_engines/template_url_parser_unittest.cc
index d06c3d7..4331be0 100644
--- a/components/search_engines/template_url_parser_unittest.cc
+++ b/components/search_engines/template_url_parser_unittest.cc
@@ -24,7 +24,7 @@ class ParamFilterImpl : public TemplateURLParser::ParameterFilter {
   virtual ~ParamFilterImpl();
 
   virtual bool KeepParameter(const std::string& key,
-                             const std::string& value) OVERRIDE;
+                             const std::string& value) override;
 
  private:
   std::string name_str_;
@@ -55,7 +55,7 @@ class TemplateURLParserTest : public testing::Test {
   TemplateURLParserTest();
   virtual ~TemplateURLParserTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   bool is_disabled() const;
 
diff --git a/components/search_engines/template_url_prepopulate_data_unittest.cc b/components/search_engines/template_url_prepopulate_data_unittest.cc
index 28da1f1..9732529 100644
--- a/components/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/components/search_engines/template_url_prepopulate_data_unittest.cc
@@ -35,7 +35,7 @@ std::string GetHostFromTemplateURLData(const TemplateURLData& data) {
 
 class TemplateURLPrepopulateDataTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     TemplateURLPrepopulateData::RegisterProfilePrefs(prefs_.registry());
   }
 
diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h
index 0003857..438c42e 100644
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -292,7 +292,7 @@ class TemplateURLService : public WebDataServiceConsumer,
   // invoked.
   virtual void OnWebDataServiceRequestDone(
       KeywordWebDataService::Handle h,
-      const WDTypedResult* result) OVERRIDE;
+      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,20 +304,20 @@ class TemplateURLService : public WebDataServiceConsumer,
   void OnHistoryURLVisited(const URLVisitedDetails& details);
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual 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::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(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      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.
@@ -325,8 +325,8 @@ class TemplateURLService : public WebDataServiceConsumer,
       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;
+      scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override;
+  virtual 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 0548b4a..0b3f882 100644
--- a/components/search_engines/template_url_service_sync_unittest.cc
+++ b/components/search_engines/template_url_service_sync_unittest.cc
@@ -91,10 +91,10 @@ class TestChangeProcessor : public syncer::SyncChangeProcessor {
   // Store a copy of all the changes passed in so we can examine them later.
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
 
   virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
-      OVERRIDE {
+      override {
     return syncer::SyncDataList();
   }
 
@@ -154,8 +154,8 @@ class TemplateURLServiceSyncTest : public testing::Test {
 
   TemplateURLServiceSyncTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   TemplateURLService* model() { return test_util_a_->model(); }
   // For readability, we redefine an accessor for Model A for use in tests that
diff --git a/components/search_engines/template_url_service_unittest.cc b/components/search_engines/template_url_service_unittest.cc
index e9937ac..154f50c 100644
--- a/components/search_engines/template_url_service_unittest.cc
+++ b/components/search_engines/template_url_service_unittest.cc
@@ -133,8 +133,8 @@ class TemplateURLServiceTest : public testing::Test {
   TemplateURLServiceTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   TemplateURL* AddKeywordWithDate(const std::string& short_name,
                                   const std::string& keyword,
@@ -176,12 +176,12 @@ class TemplateURLServiceWithoutFallbackTest : public TemplateURLServiceTest {
  public:
   TemplateURLServiceWithoutFallbackTest() : TemplateURLServiceTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(true);
     TemplateURLServiceTest::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     TemplateURLServiceTest::TearDown();
     DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(false);
   }
diff --git a/components/search_engines/testing_search_terms_data.h b/components/search_engines/testing_search_terms_data.h
index 37138d7..c5d2429 100644
--- a/components/search_engines/testing_search_terms_data.h
+++ b/components/search_engines/testing_search_terms_data.h
@@ -12,14 +12,14 @@ class TestingSearchTermsData : public SearchTermsData {
   explicit TestingSearchTermsData(const std::string& google_base_url);
   virtual ~TestingSearchTermsData();
 
-  virtual std::string GoogleBaseURLValue() const OVERRIDE;
+  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;
+      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;
 
   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_cache_unittest.cc b/components/search_provider_logos/logo_cache_unittest.cc
index 53d0fec..8bf4471 100644
--- a/components/search_provider_logos/logo_cache_unittest.cc
+++ b/components/search_provider_logos/logo_cache_unittest.cc
@@ -95,7 +95,7 @@ void ShortenFile(base::FilePath path) {
 
 class LogoCacheTest : public ::testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(cache_parent_dir_.CreateUniqueTempDir());
     InitCache();
   }
diff --git a/components/search_provider_logos/logo_tracker.h b/components/search_provider_logos/logo_tracker.h
index 8a80bd6..54e3f2c 100644
--- a/components/search_provider_logos/logo_tracker.h
+++ b/components/search_provider_logos/logo_tracker.h
@@ -172,10 +172,10 @@ class LogoTracker : public net::URLFetcherDelegate {
                             const SkBitmap& image);
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                           int64 current,
-                                          int64 total) OVERRIDE;
+                                          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 84f8a22..27d6951 100644
--- a/components/search_provider_logos/logo_tracker_unittest.cc
+++ b/components/search_provider_logos/logo_tracker_unittest.cc
@@ -222,7 +222,7 @@ class MockLogoCache : public LogoCache {
     metadata_.reset(logo ? new LogoMetadata(logo->metadata) : NULL);
   }
 
-  virtual scoped_ptr<EncodedLogo> GetCachedLogo() OVERRIDE {
+  virtual scoped_ptr<EncodedLogo> GetCachedLogo() override {
     OnGetCachedLogo();
     return make_scoped_ptr(logo_ ? new EncodedLogo(*logo_) : NULL);
   }
@@ -281,7 +281,7 @@ class TestLogoDelegate : public LogoDelegate {
 
   virtual void DecodeUntrustedImage(
       const scoped_refptr<base::RefCountedString>& encoded_image,
-      base::Callback<void(const SkBitmap&)> image_decoded_callback) OVERRIDE {
+      base::Callback<void(const SkBitmap&)> image_decoded_callback) override {
     SkBitmap bitmap =
         gfx::Image::CreateFrom1xPNGBytes(encoded_image->front(),
                                          encoded_image->size()).AsBitmap();
diff --git a/components/signin/core/browser/about_signin_internals.h b/components/signin/core/browser/about_signin_internals.h
index 0a348d6..94fca77 100644
--- a/components/signin/core/browser/about_signin_internals.h
+++ b/components/signin/core/browser/about_signin_internals.h
@@ -61,16 +61,16 @@ class AboutSigninInternals
   // SigninManager::SigninDiagnosticsObserver implementation.
   virtual void NotifySigninValueChanged(
       const signin_internals_util::UntimedSigninStatusField& field,
-      const std::string& value) OVERRIDE;
+      const std::string& value) override;
 
   virtual void NotifySigninValueChanged(
       const signin_internals_util::TimedSigninStatusField& field,
-      const std::string& value) OVERRIDE;
+      const std::string& value) override;
 
   void Initialize(SigninClient* client);
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // Returns a dictionary of values in signin_status_ for use in
   // about:signin-internals. The values are formatted as shown -
@@ -96,16 +96,16 @@ class AboutSigninInternals
   virtual void OnAccessTokenRequested(
       const std::string& account_id,
       const std::string& consumer_id,
-      const OAuth2TokenService::ScopeSet& scopes) OVERRIDE;
+      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;
+      base::Time expiration_time) override;
   virtual void OnTokenRemoved(const std::string& account_id,
                               const OAuth2TokenService::ScopeSet& scopes)
-      OVERRIDE;
+      override;
 
     void OnRefreshTokenReceived(std::string status);
     void OnAuthenticationResultReceived(std::string status);
@@ -174,9 +174,9 @@ class AboutSigninInternals
 
 
   // Overriden from GaiaAuthConsumer.
-  virtual void OnListAccountsSuccess(const std::string& data) OVERRIDE;
+  virtual void OnListAccountsSuccess(const std::string& data) override;
   virtual void OnListAccountsFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
+      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 8d52dde..2b7f5ac 100644
--- a/components/signin/core/browser/account_reconcilor.h
+++ b/components/signin/core/browser/account_reconcilor.h
@@ -51,7 +51,7 @@ class AccountReconcilor : public KeyedService,
   void OnNewProfileManagementFlagChanged(bool new_flag_status);
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // Add or remove observers for the merge session notification.
   void AddMergeSessionObserver(MergeSessionHelper::Observer* observer);
@@ -138,24 +138,24 @@ class AccountReconcilor : public KeyedService,
   void OnCookieChanged(const net::CanonicalCookie* cookie);
 
   // Overriden from GaiaAuthConsumer.
-  virtual void OnListAccountsSuccess(const std::string& data) OVERRIDE;
+  virtual void OnListAccountsSuccess(const std::string& data) override;
   virtual void OnListAccountsFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
+      override;
 
   // Overriden from MergeSessionHelper::Observer.
   virtual void MergeSessionCompleted(const std::string& account_id,
                                      const GoogleServiceAuthError& error)
-      OVERRIDE;
+      override;
 
   // Overriden from OAuth2TokenService::Observer.
-  virtual void OnEndBatchChanges() OVERRIDE;
+  virtual void OnEndBatchChanges() override;
 
   // Overriden from SigninManagerBase::Observer.
   virtual void GoogleSigninSucceeded(const std::string& account_id,
                                      const std::string& username,
-                                     const std::string& password) OVERRIDE;
+                                     const std::string& password) override;
   virtual void GoogleSignedOut(const std::string& account_id,
-                               const std::string& username) OVERRIDE;
+                               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 eb79940..0ef6cd3 100644
--- a/components/signin/core/browser/account_service_flag_fetcher.h
+++ b/components/signin/core/browser/account_service_flag_fetcher.h
@@ -55,23 +55,23 @@ class AccountServiceFlagFetcher : public GaiaAuthConsumer,
   void StartFetchingOAuth2AccessToken();
 
   // Overridden from OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
-  virtual void OnRefreshTokensLoaded() OVERRIDE;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  virtual 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;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
   // Overridden from GaiaAuthConsumer:
-  virtual void OnClientLoginSuccess(const ClientLoginResult& result) OVERRIDE;
+  virtual void OnClientLoginSuccess(const ClientLoginResult& result) override;
   virtual void OnClientLoginFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
-  virtual void OnGetUserInfoSuccess(const UserInfoMap& data) OVERRIDE;
+      override;
+  virtual void OnGetUserInfoSuccess(const UserInfoMap& data) override;
   virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
+      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 ae4ae9b..4a6fdc6 100644
--- a/components/signin/core/browser/account_tracker_service.cc
+++ b/components/signin/core/browser/account_tracker_service.cc
@@ -40,15 +40,15 @@ class AccountInfoFetcher : public OAuth2TokenService::Consumer,
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
   // gaia::GaiaOAuthClient::Delegate implementation.
   virtual void OnGetUserInfoResponse(
-      scoped_ptr<base::DictionaryValue> user_info) OVERRIDE;
-  virtual void OnOAuthError() OVERRIDE;
-  virtual void OnNetworkError(int response_code) OVERRIDE;
+      scoped_ptr<base::DictionaryValue> user_info) override;
+  virtual void OnOAuthError() override;
+  virtual 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 68cf723..d973d1c 100644
--- a/components/signin/core/browser/account_tracker_service.h
+++ b/components/signin/core/browser/account_tracker_service.h
@@ -59,7 +59,7 @@ class AccountTrackerService : public KeyedService,
   virtual ~AccountTrackerService();
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual 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;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  virtual 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 f376d96..8b340dc 100644
--- a/components/signin/core/browser/account_tracker_service_unittest.cc
+++ b/components/signin/core/browser/account_tracker_service_unittest.cc
@@ -114,9 +114,9 @@ class AccountTrackerObserver : public AccountTrackerService::Observer {
  private:
   // AccountTrackerService::Observer implementation
   virtual void OnAccountUpdated(
-      const AccountTrackerService::AccountInfo& ids) OVERRIDE;
+      const AccountTrackerService::AccountInfo& ids) override;
   virtual void OnAccountRemoved(
-      const AccountTrackerService::AccountInfo& ids) OVERRIDE;
+      const AccountTrackerService::AccountInfo& ids) override;
 
   testing::AssertionResult CheckEvents(
       const std::vector<TrackingEvent>& events);
@@ -195,7 +195,7 @@ class AccountTrackerServiceTest : public testing::Test {
 
   virtual ~AccountTrackerServiceTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     fake_oauth2_token_service_.reset(new FakeOAuth2TokenService());
 
     pref_service_.registry()->RegisterListPref(
@@ -209,7 +209,7 @@ class AccountTrackerServiceTest : public testing::Test {
     account_tracker_->AddObserver(&observer_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     account_tracker_->RemoveObserver(&observer_);
     account_tracker_->Shutdown();
   }
diff --git a/components/signin/core/browser/fake_auth_status_provider.h b/components/signin/core/browser/fake_auth_status_provider.h
index b35bc6e..7254179 100644
--- a/components/signin/core/browser/fake_auth_status_provider.h
+++ b/components/signin/core/browser/fake_auth_status_provider.h
@@ -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;
+  virtual std::string GetAccountId() const override;
+  virtual std::string GetUsername() const override;
+  virtual 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 a9e4442..768a75a 100644
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service.cc
+++ b/components/signin/core/browser/mutable_profile_oauth2_token_service.cc
@@ -49,7 +49,7 @@ class MutableProfileOAuth2TokenService::RevokeServerRefreshToken
 
  private:
   // GaiaAuthConsumer overrides:
-  virtual void OnOAuth2RevokeTokenCompleted() OVERRIDE;
+  virtual 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 6f7aa88..0ee82b0 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,17 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
                                          public WebDataServiceConsumer  {
  public:
   // ProfileOAuth2TokenService overrides.
-  virtual void Shutdown() OVERRIDE;
-  virtual std::vector<std::string> GetAccounts() OVERRIDE;
+  virtual void Shutdown() override;
+  virtual 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 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;
+                                 const std::string& refresh_token) override;
+  virtual void RevokeAllCredentials() override;
   virtual bool RefreshTokenIsAvailable(const std::string& account_id) const
-      OVERRIDE;
+      override;
 
   // Revokes credentials related to |account_id|.
   void RevokeCredentials(const std::string& account_id);
@@ -51,9 +51,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;
+    virtual std::string GetAccountId() const override;
+    virtual std::string GetUsername() const override;
+    virtual GoogleServiceAuthError GetAuthStatus() const override;
 
    private:
     ProfileOAuth2TokenService* token_service_;
@@ -78,13 +78,13 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
   virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
-      OAuth2AccessTokenConsumer* consumer) OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+      OAuth2AccessTokenConsumer* consumer) override;
+  virtual 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;
+                               const GoogleServiceAuthError& error) override;
 
   virtual std::string GetRefreshToken(const std::string& account_id) const;
 
@@ -103,7 +103,7 @@ class MutableProfileOAuth2TokenService : public ProfileOAuth2TokenService,
   // WebDataServiceConsumer implementation:
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle handle,
-      const WDTypedResult* result) OVERRIDE;
+      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 b76d749..26b8447 100644
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
+++ b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
@@ -37,7 +37,7 @@ class MutableProfileOAuth2TokenServiceTest
         start_batch_changes_(0),
         end_batch_changes_(0) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
 #if defined(OS_MACOSX)
     OSCrypt::UseMockKeychain(true);
 #endif
@@ -52,7 +52,7 @@ class MutableProfileOAuth2TokenServiceTest
     oauth2_service_.AddObserver(this);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     oauth2_service_.RemoveObserver(this);
     oauth2_service_.Shutdown();
   }
@@ -65,19 +65,19 @@ class MutableProfileOAuth2TokenServiceTest
   }
 
   // OAuth2TokenService::Observer implementation.
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE {
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override {
     ++token_available_count_;
   }
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE {
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override {
     ++token_revoked_count_;
   }
-  virtual void OnRefreshTokensLoaded() OVERRIDE { ++tokens_loaded_count_; }
+  virtual void OnRefreshTokensLoaded() override { ++tokens_loaded_count_; }
 
-  virtual void OnStartBatchChanges() OVERRIDE {
+  virtual void OnStartBatchChanges() override {
     ++start_batch_changes_;
   }
 
-  virtual void OnEndBatchChanges() OVERRIDE {
+  virtual void OnEndBatchChanges() override {
     ++end_batch_changes_;
   }
 
diff --git a/components/signin/core/browser/profile_oauth2_token_service.h b/components/signin/core/browser/profile_oauth2_token_service.h
index 0878184..b6f133f 100644
--- a/components/signin/core/browser/profile_oauth2_token_service.h
+++ b/components/signin/core/browser/profile_oauth2_token_service.h
@@ -43,10 +43,10 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   virtual void Initialize(SigninClient* client);
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // Lists account IDs of all accounts with a refresh token.
-  virtual std::vector<std::string> GetAccounts() OVERRIDE;
+  virtual 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,13 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   // concrete class.
 
   // Simply returns NULL and should be overriden by subsclasses.
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+  virtual 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;
+      const GoogleServiceAuthError& error) override;
 
  private:
   // The client with which this instance was initialized, or NULL.
diff --git a/components/signin/core/browser/signin_account_id_helper.cc b/components/signin/core/browser/signin_account_id_helper.cc
index f6f3ae9..57a69b2 100644
--- a/components/signin/core/browser/signin_account_id_helper.cc
+++ b/components/signin/core/browser/signin_account_id_helper.cc
@@ -24,14 +24,14 @@ class SigninAccountIdHelper::GaiaIdFetcher
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 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;
+  virtual void OnGetUserIdResponse(const std::string& gaia_id) override;
+  virtual void OnOAuthError() override;
+  virtual 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 7c5cc06..680d463 100644
--- a/components/signin/core/browser/signin_account_id_helper.h
+++ b/components/signin/core/browser/signin_account_id_helper.h
@@ -28,10 +28,10 @@ class SigninAccountIdHelper : public SigninManagerBase::Observer,
 
   // SigninManagerBase::Observer:
   virtual void GoogleSignedOut(const std::string& account_id,
-                               const std::string& username) OVERRIDE;
+                               const std::string& username) override;
 
   // OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
+  virtual 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_error_controller_unittest.cc b/components/signin/core/browser/signin_error_controller_unittest.cc
index 8c5f51a..8a57d9e 100644
--- a/components/signin/core/browser/signin_error_controller_unittest.cc
+++ b/components/signin/core/browser/signin_error_controller_unittest.cc
@@ -17,7 +17,7 @@ static const char kOtherTestUsername[] = "otheruser@test.com";
 
 class SigninErrorControllerTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     error_controller_.reset(new SigninErrorController());
   }
 
diff --git a/components/signin/core/browser/signin_manager.h b/components/signin/core/browser/signin_manager.h
index f03beb7..320872e 100644
--- a/components/signin/core/browser/signin_manager.h
+++ b/components/signin/core/browser/signin_manager.h
@@ -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;
+  virtual void Initialize(PrefService* local_state) override;
+  virtual 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;
+  virtual bool AuthInProgress() const override;
 
-  virtual bool IsSigninAllowed() const OVERRIDE;
+  virtual 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 a7a0f9b..b933148 100644
--- a/components/signin/core/browser/signin_manager_base.h
+++ b/components/signin/core/browser/signin_manager_base.h
@@ -109,7 +109,7 @@ class SigninManagerBase : public KeyedService {
   virtual bool AuthInProgress() const;
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual 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 977d54b..fa361a1 100644
--- a/components/signin/core/browser/signin_oauth_helper.h
+++ b/components/signin/core/browser/signin_oauth_helper.h
@@ -42,15 +42,15 @@ class SigninOAuthHelper : public GaiaAuthConsumer {
 
  private:
   // Overridden from GaiaAuthConsumer.
-  virtual void OnClientOAuthSuccess(const ClientOAuthResult& result) OVERRIDE;
+  virtual void OnClientOAuthSuccess(const ClientOAuthResult& result) override;
   virtual void OnClientOAuthFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
-  virtual void OnClientLoginSuccess(const ClientLoginResult& result) OVERRIDE;
+      override;
+  virtual void OnClientLoginSuccess(const ClientLoginResult& result) override;
   virtual void OnClientLoginFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
-  virtual void OnGetUserInfoSuccess(const UserInfoMap& data) OVERRIDE;
+      override;
+  virtual void OnGetUserInfoSuccess(const UserInfoMap& data) override;
   virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
+      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 0e093e2..a45dedf 100644
--- a/components/signin/core/browser/signin_tracker.h
+++ b/components/signin/core/browser/signin_tracker.h
@@ -78,11 +78,11 @@ class SigninTracker : public SigninManagerBase::Observer,
   virtual ~SigninTracker();
 
   // SigninManagerBase::Observer implementation.
-  virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
+  virtual 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;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
 
  private:
   // Initializes this by adding notifications and observers.
@@ -91,7 +91,7 @@ class SigninTracker : public SigninManagerBase::Observer,
   // MergeSessionHelper::Observer implementation.
   virtual void MergeSessionCompleted(
       const std::string& account_id,
-      const GoogleServiceAuthError& error) OVERRIDE;
+      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 94240a0..5e73936 100644
--- a/components/signin/core/browser/test_signin_client.h
+++ b/components/signin/core/browser/test_signin_client.h
@@ -33,53 +33,53 @@ class TestSigninClient : public SigninClient {
   // 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;
+  virtual PrefService* GetPrefs() override;
 
   // Returns a pointer to a loaded database.
-  virtual scoped_refptr<TokenWebData> GetDatabase() OVERRIDE;
+  virtual scoped_refptr<TokenWebData> GetDatabase() override;
 
   // Returns true.
-  virtual bool CanRevokeCredentials() OVERRIDE;
+  virtual bool CanRevokeCredentials() override;
 
   // Returns empty string.
-  virtual std::string GetSigninScopedDeviceId() OVERRIDE;
+  virtual std::string GetSigninScopedDeviceId() override;
 
   // Does nothing.
-  virtual void ClearSigninScopedDeviceId() OVERRIDE;
+  virtual void ClearSigninScopedDeviceId() override;
 
   // Returns the empty string.
-  virtual std::string GetProductVersion() OVERRIDE;
+  virtual std::string GetProductVersion() override;
 
   // Returns a TestURLRequestContextGetter or an manually provided
   // URLRequestContextGetter.
-  virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContextGetter* GetURLRequestContext() override;
 
   // For testing purposes, can override the TestURLRequestContextGetter created
   // in the default constructor.
   void SetURLRequestContext(net::URLRequestContextGetter* request_context);
 
 #if defined(OS_IOS)
-  virtual ios::ProfileOAuth2TokenServiceIOSProvider* GetIOSProvider() OVERRIDE;
+  virtual ios::ProfileOAuth2TokenServiceIOSProvider* GetIOSProvider() override;
 #endif
 
   // Returns true.
-  virtual bool ShouldMergeSigninCredentialsIntoCookieJar() OVERRIDE;
+  virtual bool ShouldMergeSigninCredentialsIntoCookieJar() override;
 
   // Does nothing.
   virtual scoped_ptr<CookieChangedCallbackList::Subscription>
-      AddCookieChangedCallback(const CookieChangedCallback& callback) OVERRIDE;
+      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;
+  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;
 
  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 9590653..b4a1d8d 100644
--- a/components/signin/core/browser/webdata/token_service_table.h
+++ b/components/signin/core/browser/webdata/token_service_table.h
@@ -21,11 +21,11 @@ class TokenServiceTable : public WebDatabaseTable {
   // 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 WebDatabaseTable::TypeKey GetTypeKey() const override;
+  virtual bool CreateTablesIfNecessary() override;
+  virtual bool IsSyncable() override;
   virtual bool MigrateToVersion(int version,
-                                bool* update_compatible_version) OVERRIDE;
+                                bool* update_compatible_version) override;
 
   // Remove all tokens previously set with SetTokenForService.
   bool RemoveAllTokens();
diff --git a/components/signin/ios/browser/profile_oauth2_token_service_ios.h b/components/signin/ios/browser/profile_oauth2_token_service_ios.h
index 3355f41..65381ce 100644
--- a/components/signin/ios/browser/profile_oauth2_token_service_ios.h
+++ b/components/signin/ios/browser/profile_oauth2_token_service_ios.h
@@ -27,32 +27,32 @@ class ProfileOAuth2TokenServiceIOSProvider;
 class ProfileOAuth2TokenServiceIOS : public ProfileOAuth2TokenService {
  public:
   // KeyedService
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // OAuth2TokenService
   virtual bool RefreshTokenIsAvailable(
-      const std::string& account_id) const OVERRIDE;
+      const std::string& account_id) const override;
 
   virtual void InvalidateOAuth2Token(const std::string& account_id,
                                      const std::string& client_id,
                                      const ScopeSet& scopes,
-                                     const std::string& access_token) OVERRIDE;
+                                     const std::string& access_token) override;
 
   // ProfileOAuth2TokenService
-  virtual void Initialize(SigninClient* client) OVERRIDE;
-  virtual void LoadCredentials(const std::string& primary_account_id) OVERRIDE;
-  virtual std::vector<std::string> GetAccounts() OVERRIDE;
+  virtual void Initialize(SigninClient* client) override;
+  virtual void LoadCredentials(const std::string& primary_account_id) override;
+  virtual std::vector<std::string> GetAccounts() override;
   virtual void UpdateAuthError(const std::string& account_id,
-                               const GoogleServiceAuthError& error) OVERRIDE;
+                               const GoogleServiceAuthError& error) override;
 
   // This method should not be called when using shared authentication.
   virtual void UpdateCredentials(const std::string& account_id,
-                                 const std::string& refresh_token) OVERRIDE;
+                                 const std::string& refresh_token) override;
 
   // Removes all credentials from this instance of |ProfileOAuth2TokenService|,
   // however, it does not revoke the identities from the device.
   // Subsequent calls to |RefreshTokenIsAvailable| will return |false|.
-  virtual void RevokeAllCredentials() OVERRIDE;
+  virtual void RevokeAllCredentials() override;
 
   // Reloads accounts from the provider. Fires |OnRefreshTokenAvailable| for
   // each new account. Fires |OnRefreshTokenRevoked| for each account that was
@@ -69,7 +69,7 @@ class ProfileOAuth2TokenServiceIOS : public ProfileOAuth2TokenService {
   virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
-      OAuth2AccessTokenConsumer* consumer) OVERRIDE;
+      OAuth2AccessTokenConsumer* consumer) override;
 
   // Protected and virtual to be overriden by fake for testing.
 
@@ -92,9 +92,9 @@ class ProfileOAuth2TokenServiceIOS : 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;
+    virtual std::string GetAccountId() const override;
+    virtual std::string GetUsername() const override;
+    virtual GoogleServiceAuthError GetAuthStatus() const override;
 
    private:
     ProfileOAuth2TokenService* token_service_;
diff --git a/components/signin/ios/browser/profile_oauth2_token_service_ios.mm b/components/signin/ios/browser/profile_oauth2_token_service_ios.mm
index 63da829..f51af73 100644
--- a/components/signin/ios/browser/profile_oauth2_token_service_ios.mm
+++ b/components/signin/ios/browser/profile_oauth2_token_service_ios.mm
@@ -65,9 +65,9 @@ class SSOAccessTokenFetcher : public OAuth2AccessTokenFetcher {
 
   virtual void Start(const std::string& client_id,
                      const std::string& client_secret,
-                     const std::vector<std::string>& scopes) OVERRIDE;
+                     const std::vector<std::string>& scopes) override;
 
-  virtual void CancelRequest() OVERRIDE;
+  virtual void CancelRequest() override;
 
   // Handles an access token response.
   void OnAccessTokenResponse(NSString* token,
diff --git a/components/signin/ios/browser/profile_oauth2_token_service_ios_unittest.mm b/components/signin/ios/browser/profile_oauth2_token_service_ios_unittest.mm
index 8668b29..11e9840 100644
--- a/components/signin/ios/browser/profile_oauth2_token_service_ios_unittest.mm
+++ b/components/signin/ios/browser/profile_oauth2_token_service_ios_unittest.mm
@@ -26,7 +26,7 @@ class ProfileOAuth2TokenServiceIOSTest : public testing::Test,
         access_token_failure_(0),
         last_access_token_error_(GoogleServiceAuthError::NONE) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     factory_.SetFakeResponse(GaiaUrls::GetInstance()->oauth2_revoke_url(),
                              "",
                              net::HTTP_OK,
@@ -36,7 +36,7 @@ class ProfileOAuth2TokenServiceIOSTest : public testing::Test,
     oauth2_service_.AddObserver(this);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     oauth2_service_.RemoveObserver(this);
     oauth2_service_.Shutdown();
   }
@@ -44,24 +44,24 @@ class ProfileOAuth2TokenServiceIOSTest : public testing::Test,
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE {
+                                 const base::Time& expiration_time) override {
     ++access_token_success_;
   }
 
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE {
+                                 const GoogleServiceAuthError& error) override {
     ++access_token_failure_;
     last_access_token_error_ = error;
   };
 
   // OAuth2TokenService::Observer implementation.
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE {
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override {
     ++token_available_count_;
   }
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE {
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override {
     ++token_revoked_count_;
   }
-  virtual void OnRefreshTokensLoaded() OVERRIDE { ++tokens_loaded_count_; }
+  virtual void OnRefreshTokensLoaded() override { ++tokens_loaded_count_; }
 
   void ResetObserverCounts() {
     token_available_count_ = 0;
diff --git a/components/storage_monitor/image_capture_device_manager_unittest.mm b/components/storage_monitor/image_capture_device_manager_unittest.mm
index 57ef1f3..477a203 100644
--- a/components/storage_monitor/image_capture_device_manager_unittest.mm
+++ b/components/storage_monitor/image_capture_device_manager_unittest.mm
@@ -208,23 +208,23 @@ class TestCameraListener
   virtual ~TestCameraListener() {}
 
   virtual void ItemAdded(const std::string& name,
-                         const base::File::Info& info) OVERRIDE {
+                         const base::File::Info& info) override {
     items_.push_back(name);
   }
 
-  virtual void NoMoreItems() OVERRIDE {
+  virtual void NoMoreItems() override {
     completed_ = true;
   }
 
   virtual void DownloadedFile(const std::string& name,
-                              base::File::Error error) OVERRIDE {
+                              base::File::Error error) override {
     EXPECT_TRUE(content::BrowserThread::CurrentlyOn(
         content::BrowserThread::UI));
     downloads_.push_back(name);
     last_error_ = error;
   }
 
-  virtual void DeviceRemoved() OVERRIDE {
+  virtual void DeviceRemoved() override {
     removed_ = true;
   }
 
@@ -244,11 +244,11 @@ class TestCameraListener
 
 class ImageCaptureDeviceManagerTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     monitor_ = TestStorageMonitor::CreateAndInstall();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     TestStorageMonitor::Destroy();
   }
 
diff --git a/components/storage_monitor/media_storage_util_unittest.cc b/components/storage_monitor/media_storage_util_unittest.cc
index 7ece312..de13437 100644
--- a/components/storage_monitor/media_storage_util_unittest.cc
+++ b/components/storage_monitor/media_storage_util_unittest.cc
@@ -60,12 +60,12 @@ class MediaStorageUtilTest : public testing::Test {
     return scoped_temp_dir_.path();
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     monitor_ = TestStorageMonitor::CreateAndInstall();
     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     WaitForFileThread();
     TestStorageMonitor::Destroy();
   }
diff --git a/components/storage_monitor/media_transfer_protocol_device_observer_linux.h b/components/storage_monitor/media_transfer_protocol_device_observer_linux.h
index 224cafa..3b9d122 100644
--- a/components/storage_monitor/media_transfer_protocol_device_observer_linux.h
+++ b/components/storage_monitor/media_transfer_protocol_device_observer_linux.h
@@ -57,7 +57,7 @@ class MediaTransferProtocolDeviceObserverLinux
   // device::MediaTransferProtocolManager::Observer implementation.
   // Exposed for unit tests.
   virtual void StorageChanged(bool is_attached,
-                              const std::string& storage_name) OVERRIDE;
+                              const std::string& storage_name) override;
 
  private:
   // Mapping of storage location and mtp storage info object.
diff --git a/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc b/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
index af9987c..f39ccdf 100644
--- a/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
+++ b/components/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
@@ -99,7 +99,7 @@ class MediaTransferProtocolDeviceObserverLinuxTest : public testing::Test {
   virtual ~MediaTransferProtocolDeviceObserverLinuxTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     mock_storage_observer_.reset(new MockRemovableStorageObserver);
     TestStorageMonitor* monitor = TestStorageMonitor::CreateAndInstall();
     mtp_device_observer_.reset(
@@ -108,7 +108,7 @@ class MediaTransferProtocolDeviceObserverLinuxTest : public testing::Test {
     monitor->AddObserver(mock_storage_observer_.get());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     StorageMonitor* monitor = StorageMonitor::GetInstance();
     monitor->RemoveObserver(mock_storage_observer_.get());
     mtp_device_observer_.reset();
diff --git a/components/storage_monitor/mock_removable_storage_observer.h b/components/storage_monitor/mock_removable_storage_observer.h
index 80019b3..220035e 100644
--- a/components/storage_monitor/mock_removable_storage_observer.h
+++ b/components/storage_monitor/mock_removable_storage_observer.h
@@ -15,9 +15,9 @@ class MockRemovableStorageObserver : public RemovableStorageObserver {
   MockRemovableStorageObserver();
   virtual ~MockRemovableStorageObserver();
 
-  virtual void OnRemovableStorageAttached(const StorageInfo& info) OVERRIDE;
+  virtual void OnRemovableStorageAttached(const StorageInfo& info) override;
 
-  virtual void OnRemovableStorageDetached(const StorageInfo& info) OVERRIDE;
+  virtual 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 85e60433..cd6bfae 100644
--- a/components/storage_monitor/storage_monitor.cc
+++ b/components/storage_monitor/storage_monitor.cc
@@ -27,11 +27,11 @@ class StorageMonitor::ReceiverImpl : public StorageMonitor::Receiver {
 
   virtual ~ReceiverImpl() {}
 
-  virtual void ProcessAttach(const StorageInfo& info) OVERRIDE;
+  virtual void ProcessAttach(const StorageInfo& info) override;
 
-  virtual void ProcessDetach(const std::string& id) OVERRIDE;
+  virtual void ProcessDetach(const std::string& id) override;
 
-  virtual void MarkInitialized() OVERRIDE;
+  virtual void MarkInitialized() override;
 
  private:
   StorageMonitor* notifications_;
diff --git a/components/storage_monitor/storage_monitor_chromeos.h b/components/storage_monitor/storage_monitor_chromeos.h
index b3deb54..726f0dc 100644
--- a/components/storage_monitor/storage_monitor_chromeos.h
+++ b/components/storage_monitor/storage_monitor_chromeos.h
@@ -37,7 +37,7 @@ class StorageMonitorCros : public StorageMonitor,
 
   // Sets up disk listeners and issues notifications for any discovered
   // mount points. Sets up MTP manager and listeners.
-  virtual void Init() OVERRIDE;
+  virtual void Init() override;
 
  protected:
   void SetMediaTransferProtocolManagerForTest(
@@ -46,28 +46,28 @@ class StorageMonitorCros : public StorageMonitor,
   // chromeos::disks::DiskMountManager::Observer implementation.
   virtual void OnDiskEvent(
       chromeos::disks::DiskMountManager::DiskEvent event,
-      const chromeos::disks::DiskMountManager::Disk* disk) OVERRIDE;
+      const chromeos::disks::DiskMountManager::Disk* disk) override;
   virtual void OnDeviceEvent(
       chromeos::disks::DiskMountManager::DeviceEvent event,
-      const std::string& device_path) OVERRIDE;
+      const std::string& device_path) override;
   virtual void OnMountEvent(
       chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
-      OVERRIDE;
+      override;
   virtual void OnFormatEvent(
       chromeos::disks::DiskMountManager::FormatEvent event,
       chromeos::FormatError error_code,
-      const std::string& device_path) OVERRIDE;
+      const std::string& device_path) override;
 
   // StorageMonitor implementation.
   virtual bool GetStorageInfoForPath(const base::FilePath& path,
-                                     StorageInfo* device_info) const OVERRIDE;
+                                     StorageInfo* device_info) const override;
   virtual void EjectDevice(
       const std::string& device_id,
-      base::Callback<void(EjectStatus)> callback) OVERRIDE;
+      base::Callback<void(EjectStatus)> callback) override;
   virtual device::MediaTransferProtocolManager*
-      media_transfer_protocol_manager() OVERRIDE;
+      media_transfer_protocol_manager() override;
 
  private:
   // Mapping of mount path to removable mass storage info.
diff --git a/components/storage_monitor/storage_monitor_chromeos_unittest.cc b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
index 8e75384..e6838c1 100644
--- a/components/storage_monitor/storage_monitor_chromeos_unittest.cc
+++ b/components/storage_monitor/storage_monitor_chromeos_unittest.cc
@@ -61,7 +61,7 @@ class TestStorageMonitorCros : public StorageMonitorCros {
 
   virtual ~TestStorageMonitorCros() {}
 
-  virtual void Init() OVERRIDE {
+  virtual void Init() override {
     SetMediaTransferProtocolManagerForTest(
         new TestMediaTransferProtocolManagerLinux());
     StorageMonitorCros::Init();
@@ -69,17 +69,17 @@ class TestStorageMonitorCros : public StorageMonitorCros {
 
   virtual void OnMountEvent(DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
-      const DiskMountManager::MountPointInfo& mount_info) OVERRIDE {
+      const DiskMountManager::MountPointInfo& mount_info) override {
     StorageMonitorCros::OnMountEvent(event, error_code, mount_info);
   }
 
   virtual bool GetStorageInfoForPath(const base::FilePath& path,
-                                     StorageInfo* device_info) const OVERRIDE {
+                                     StorageInfo* device_info) const override {
     return StorageMonitorCros::GetStorageInfoForPath(path, device_info);
   }
   virtual void EjectDevice(
       const std::string& device_id,
-      base::Callback<void(EjectStatus)> callback) OVERRIDE {
+      base::Callback<void(EjectStatus)> callback) override {
     StorageMonitorCros::EjectDevice(device_id, callback);
   }
 
@@ -97,8 +97,8 @@ class StorageMonitorCrosTest : public testing::Test {
 
  protected:
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void MountDevice(chromeos::MountError error_code,
                    const DiskMountManager::MountPointInfo& mount_info,
diff --git a/components/storage_monitor/storage_monitor_linux.h b/components/storage_monitor/storage_monitor_linux.h
index 9bd0e13..ce44369 100644
--- a/components/storage_monitor/storage_monitor_linux.h
+++ b/components/storage_monitor/storage_monitor_linux.h
@@ -42,7 +42,7 @@ class StorageMonitorLinux : public StorageMonitor,
   virtual ~StorageMonitorLinux();
 
   // Must be called for StorageMonitorLinux to work.
-  virtual void Init() OVERRIDE;
+  virtual void Init() override;
 
  protected:
   // Gets device information given a |device_path| and |mount_point|.
@@ -58,7 +58,7 @@ class StorageMonitorLinux : public StorageMonitor,
 
   // MtabWatcherLinux::Delegate implementation.
   virtual void UpdateMtab(
-      const MtabWatcherLinux::MountPointDeviceMap& new_mtab) OVERRIDE;
+      const MtabWatcherLinux::MountPointDeviceMap& new_mtab) override;
 
  private:
   // Structure to save mounted device information such as device path, unique
@@ -91,11 +91,11 @@ class StorageMonitorLinux : public StorageMonitor,
 
   // StorageMonitor implementation.
   virtual bool GetStorageInfoForPath(const base::FilePath& path,
-                                     StorageInfo* device_info) const OVERRIDE;
+                                     StorageInfo* device_info) const override;
   virtual void EjectDevice(const std::string& device_id,
-                           base::Callback<void(EjectStatus)> callback) OVERRIDE;
+                           base::Callback<void(EjectStatus)> callback) override;
   virtual device::MediaTransferProtocolManager*
-      media_transfer_protocol_manager() OVERRIDE;
+      media_transfer_protocol_manager() override;
 
   // Called when the MtabWatcher has been created.
   void OnMtabWatcherCreated(MtabWatcherLinux* watcher);
diff --git a/components/storage_monitor/storage_monitor_linux_unittest.cc b/components/storage_monitor/storage_monitor_linux_unittest.cc
index eea602f..96e23f6 100644
--- a/components/storage_monitor/storage_monitor_linux_unittest.cc
+++ b/components/storage_monitor/storage_monitor_linux_unittest.cc
@@ -130,7 +130,7 @@ class TestStorageMonitorLinux : public StorageMonitorLinux {
 
  private:
   virtual void UpdateMtab(
-      const MtabWatcherLinux::MountPointDeviceMap& new_mtab) OVERRIDE {
+      const MtabWatcherLinux::MountPointDeviceMap& new_mtab) override {
     StorageMonitorLinux::UpdateMtab(new_mtab);
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE, base::MessageLoop::QuitClosure());
@@ -160,7 +160,7 @@ class StorageMonitorLinuxTest : public testing::Test {
   virtual ~StorageMonitorLinuxTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Create and set up a temp dir with files for the test.
     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
     base::FilePath test_dir = scoped_temp_dir_.path().AppendASCII("test_etc");
@@ -182,7 +182,7 @@ class StorageMonitorLinuxTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     base::RunLoop().RunUntilIdle();
     monitor_->RemoveObserver(mock_storage_observer_.get());
     base::RunLoop().RunUntilIdle();
diff --git a/components/storage_monitor/storage_monitor_mac.h b/components/storage_monitor/storage_monitor_mac.h
index f107058..60a76f4 100644
--- a/components/storage_monitor/storage_monitor_mac.h
+++ b/components/storage_monitor/storage_monitor_mac.h
@@ -32,7 +32,7 @@ class StorageMonitorMac : public StorageMonitor,
 
   virtual ~StorageMonitorMac();
 
-  virtual void Init() OVERRIDE;
+  virtual void Init() override;
 
   void UpdateDisk(const std::string& bsd_name,
                   const StorageInfo& info,
@@ -40,11 +40,11 @@ class StorageMonitorMac : public StorageMonitor,
 
   virtual bool GetStorageInfoForPath(
       const base::FilePath& path,
-      StorageInfo* device_info) const OVERRIDE;
+      StorageInfo* device_info) const override;
 
   virtual void EjectDevice(
       const std::string& device_id,
-      base::Callback<void(EjectStatus)> callback) OVERRIDE;
+      base::Callback<void(EjectStatus)> callback) override;
 
  private:
   static void DiskAppearedCallback(DADiskRef disk, void* context);
diff --git a/components/storage_monitor/storage_monitor_mac_unittest.mm b/components/storage_monitor/storage_monitor_mac_unittest.mm
index c131ebb..0111cd8 100644
--- a/components/storage_monitor/storage_monitor_mac_unittest.mm
+++ b/components/storage_monitor/storage_monitor_mac_unittest.mm
@@ -41,7 +41,7 @@ class StorageMonitorMacTest : public testing::Test {
  public:
   StorageMonitorMacTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     monitor_.reset(new StorageMonitorMac);
 
     mock_storage_observer_.reset(new MockRemovableStorageObserver);
diff --git a/components/storage_monitor/storage_monitor_win.h b/components/storage_monitor/storage_monitor_win.h
index 65681b4..6b51cab 100644
--- a/components/storage_monitor/storage_monitor_win.h
+++ b/components/storage_monitor/storage_monitor_win.h
@@ -32,19 +32,19 @@ class StorageMonitorWin : public StorageMonitor {
   virtual ~StorageMonitorWin();
 
   // Must be called after the file thread is created.
-  virtual void Init() OVERRIDE;
+  virtual void Init() override;
 
   // StorageMonitor:
   virtual bool GetStorageInfoForPath(const base::FilePath& path,
-                                     StorageInfo* device_info) const OVERRIDE;
+                                     StorageInfo* device_info) const override;
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
-      base::string16* storage_object_id) const OVERRIDE;
+      base::string16* storage_object_id) const override;
 
   virtual void EjectDevice(
       const std::string& device_id,
-      base::Callback<void(EjectStatus)> callback) OVERRIDE;
+      base::Callback<void(EjectStatus)> callback) override;
 
  private:
   class PortableDeviceNotifications;
diff --git a/components/storage_monitor/storage_monitor_win_unittest.cc b/components/storage_monitor/storage_monitor_win_unittest.cc
index 7c685b0..59aefcb 100644
--- a/components/storage_monitor/storage_monitor_win_unittest.cc
+++ b/components/storage_monitor/storage_monitor_win_unittest.cc
@@ -43,8 +43,8 @@ class StorageMonitorWinTest : public testing::Test {
 
  protected:
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void PreAttachDevices();
 
diff --git a/components/storage_monitor/test_media_transfer_protocol_manager_linux.h b/components/storage_monitor/test_media_transfer_protocol_manager_linux.h
index eae125a..64bd18d 100644
--- a/components/storage_monitor/test_media_transfer_protocol_manager_linux.h
+++ b/components/storage_monitor/test_media_transfer_protocol_manager_linux.h
@@ -18,27 +18,27 @@ class TestMediaTransferProtocolManagerLinux
 
  private:
   // device::MediaTransferProtocolManager implementation.
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual const std::vector<std::string> GetStorages() const OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual const std::vector<std::string> GetStorages() const override;
   virtual const MtpStorageInfo* GetStorageInfo(
-      const std::string& storage_name) const OVERRIDE;
+      const std::string& storage_name) const override;
   virtual void OpenStorage(const std::string& storage_name,
                            const std::string& mode,
-                           const OpenStorageCallback& callback) OVERRIDE;
+                           const OpenStorageCallback& callback) override;
   virtual void CloseStorage(const std::string& storage_handle,
-                            const CloseStorageCallback& callback) OVERRIDE;
+                            const CloseStorageCallback& callback) override;
   virtual void ReadDirectory(const std::string& storage_handle,
                              uint32 file_id,
-                             const ReadDirectoryCallback& callback) OVERRIDE;
+                             const ReadDirectoryCallback& callback) override;
   virtual void ReadFileChunk(const std::string& storage_handle,
                              uint32 file_id,
                              uint32 offset,
                              uint32 count,
-                             const ReadFileCallback& callback) OVERRIDE;
+                             const ReadFileCallback& callback) override;
   virtual void GetFileInfo(const std::string& storage_handle,
                            uint32 file_id,
-                           const GetFileInfoCallback& callback) OVERRIDE;
+                           const GetFileInfoCallback& callback) override;
 
   DISALLOW_COPY_AND_ASSIGN(TestMediaTransferProtocolManagerLinux);
 };
diff --git a/components/storage_monitor/test_portable_device_watcher_win.h b/components/storage_monitor/test_portable_device_watcher_win.h
index ed773ed..bc108b1 100644
--- a/components/storage_monitor/test_portable_device_watcher_win.h
+++ b/components/storage_monitor/test_portable_device_watcher_win.h
@@ -60,13 +60,13 @@ class TestPortableDeviceWatcherWin : public PortableDeviceWatcherWin {
 
  private:
   // PortableDeviceWatcherWin:
-  virtual void EnumerateAttachedDevices() OVERRIDE;
+  virtual void EnumerateAttachedDevices() override;
   virtual void HandleDeviceAttachEvent(
-      const base::string16& pnp_device_id) OVERRIDE;
+      const base::string16& pnp_device_id) override;
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
-      base::string16* storage_object_id) const OVERRIDE;
+      base::string16* storage_object_id) const override;
 
   // Set to true to get dummy storage details from
   // GetMTPStorageInfoFromDeviceId().
diff --git a/components/storage_monitor/test_storage_monitor.h b/components/storage_monitor/test_storage_monitor.h
index 9b37304..202156d 100644
--- a/components/storage_monitor/test_storage_monitor.h
+++ b/components/storage_monitor/test_storage_monitor.h
@@ -16,7 +16,7 @@ class TestStorageMonitor : public StorageMonitor {
   TestStorageMonitor();
   virtual ~TestStorageMonitor();
 
-  virtual void Init() OVERRIDE;
+  virtual void Init() override;
 
   void MarkInitialized();
 
@@ -36,26 +36,26 @@ class TestStorageMonitor : public StorageMonitor {
 
   virtual bool GetStorageInfoForPath(
       const base::FilePath& path,
-      StorageInfo* device_info) const OVERRIDE;
+      StorageInfo* device_info) const override;
 
 #if defined(OS_WIN)
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       base::string16* device_location,
-      base::string16* storage_object_id) const OVERRIDE;
+      base::string16* storage_object_id) const override;
 #endif
 
 #if defined(OS_LINUX)
   virtual device::MediaTransferProtocolManager*
-      media_transfer_protocol_manager() OVERRIDE;
+      media_transfer_protocol_manager() override;
 #endif
 
-  virtual Receiver* receiver() const OVERRIDE;
+  virtual Receiver* receiver() const override;
 
   virtual void EjectDevice(
       const std::string& device_id,
       base::Callback<void(StorageMonitor::EjectStatus)> callback)
-      OVERRIDE;
+      override;
 
   const std::string& ejected_device() const { return ejected_device_; }
 
diff --git a/components/storage_monitor/test_storage_monitor_win.h b/components/storage_monitor/test_storage_monitor_win.h
index 1280a7a..60660ae 100644
--- a/components/storage_monitor/test_storage_monitor_win.h
+++ b/components/storage_monitor/test_storage_monitor_win.h
@@ -30,7 +30,7 @@ class TestStorageMonitorWin: public StorageMonitorWin {
 
   VolumeMountWatcherWin* volume_mount_watcher();
 
-  virtual Receiver* receiver() const OVERRIDE;
+  virtual Receiver* receiver() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestStorageMonitorWin);
diff --git a/components/storage_monitor/test_volume_mount_watcher_win.h b/components/storage_monitor/test_volume_mount_watcher_win.h
index 280a034..ed6df11 100644
--- a/components/storage_monitor/test_volume_mount_watcher_win.h
+++ b/components/storage_monitor/test_volume_mount_watcher_win.h
@@ -50,9 +50,9 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
 
   // VolumeMountWatcherWin:
   virtual GetAttachedDevicesCallbackType
-      GetAttachedDevicesCallback() const OVERRIDE;
+      GetAttachedDevicesCallback() const override;
   virtual GetDeviceDetailsCallbackType
-      GetDeviceDetailsCallback() const OVERRIDE;
+      GetDeviceDetailsCallback() const override;
 
   // Should be used by unit tests to make sure the worker pool doesn't survive
   // into other test runs.
diff --git a/components/suggestions/blacklist_store_unittest.cc b/components/suggestions/blacklist_store_unittest.cc
index 63d0611..16daaff 100644
--- a/components/suggestions/blacklist_store_unittest.cc
+++ b/components/suggestions/blacklist_store_unittest.cc
@@ -55,7 +55,7 @@ class BlacklistStoreTest : public testing::Test {
   BlacklistStoreTest()
     : pref_service_(new user_prefs::TestingPrefServiceSyncable) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BlacklistStore::RegisterProfilePrefs(pref_service()->registry());
   }
 
diff --git a/components/suggestions/image_manager.h b/components/suggestions/image_manager.h
index e538a6b..02ec268 100644
--- a/components/suggestions/image_manager.h
+++ b/components/suggestions/image_manager.h
@@ -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;
+  virtual void OnImageFetched(const GURL& url, const SkBitmap* bitmap) override;
 
  private:
   friend class MockImageManager;
diff --git a/components/suggestions/image_manager_unittest.cc b/components/suggestions/image_manager_unittest.cc
index b6182d8..57dd8bf 100644
--- a/components/suggestions/image_manager_unittest.cc
+++ b/components/suggestions/image_manager_unittest.cc
@@ -53,12 +53,12 @@ class ImageManagerTest : public testing::Test {
         num_callback_null_called_(0),
         num_callback_valid_called_(0) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     fake_db_ = new FakeDB<ImageData>(&db_model_);
     image_manager_.reset(CreateImageManager(fake_db_));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     fake_db_ = NULL;
     db_model_.clear();
     image_manager_.reset();
diff --git a/components/suggestions/suggestions_service.h b/components/suggestions/suggestions_service.h
index aa30ba2..ea385e1 100644
--- a/components/suggestions/suggestions_service.h
+++ b/components/suggestions/suggestions_service.h
@@ -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;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // Load the cached suggestions and service the requestors with them.
   void ServeFromCache();
diff --git a/components/suggestions/suggestions_service_unittest.cc b/components/suggestions/suggestions_service_unittest.cc
index ae9aa91..7c68373 100644
--- a/components/suggestions/suggestions_service_unittest.cc
+++ b/components/suggestions/suggestions_service_unittest.cc
@@ -165,7 +165,7 @@ class SuggestionsServiceTest : public testing::Test {
 
   virtual ~SuggestionsServiceTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     request_context_ = new net::TestURLRequestContextGetter(
         io_message_loop_.message_loop_proxy());
   }
diff --git a/components/suggestions/suggestions_store_unittest.cc b/components/suggestions/suggestions_store_unittest.cc
index 1b7ebfc..d66f466 100644
--- a/components/suggestions/suggestions_store_unittest.cc
+++ b/components/suggestions/suggestions_store_unittest.cc
@@ -74,7 +74,7 @@ class SuggestionsStoreTest : public testing::Test {
   SuggestionsStoreTest()
     : pref_service_(new user_prefs::TestingPrefServiceSyncable) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     SuggestionsStore::RegisterProfilePrefs(pref_service_->registry());
     suggestions_store_.reset(new SuggestionsStore(pref_service_.get()));
   }
diff --git a/components/sync_driver/data_type_controller.h b/components/sync_driver/data_type_controller.h
index a673b1f..629919d 100644
--- a/components/sync_driver/data_type_controller.h
+++ b/components/sync_driver/data_type_controller.h
@@ -131,7 +131,7 @@ class DataTypeController
   virtual syncer::SyncError CreateAndUploadError(
       const tracked_objects::Location& location,
       const std::string& message,
-      syncer::ModelType type) OVERRIDE;
+      syncer::ModelType type) override;
 
   // Called when the sync backend has initialized. |share| is the
   // UserShare handle to associate model data with.
diff --git a/components/sync_driver/data_type_manager_impl.h b/components/sync_driver/data_type_manager_impl.h
index 7d0b101..5856a18 100644
--- a/components/sync_driver/data_type_manager_impl.h
+++ b/components/sync_driver/data_type_manager_impl.h
@@ -50,27 +50,27 @@ class DataTypeManagerImpl : public DataTypeManager,
 
   // DataTypeManager interface.
   virtual void Configure(syncer::ModelTypeSet desired_types,
-                         syncer::ConfigureReason reason) OVERRIDE;
-  virtual void ReenableType(syncer::ModelType type) OVERRIDE;
-  virtual void ResetDataTypeErrors() OVERRIDE;
+                         syncer::ConfigureReason reason) override;
+  virtual void ReenableType(syncer::ModelType type) override;
+  virtual void ResetDataTypeErrors() override;
 
   // Needed only for backend migration.
   virtual void PurgeForMigration(
       syncer::ModelTypeSet undesired_types,
-      syncer::ConfigureReason reason) OVERRIDE;
+      syncer::ConfigureReason reason) override;
 
-  virtual void Stop() OVERRIDE;
-  virtual State state() const OVERRIDE;
+  virtual void Stop() override;
+  virtual State state() const override;
 
   // |ModelAssociationManagerDelegate| implementation.
   virtual void OnSingleDataTypeAssociationDone(
       syncer::ModelType type,
-      const syncer::DataTypeAssociationStats& association_stats) OVERRIDE;
+      const syncer::DataTypeAssociationStats& association_stats) override;
   virtual void OnModelAssociationDone(
-      const DataTypeManager::ConfigureResult& result) OVERRIDE;
+      const DataTypeManager::ConfigureResult& result) override;
   virtual void OnSingleDataTypeWillStop(
       syncer::ModelType type,
-      const syncer::SyncError& error) OVERRIDE;
+      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 187c13c..5fad570 100644
--- a/components/sync_driver/data_type_manager_impl_unittest.cc
+++ b/components/sync_driver/data_type_manager_impl_unittest.cc
@@ -87,7 +87,7 @@ class FakeBackendDataTypeConfigurer : public BackendDataTypeConfigurer {
       const DataTypeConfigStateMap& config_state_map,
       const base::Callback<void(ModelTypeSet,
                                 ModelTypeSet)>& ready_task,
-      const base::Callback<void()>& retry_callback) OVERRIDE {
+      const base::Callback<void()>& retry_callback) override {
     last_ready_task_ = ready_task;
 
     if (!expected_configure_types_.Empty()) {
@@ -103,10 +103,10 @@ class FakeBackendDataTypeConfigurer : public BackendDataTypeConfigurer {
 
   virtual void ActivateDataType(
       syncer::ModelType type, syncer::ModelSafeGroup group,
-      ChangeProcessor* change_processor) OVERRIDE {
+      ChangeProcessor* change_processor) override {
     activated_types_.Put(type);
   }
-  virtual void DeactivateDataType(syncer::ModelType type) OVERRIDE {
+  virtual void DeactivateDataType(syncer::ModelType type) override {
     activated_types_.Remove(type);
   }
 
@@ -150,7 +150,7 @@ class FakeDataTypeManagerObserver : public DataTypeManagerObserver {
   }
 
   virtual void OnConfigureDone(
-      const DataTypeManager::ConfigureResult& result) OVERRIDE {
+      const DataTypeManager::ConfigureResult& result) override {
     EXPECT_EQ(done_expectation_.status, result.status);
     DataTypeStatusTable::TypeErrorMap errors =
         result.data_type_status_table.GetAllErrors();
@@ -168,7 +168,7 @@ class FakeDataTypeManagerObserver : public DataTypeManagerObserver {
     done_expectation_ = DataTypeManager::ConfigureResult();
   }
 
-  virtual void OnConfigureStart() OVERRIDE {
+  virtual void OnConfigureStart() override {
     EXPECT_TRUE(start_expected_);
     start_expected_ = false;
   }
@@ -183,8 +183,8 @@ class FakeDataTypeEncryptionHandler : public DataTypeEncryptionHandler {
   FakeDataTypeEncryptionHandler();
   virtual ~FakeDataTypeEncryptionHandler();
 
-  virtual bool IsPassphraseRequired() const OVERRIDE;
-  virtual ModelTypeSet GetEncryptedDataTypes() const OVERRIDE;
+  virtual bool IsPassphraseRequired() const override;
+  virtual ModelTypeSet GetEncryptedDataTypes() const override;
 
   void set_passphrase_required(bool passphrase_required) {
     passphrase_required_ = passphrase_required;
@@ -238,13 +238,13 @@ class TestDataTypeManager : public DataTypeManagerImpl {
   }
 
   virtual void OnModelAssociationDone(
-      const DataTypeManager::ConfigureResult& result) OVERRIDE {
+      const DataTypeManager::ConfigureResult& result) override {
     configure_result_ = result;
     DataTypeManagerImpl::OnModelAssociationDone(result);
   }
 
  private:
-  virtual ModelTypeSet GetPriorityTypes() const OVERRIDE {
+  virtual 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 aa1b067..da3d480 100644
--- a/components/sync_driver/device_info_data_type_controller.h
+++ b/components/sync_driver/device_info_data_type_controller.h
@@ -24,7 +24,7 @@ class DeviceInfoDataTypeController : public UIDataTypeController {
   virtual ~DeviceInfoDataTypeController();
 
   // UIDataTypeController implementations.
-  virtual bool StartModels() OVERRIDE;
+  virtual 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 a025913..7161929 100644
--- a/components/sync_driver/device_info_data_type_controller_unittest.cc
+++ b/components/sync_driver/device_info_data_type_controller_unittest.cc
@@ -25,7 +25,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
         last_type_(syncer::UNSPECIFIED) {}
   virtual ~DeviceInfoDataTypeControllerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     local_device_.reset(new LocalDeviceInfoProviderMock(
         "cache_guid",
         "Wayne Gretzky's Hacking Box",
@@ -45,7 +45,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
     last_error_ = syncer::SyncError();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_ = NULL;
     local_device_.reset();
   }
@@ -57,7 +57,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
   }
 
   virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
-      syncer::ModelType type) OVERRIDE {
+      syncer::ModelType type) override {
     // Shouldn't be called for this test.
     NOTREACHED();
     return base::WeakPtr<syncer::SyncableService>();
@@ -66,7 +66,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
   virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
-      syncer::AttachmentService::Delegate* delegate) OVERRIDE {
+      syncer::AttachmentService::Delegate* delegate) override {
     // Shouldn't be called for this test.
     NOTREACHED();
     return scoped_ptr<syncer::AttachmentService>();
diff --git a/components/sync_driver/device_info_sync_service.h b/components/sync_driver/device_info_sync_service.h
index 26eb9a0..eb636be 100644
--- a/components/sync_driver/device_info_sync_service.h
+++ b/components/sync_driver/device_info_sync_service.h
@@ -29,20 +29,20 @@ class DeviceInfoSyncService : public syncer::SyncableService,
       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;
+      scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
+  virtual void StopSyncing(syncer::ModelType type) override;
   virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE;
+      syncer::ModelType type) const override;
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
 
   // DeviceInfoTracker implementation.
   virtual 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;
+      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;
 
   // 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 f0a6906..1dbe6a8 100644
--- a/components/sync_driver/device_info_sync_service_unittest.cc
+++ b/components/sync_driver/device_info_sync_service_unittest.cc
@@ -40,13 +40,13 @@ class TestChangeProcessor : public SyncChangeProcessor {
   // 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 {
+      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 {
+  virtual SyncDataList GetAllSyncData(ModelType type) const override {
     return SyncDataList();
   }
 
@@ -80,7 +80,7 @@ class DeviceInfoSyncServiceTest : public testing::Test,
   DeviceInfoSyncServiceTest() : num_device_info_changed_callbacks_(0) {}
   virtual ~DeviceInfoSyncServiceTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     local_device_.reset(new LocalDeviceInfoProviderMock(
         "guid_1",
         "client_1",
@@ -94,11 +94,11 @@ class DeviceInfoSyncServiceTest : public testing::Test,
     sync_service_->AddObserver(this);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     sync_service_->RemoveObserver(this);
   }
 
-  virtual void OnDeviceInfoChange() OVERRIDE {
+  virtual void OnDeviceInfoChange() override {
     num_device_info_changed_callbacks_++;
   }
 
diff --git a/components/sync_driver/fake_data_type_controller.h b/components/sync_driver/fake_data_type_controller.h
index a84bc27..1716efa 100644
--- a/components/sync_driver/fake_data_type_controller.h
+++ b/components/sync_driver/fake_data_type_controller.h
@@ -24,18 +24,18 @@ class FakeDataTypeController : public DataTypeController {
   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;
+      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(
-      const syncer::SyncError& error) OVERRIDE;
-  virtual bool ReadyForStart() const OVERRIDE;
+      const syncer::SyncError& error) override;
+  virtual bool ReadyForStart() const override;
 
   void FinishStart(ConfigureResult result);
 
diff --git a/components/sync_driver/fake_generic_change_processor.h b/components/sync_driver/fake_generic_change_processor.h
index faae4bc..a16c9e4 100644
--- a/components/sync_driver/fake_generic_change_processor.h
+++ b/components/sync_driver/fake_generic_change_processor.h
@@ -28,13 +28,13 @@ class FakeGenericChangeProcessor : public GenericChangeProcessor {
   // GenericChangeProcessor implementations.
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
   virtual 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;
+      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;
 
  private:
   bool sync_model_has_user_created_nodes_;
@@ -53,7 +53,7 @@ class FakeGenericChangeProcessorFactory : public GenericChangeProcessorFactory {
       DataTypeErrorHandler* error_handler,
       const base::WeakPtr<syncer::SyncableService>& local_service,
       const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
-      SyncApiComponentFactory* sync_factory) OVERRIDE;
+      SyncApiComponentFactory* sync_factory) override;
 
  private:
   scoped_ptr<FakeGenericChangeProcessor> processor_;
diff --git a/components/sync_driver/generic_change_processor.h b/components/sync_driver/generic_change_processor.h
index c370c3f..e3c1fc7 100644
--- a/components/sync_driver/generic_change_processor.h
+++ b/components/sync_driver/generic_change_processor.h
@@ -62,25 +62,25 @@ class GenericChangeProcessor : public ChangeProcessor,
   virtual void ApplyChangesFromSyncModel(
       const syncer::BaseTransaction* trans,
       int64 version,
-      const syncer::ImmutableChangeRecordList& changes) OVERRIDE;
+      const syncer::ImmutableChangeRecordList& changes) override;
   // Passes |syncer_changes_|, built in ApplyChangesFromSyncModel, onto
   // |local_service_| by way of its ProcessSyncChanges method.
-  virtual void CommitChangesFromSyncModel() OVERRIDE;
+  virtual void CommitChangesFromSyncModel() override;
 
   // syncer::SyncChangeProcessor implementation.
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
   virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type)
-      const OVERRIDE;
+      const override;
   virtual syncer::SyncError UpdateDataTypeContext(
       syncer::ModelType type,
       syncer::SyncChangeProcessor::ContextRefreshStatus refresh_status,
-      const std::string& context) OVERRIDE;
+      const std::string& context) override;
 
   // syncer::AttachmentService::Delegate implementation.
   virtual void OnAttachmentUploaded(
-      const syncer::AttachmentId& attachment_id) OVERRIDE;
+      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 +102,8 @@ class GenericChangeProcessor : public ChangeProcessor,
 
  protected:
   // ChangeProcessor interface.
-  virtual void StartImpl() OVERRIDE;  // Does nothing.
-  virtual syncer::UserShare* share_handle() const OVERRIDE;
+  virtual void StartImpl() override;  // Does nothing.
+  virtual 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 e84cf5e..96088aa 100644
--- a/components/sync_driver/generic_change_processor_unittest.cc
+++ b/components/sync_driver/generic_change_processor_unittest.cc
@@ -41,7 +41,7 @@ class MockAttachmentService : public syncer::AttachmentServiceImpl {
       const scoped_refptr<syncer::AttachmentStore>& attachment_store);
   virtual ~MockAttachmentService();
   virtual void UploadAttachments(
-      const syncer::AttachmentIdSet& attachment_ids) OVERRIDE;
+      const syncer::AttachmentIdSet& attachment_ids) override;
   std::vector<syncer::AttachmentIdSet>* attachment_id_sets();
 
  private:
@@ -83,7 +83,7 @@ class MockSyncApiComponentFactory : public SyncApiComponentFactory {
       : attachment_service_(attachment_service.Pass()) {}
 
   virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
-      syncer::ModelType type) OVERRIDE {
+      syncer::ModelType type) override {
     // Shouldn't be called for this test.
     NOTREACHED();
     return base::WeakPtr<syncer::SyncableService>();
@@ -92,7 +92,7 @@ class MockSyncApiComponentFactory : public SyncApiComponentFactory {
   virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
-      syncer::AttachmentService::Delegate* delegate) OVERRIDE {
+      syncer::AttachmentService::Delegate* delegate) override {
     EXPECT_TRUE(attachment_service_ != NULL);
     return attachment_service_.Pass();
   }
@@ -111,14 +111,14 @@ class SyncGenericChangeProcessorTest : public testing::Test {
       : syncable_service_ptr_factory_(&fake_syncable_service_),
         mock_attachment_service_(NULL) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Use kType by default, but allow test cases to re-initialize with whatever
     // type they choose.  Therefore, it's important that all type dependent
     // initialization occurs in InitializeForType.
     InitializeForType(kType);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     mock_attachment_service_ = NULL;
     if (test_user_share_) {
       test_user_share_->TearDown();
diff --git a/components/sync_driver/local_device_info_provider_mock.h b/components/sync_driver/local_device_info_provider_mock.h
index 5218c6b..f8d0605 100644
--- a/components/sync_driver/local_device_info_provider_mock.h
+++ b/components/sync_driver/local_device_info_provider_mock.h
@@ -25,13 +25,13 @@ class LocalDeviceInfoProviderMock
       const std::string& signin_scoped_device_id);
   virtual ~LocalDeviceInfoProviderMock();
 
-  virtual const DeviceInfo* GetLocalDeviceInfo() const OVERRIDE;
-  virtual std::string GetLocalSyncCacheGUID() const OVERRIDE;
+  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;
+      const std::string& signin_scoped_device_id) override;
   virtual scoped_ptr<Subscription> RegisterOnInitializedCallback(
-    const base::Closure& callback) OVERRIDE;
+    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 10987bd..2608d08 100644
--- a/components/sync_driver/non_blocking_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
@@ -30,7 +30,7 @@ class NullModelTypeSyncWorker : public syncer::ModelTypeSyncWorker {
   virtual ~NullModelTypeSyncWorker();
 
   virtual void EnqueueForCommit(
-      const syncer::CommitRequestDataList& list) OVERRIDE;
+      const syncer::CommitRequestDataList& list) override;
 };
 
 NullModelTypeSyncWorker::NullModelTypeSyncWorker() {
@@ -87,7 +87,7 @@ class MockSyncContextProxy : public syncer::SyncContextProxy {
       const syncer::DataTypeState& data_type_state,
       const syncer::UpdateResponseDataList& saved_pending_updates,
       const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_proxy)
-      OVERRIDE {
+      override {
     // Normally we'd use MessageLoopProxy::current() as the TaskRunner argument
     // to Connect().  That won't work here in this test, so we use the
     // model_task_runner_ that was injected for this purpose instead.
@@ -99,14 +99,14 @@ class MockSyncContextProxy : public syncer::SyncContextProxy {
                                            type_proxy));
   }
 
-  virtual void Disconnect(syncer::ModelType type) OVERRIDE {
+  virtual 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 {
+  virtual 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 0f4fdab..d003e6e 100644
--- a/components/sync_driver/non_ui_data_type_controller.h
+++ b/components/sync_driver/non_ui_data_type_controller.h
@@ -31,16 +31,16 @@ class NonUIDataTypeController : public DataTypeController {
 
   // DataTypeController interface.
   virtual void LoadModels(
-      const ModelLoadCallback& model_load_callback) OVERRIDE;
-  virtual void StartAssociating(const StartCallback& start_callback) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+      const ModelLoadCallback& model_load_callback) override;
+  virtual void StartAssociating(const StartCallback& start_callback) override;
+  virtual 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 ChangeProcessor* GetChangeProcessor() const override;
+  virtual std::string name() const override;
+  virtual State state() const override;
   virtual void OnSingleDataTypeUnrecoverableError(
-      const syncer::SyncError& error) OVERRIDE;
+      const syncer::SyncError& error) override;
 
  protected:
   // For testing only.
@@ -49,7 +49,7 @@ class NonUIDataTypeController : public DataTypeController {
   virtual ~NonUIDataTypeController();
 
   // DataTypeController interface.
-  virtual void OnModelLoaded() OVERRIDE;
+  virtual 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 d8b84dc..e8bef60 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,10 @@ class NonUIDataTypeControllerFake
         change_processor_(change_processor),
         backend_loop_(backend_loop) {}
 
-  virtual syncer::ModelType type() const OVERRIDE {
+  virtual syncer::ModelType type() const override {
     return AUTOFILL_PROFILE;
   }
-  virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE {
+  virtual syncer::ModelSafeGroup model_safe_group() const override {
     return syncer::GROUP_DB;
   }
 
@@ -130,14 +130,14 @@ class NonUIDataTypeControllerFake
     pending_tasks_.clear();
   }
 
-  virtual SharedChangeProcessor* CreateSharedChangeProcessor() OVERRIDE {
+  virtual SharedChangeProcessor* CreateSharedChangeProcessor() override {
     return change_processor_.get();
   }
 
  protected:
   virtual bool PostTaskOnBackendThread(
       const tracked_objects::Location& from_here,
-      const base::Closure& task) OVERRIDE {
+      const base::Closure& task) override {
     if (blocked_) {
       pending_tasks_.push_back(PendingTask(from_here, task));
       return true;
@@ -148,17 +148,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 {
+  virtual bool StartModels() override {
     return mock_->StartModels();
   }
-  virtual void StopModels() OVERRIDE {
+  virtual void StopModels() override {
     mock_->StopModels();
   }
-  virtual void RecordAssociationTime(base::TimeDelta time) OVERRIDE {
+  virtual void RecordAssociationTime(base::TimeDelta time) override {
     mock_->RecordAssociationTime(time);
   }
   virtual void RecordStartFailure(DataTypeController::ConfigureResult result)
-      OVERRIDE {
+      override {
     mock_->RecordStartFailure(result);
   }
 
@@ -188,7 +188,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
   SyncNonUIDataTypeControllerTest()
       : backend_thread_("dbthread") {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     backend_thread_.Start();
     change_processor_ = new SharedChangeProcessorMock();
     // All of these are refcounted, so don't need to be released.
@@ -200,7 +200,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
                                         backend_thread_.message_loop_proxy());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     backend_thread_.Stop();
   }
 
diff --git a/components/sync_driver/proxy_data_type_controller.h b/components/sync_driver/proxy_data_type_controller.h
index 6e255c6..acfc002 100644
--- a/components/sync_driver/proxy_data_type_controller.h
+++ b/components/sync_driver/proxy_data_type_controller.h
@@ -22,25 +22,25 @@ class ProxyDataTypeController : public DataTypeController {
 
   // 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;
+      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;
 
   // DataTypeErrorHandler interface.
   virtual void OnSingleDataTypeUnrecoverableError(
-      const syncer::SyncError& error) OVERRIDE;
+      const syncer::SyncError& error) override;
 
  protected:
   // DataTypeController is RefCounted.
   virtual ~ProxyDataTypeController();
 
   // DataTypeController interface.
-  virtual void OnModelLoaded() OVERRIDE;
+  virtual 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 e5dec81..ba1eae1 100644
--- a/components/sync_driver/shared_change_processor_ref.h
+++ b/components/sync_driver/shared_change_processor_ref.h
@@ -26,18 +26,18 @@ class SharedChangeProcessorRef : public syncer::SyncChangeProcessor,
   // syncer::SyncChangeProcessor implementation.
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
   virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE;
+      syncer::ModelType type) const override;
   virtual syncer::SyncError UpdateDataTypeContext(
       syncer::ModelType type,
       syncer::SyncChangeProcessor::ContextRefreshStatus refresh_status,
-      const std::string& context) OVERRIDE;
+      const std::string& context) override;
 
   // syncer::SyncErrorFactory implementation.
   virtual syncer::SyncError CreateAndUploadError(
       const tracked_objects::Location& from_here,
-      const std::string& message) OVERRIDE;
+      const std::string& message) override;
 
   // Default copy and assign welcome (and safe due to refcounted-ness).
 
diff --git a/components/sync_driver/shared_change_processor_unittest.cc b/components/sync_driver/shared_change_processor_unittest.cc
index 76c226a..b4216cd 100644
--- a/components/sync_driver/shared_change_processor_unittest.cc
+++ b/components/sync_driver/shared_change_processor_unittest.cc
@@ -39,19 +39,19 @@ class SyncSharedChangeProcessorTest :
   }
 
   virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
-      syncer::ModelType type) OVERRIDE {
+      syncer::ModelType type) override {
     return db_syncable_service_->AsWeakPtr();
   }
 
   virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
-      syncer::AttachmentService::Delegate* delegate) OVERRIDE {
+      syncer::AttachmentService::Delegate* delegate) override {
     return syncer::AttachmentServiceImpl::CreateForTest();
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     shared_change_processor_ = new SharedChangeProcessor();
     ASSERT_TRUE(backend_thread_.Start());
     ASSERT_TRUE(backend_thread_.message_loop_proxy()->PostTask(
@@ -60,7 +60,7 @@ class SyncSharedChangeProcessorTest :
                    base::Unretained(this))));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     EXPECT_TRUE(backend_thread_.message_loop_proxy()->PostTask(
         FROM_HERE,
         base::Bind(&SyncSharedChangeProcessorTest::TearDownDBSyncableService,
diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync_driver/sync_prefs_unittest.cc
index 683d55a..ffd5f1c 100644
--- a/components/sync_driver/sync_prefs_unittest.cc
+++ b/components/sync_driver/sync_prefs_unittest.cc
@@ -25,7 +25,7 @@ using ::testing::StrictMock;
 
 class SyncPrefsTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
   }
 
diff --git a/components/sync_driver/system_encryptor.h b/components/sync_driver/system_encryptor.h
index 1b5c30f..bdb7fea 100644
--- a/components/sync_driver/system_encryptor.h
+++ b/components/sync_driver/system_encryptor.h
@@ -16,10 +16,10 @@ class SystemEncryptor : public syncer::Encryptor {
   virtual ~SystemEncryptor();
 
   virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) OVERRIDE;
+                             std::string* ciphertext) override;
 
   virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) OVERRIDE;
+                             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 3028991..dc45de9 100644
--- a/components/sync_driver/ui_data_type_controller.h
+++ b/components/sync_driver/ui_data_type_controller.h
@@ -39,18 +39,18 @@ class UIDataTypeController : public DataTypeController {
 
   // 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;
+      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;
 
   // DataTypeErrorHandler interface.
   virtual void OnSingleDataTypeUnrecoverableError(
-      const syncer::SyncError& error) OVERRIDE;
+      const syncer::SyncError& error) override;
 
   // Used by tests to override the factory used to create
   // GenericChangeProcessors.
@@ -76,7 +76,7 @@ class UIDataTypeController : public DataTypeController {
   virtual void StopModels();
 
   // DataTypeController interface.
-  virtual void OnModelLoaded() OVERRIDE;
+  virtual 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 abf2884..66db4af 100644
--- a/components/sync_driver/ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/ui_data_type_controller_unittest.cc
@@ -51,14 +51,14 @@ class SyncUIDataTypeControllerTest : public testing::Test,
   }
 
   virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
-      syncer::ModelType type) OVERRIDE {
+      syncer::ModelType type) override {
     return syncable_service_.AsWeakPtr();
   }
 
   virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
       const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
-      syncer::AttachmentService::Delegate* delegate) OVERRIDE {
+      syncer::AttachmentService::Delegate* delegate) override {
     return syncer::AttachmentServiceImpl::CreateForTest();
   }
 
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index b31397b..26a15af 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 {
+  virtual 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 {
+  virtual void Shutdown() override {
     ui::ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
@@ -118,11 +118,11 @@ class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener {
   ComponentsUnitTestEventListener() {}
   virtual ~ComponentsUnitTestEventListener() {}
 
-  virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestStart(const testing::TestInfo& test_info) override {
     content_initializer_.reset(new content::TestContentClientInitializer());
   }
 
-  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestEnd(const testing::TestInfo& test_info) override {
     content_initializer_.reset();
   }
 
diff --git a/components/tracing/child_trace_message_filter.h b/components/tracing/child_trace_message_filter.h
index 596e738..2f79d0e 100644
--- a/components/tracing/child_trace_message_filter.h
+++ b/components/tracing/child_trace_message_filter.h
@@ -21,9 +21,9 @@ 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;
+  virtual void OnFilterAdded(IPC::Sender* sender) override;
+  virtual void OnFilterRemoved() override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
   virtual ~ChildTraceMessageFilter();
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index ea77e42..3bed413 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h
@@ -71,29 +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 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;
+                             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;
 
   // content::WebContentsObserver implementation.
   virtual void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& load_details) OVERRIDE;
+      const content::LoadCommittedDetails& load_details) override;
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC handlers.
   void OnTranslateAssignedSequenceNumber(int page_seq_no);
diff --git a/components/translate/content/browser/data_file_browser_cld_data_provider.h b/components/translate/content/browser/data_file_browser_cld_data_provider.h
index 2bfca1d..7b4f17e 100644
--- a/components/translate/content/browser/data_file_browser_cld_data_provider.h
+++ b/components/translate/content/browser/data_file_browser_cld_data_provider.h
@@ -19,9 +19,9 @@ class DataFileBrowserCldDataProvider : public BrowserCldDataProvider {
   explicit DataFileBrowserCldDataProvider(content::WebContents*);
   virtual ~DataFileBrowserCldDataProvider();
   // BrowserCldDataProvider implementations:
-  virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE;
-  virtual void OnCldDataRequest() OVERRIDE;
-  virtual void SendCldDataResponse() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message&) override;
+  virtual void OnCldDataRequest() override;
+  virtual void SendCldDataResponse() override;
 
  private:
   void SendCldDataResponseInternal(const base::File*,
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 fe2ab0e..eb883308 100644
--- a/components/translate/content/browser/static_browser_cld_data_provider.h
+++ b/components/translate/content/browser/static_browser_cld_data_provider.h
@@ -15,9 +15,9 @@ class StaticBrowserCldDataProvider : public BrowserCldDataProvider {
   explicit StaticBrowserCldDataProvider();
   virtual ~StaticBrowserCldDataProvider();
   // BrowserCldDataProvider implementations:
-  virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE;
-  virtual void OnCldDataRequest() OVERRIDE;
-  virtual void SendCldDataResponse() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message&) override;
+  virtual void OnCldDataRequest() override;
+  virtual void SendCldDataResponse() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StaticBrowserCldDataProvider);
diff --git a/components/translate/content/renderer/data_file_renderer_cld_data_provider.h b/components/translate/content/renderer/data_file_renderer_cld_data_provider.h
index 5c470b3..87c1551 100644
--- a/components/translate/content/renderer/data_file_renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/data_file_renderer_cld_data_provider.h
@@ -17,10 +17,10 @@ class DataFileRendererCldDataProvider : public RendererCldDataProvider {
   explicit DataFileRendererCldDataProvider(content::RenderViewObserver*);
   virtual ~DataFileRendererCldDataProvider();
   // 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;
+  virtual bool OnMessageReceived(const IPC::Message&) override;
+  virtual void SendCldDataRequest() override;
+  virtual void SetCldAvailableCallback(base::Callback<void(void)>) override;
+  virtual bool IsCldDataAvailable() override;
 
  private:
   void OnCldDataAvailable(const IPC::PlatformFileForTransit ipc_file_handle,
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 fcd212b..77b8c5a 100644
--- a/components/translate/content/renderer/static_renderer_cld_data_provider.h
+++ b/components/translate/content/renderer/static_renderer_cld_data_provider.h
@@ -20,10 +20,10 @@ class StaticRendererCldDataProvider : public RendererCldDataProvider {
   explicit StaticRendererCldDataProvider();
   virtual ~StaticRendererCldDataProvider();
   // 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;
+  virtual bool OnMessageReceived(const IPC::Message&) override;
+  virtual void SendCldDataRequest() override;
+  virtual void SetCldAvailableCallback(base::Callback<void(void)>) override;
+  virtual 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 cde0efb..6e12c69 100644
--- a/components/translate/content/renderer/translate_helper.h
+++ b/components/translate/content/renderer/translate_helper.h
@@ -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;
+  virtual 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 ae7be32..3137369 100644
--- a/components/translate/core/browser/language_state_unittest.cc
+++ b/components/translate/core/browser/language_state_unittest.cc
@@ -31,42 +31,42 @@ class MockTranslateDriver : public TranslateDriver {
 
   virtual ~MockTranslateDriver() {}
 
-  virtual void OnIsPageTranslatedChanged() OVERRIDE {
+  virtual void OnIsPageTranslatedChanged() override {
     on_is_page_translated_changed_called_ = true;
   }
 
-  virtual void OnTranslateEnabledChanged() OVERRIDE {
+  virtual void OnTranslateEnabledChanged() override {
     on_translate_enabled_changed_called_ = true;
   }
 
-  virtual bool IsLinkNavigation() OVERRIDE {
+  virtual 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 {}
+                             const std::string& target_lang) override {}
 
-  virtual void RevertTranslation(int page_seq_no) OVERRIDE {}
+  virtual void RevertTranslation(int page_seq_no) override {}
 
-  virtual bool IsOffTheRecord() OVERRIDE { return false; }
+  virtual bool IsOffTheRecord() override { return false; }
 
-  virtual const std::string& GetContentsMimeType() OVERRIDE {
+  virtual const std::string& GetContentsMimeType() override {
     return kHtmlMimeType;
   }
 
-  virtual const GURL& GetLastCommittedURL() OVERRIDE {
+  virtual const GURL& GetLastCommittedURL() override {
     return GURL::EmptyGURL();
   }
 
-  virtual const GURL& GetActiveURL() OVERRIDE { return GURL::EmptyGURL(); }
+  virtual const GURL& GetActiveURL() override { return GURL::EmptyGURL(); }
 
-  virtual const GURL& GetVisibleURL() OVERRIDE { return GURL::EmptyGURL(); }
+  virtual const GURL& GetVisibleURL() override { return GURL::EmptyGURL(); }
 
-  virtual bool HasCurrentPage() OVERRIDE { return true; }
+  virtual bool HasCurrentPage() override { return true; }
 
-  virtual void OpenUrlInNewTab(const GURL& url) OVERRIDE {}
+  virtual 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 d5da23e..e502c11f 100644
--- a/components/translate/core/browser/options_menu_model.h
+++ b/components/translate/core/browser/options_menu_model.h
@@ -29,12 +29,12 @@ class OptionsMenuModel : public ui::SimpleMenuModel,
   virtual ~OptionsMenuModel();
 
   // ui::SimpleMenuModel::Delegate implementation:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  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;
+      ui::Accelerator* accelerator) override;
+  virtual 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 ab1bcc9..28365cb 100644
--- a/components/translate/core/browser/translate_infobar_delegate.h
+++ b/components/translate/core/browser/translate_infobar_delegate.h
@@ -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;
+  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;
 
   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 210983f..1f76bc8 100644
--- a/components/translate/core/browser/translate_url_fetcher.h
+++ b/components/translate/core/browser/translate_url_fetcher.h
@@ -54,7 +54,7 @@ class TranslateURLFetcher : public net::URLFetcherDelegate {
   State state() { return state_; }
 
   // net::URLFetcherDelegate implementation:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // URL to send the request.
diff --git a/components/user_manager/empty_user_info.h b/components/user_manager/empty_user_info.h
index 4d22f45..01dcfbf 100644
--- a/components/user_manager/empty_user_info.h
+++ b/components/user_manager/empty_user_info.h
@@ -22,11 +22,11 @@ class USER_MANAGER_EXPORT EmptyUserInfo : public UserInfo {
   virtual ~EmptyUserInfo();
 
   // UserInfo:
-  virtual base::string16 GetDisplayName() const OVERRIDE;
-  virtual base::string16 GetGivenName() const OVERRIDE;
-  virtual std::string GetEmail() const OVERRIDE;
-  virtual std::string GetUserID() const OVERRIDE;
-  virtual const gfx::ImageSkia& GetImage() const OVERRIDE;
+  virtual base::string16 GetDisplayName() const override;
+  virtual base::string16 GetGivenName() const override;
+  virtual std::string GetEmail() const override;
+  virtual std::string GetUserID() const override;
+  virtual const gfx::ImageSkia& GetImage() const override;
 
  private:
   const gfx::ImageSkia null_image_;
diff --git a/components/user_manager/user.cc b/components/user_manager/user.cc
index b57d1d0..664aa4b 100644
--- a/components/user_manager/user.cc
+++ b/components/user_manager/user.cc
@@ -42,13 +42,13 @@ class RegularUser : public User {
   virtual ~RegularUser();
 
   // Overridden from User:
-  virtual UserType GetType() const OVERRIDE;
-  virtual bool CanSyncImage() const OVERRIDE;
-  virtual void SetIsSupervised(bool is_supervised) OVERRIDE {
+  virtual UserType GetType() const override;
+  virtual bool CanSyncImage() const override;
+  virtual void SetIsSupervised(bool is_supervised) override {
     VLOG(1) << "Setting user is supervised to " << is_supervised;
     is_supervised_ = is_supervised;
   }
-  virtual bool IsSupervised() const OVERRIDE {
+  virtual bool IsSupervised() const override {
     return is_supervised_;
   }
 
@@ -64,7 +64,7 @@ class GuestUser : public User {
   virtual ~GuestUser();
 
   // Overridden from User:
-  virtual UserType GetType() const OVERRIDE;
+  virtual UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GuestUser);
@@ -76,7 +76,7 @@ class KioskAppUser : public User {
   virtual ~KioskAppUser();
 
   // Overridden from User:
-  virtual UserType GetType() const OVERRIDE;
+  virtual UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KioskAppUser);
@@ -88,9 +88,9 @@ class SupervisedUser : public User {
   virtual ~SupervisedUser();
 
   // Overridden from User:
-  virtual UserType GetType() const OVERRIDE;
-  virtual bool IsSupervised() const OVERRIDE;
-  virtual std::string display_email() const OVERRIDE;
+  virtual UserType GetType() const override;
+  virtual bool IsSupervised() const override;
+  virtual std::string display_email() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SupervisedUser);
@@ -102,7 +102,7 @@ class RetailModeUser : public User {
   virtual ~RetailModeUser();
 
   // Overridden from User:
-  virtual UserType GetType() const OVERRIDE;
+  virtual UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RetailModeUser);
@@ -114,7 +114,7 @@ class PublicAccountUser : public User {
   virtual ~PublicAccountUser();
 
   // Overridden from User:
-  virtual UserType GetType() const OVERRIDE;
+  virtual UserType GetType() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PublicAccountUser);
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index 0c34bf0..8759efb 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;
+  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;
 
   // Is user supervised.
   virtual bool IsSupervised() const;
diff --git a/components/user_manager/user_info_impl.h b/components/user_manager/user_info_impl.h
index f024910..ada257d 100644
--- a/components/user_manager/user_info_impl.h
+++ b/components/user_manager/user_info_impl.h
@@ -21,11 +21,11 @@ class USER_MANAGER_EXPORT UserInfoImpl : public UserInfo {
   virtual ~UserInfoImpl();
 
   // UserInfo:
-  virtual base::string16 GetDisplayName() const OVERRIDE;
-  virtual base::string16 GetGivenName() const OVERRIDE;
-  virtual std::string GetEmail() const OVERRIDE;
-  virtual std::string GetUserID() const OVERRIDE;
-  virtual const gfx::ImageSkia& GetImage() const OVERRIDE;
+  virtual base::string16 GetDisplayName() const override;
+  virtual base::string16 GetGivenName() const override;
+  virtual std::string GetEmail() const override;
+  virtual std::string GetUserID() const override;
+  virtual const gfx::ImageSkia& GetImage() const override;
 
  private:
   gfx::ImageSkia user_image_;
diff --git a/components/user_manager/user_manager_base.h b/components/user_manager/user_manager_base.h
index 9da1cee..312aeb4 100644
--- a/components/user_manager/user_manager_base.h
+++ b/components/user_manager/user_manager_base.h
@@ -43,67 +43,67 @@ class USER_MANAGER_EXPORT UserManagerBase : public UserManager {
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // UserManager implementation:
-  virtual void Shutdown() OVERRIDE;
-  virtual const UserList& GetUsers() const OVERRIDE;
-  virtual const UserList& GetLoggedInUsers() const OVERRIDE;
-  virtual const UserList& GetLRULoggedInUsers() const OVERRIDE;
-  virtual const std::string& GetOwnerEmail() const OVERRIDE;
+  virtual void Shutdown() override;
+  virtual const UserList& GetUsers() const override;
+  virtual const UserList& GetLoggedInUsers() const override;
+  virtual const UserList& GetLRULoggedInUsers() const override;
+  virtual const std::string& GetOwnerEmail() const override;
   virtual void UserLoggedIn(const std::string& user_id,
                             const std::string& user_id_hash,
-                            bool browser_restart) OVERRIDE;
-  virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
-  virtual void SwitchToLastActiveUser() OVERRIDE;
-  virtual void SessionStarted() OVERRIDE;
+                            bool browser_restart) override;
+  virtual void SwitchActiveUser(const std::string& user_id) override;
+  virtual void SwitchToLastActiveUser() override;
+  virtual void SessionStarted() override;
   virtual void RemoveUser(const std::string& user_id,
-                          RemoveUserDelegate* delegate) OVERRIDE;
-  virtual void RemoveUserFromList(const std::string& user_id) OVERRIDE;
-  virtual bool IsKnownUser(const std::string& user_id) const OVERRIDE;
-  virtual const User* FindUser(const std::string& user_id) const OVERRIDE;
-  virtual User* FindUserAndModify(const std::string& user_id) OVERRIDE;
-  virtual const User* GetLoggedInUser() const OVERRIDE;
-  virtual User* GetLoggedInUser() OVERRIDE;
-  virtual const User* GetActiveUser() const OVERRIDE;
-  virtual User* GetActiveUser() OVERRIDE;
-  virtual const User* GetPrimaryUser() const OVERRIDE;
+                          RemoveUserDelegate* delegate) override;
+  virtual void RemoveUserFromList(const std::string& user_id) override;
+  virtual bool IsKnownUser(const std::string& user_id) const override;
+  virtual const User* FindUser(const std::string& user_id) const override;
+  virtual User* FindUserAndModify(const std::string& user_id) override;
+  virtual const User* GetLoggedInUser() const override;
+  virtual User* GetLoggedInUser() override;
+  virtual const User* GetActiveUser() const override;
+  virtual User* GetActiveUser() override;
+  virtual const User* GetPrimaryUser() const override;
   virtual void SaveUserOAuthStatus(
       const std::string& user_id,
-      User::OAuthTokenStatus oauth_token_status) OVERRIDE;
+      User::OAuthTokenStatus oauth_token_status) override;
   virtual void SaveForceOnlineSignin(const std::string& user_id,
-                                     bool force_online_signin) OVERRIDE;
+                                     bool force_online_signin) override;
   virtual void SaveUserDisplayName(const std::string& user_id,
-                                   const base::string16& display_name) OVERRIDE;
+                                   const base::string16& display_name) override;
   virtual base::string16 GetUserDisplayName(
-      const std::string& user_id) const OVERRIDE;
+      const std::string& user_id) const override;
   virtual void SaveUserDisplayEmail(const std::string& user_id,
-                                    const std::string& display_email) OVERRIDE;
+                                    const std::string& display_email) override;
   virtual std::string GetUserDisplayEmail(
-      const std::string& user_id) const OVERRIDE;
+      const std::string& user_id) const override;
   virtual void UpdateUserAccountData(
       const std::string& user_id,
-      const UserAccountData& account_data) OVERRIDE;
-  virtual bool IsCurrentUserOwner() const OVERRIDE;
-  virtual bool IsCurrentUserNew() const OVERRIDE;
-  virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const OVERRIDE;
-  virtual bool CanCurrentUserLock() const OVERRIDE;
-  virtual bool IsUserLoggedIn() const OVERRIDE;
-  virtual bool IsLoggedInAsRegularUser() const OVERRIDE;
-  virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
-  virtual bool IsLoggedInAsPublicAccount() const OVERRIDE;
-  virtual bool IsLoggedInAsGuest() const OVERRIDE;
-  virtual bool IsLoggedInAsSupervisedUser() const OVERRIDE;
-  virtual bool IsLoggedInAsKioskApp() const OVERRIDE;
-  virtual bool IsLoggedInAsStub() const OVERRIDE;
-  virtual bool IsSessionStarted() const OVERRIDE;
+      const UserAccountData& account_data) override;
+  virtual bool IsCurrentUserOwner() const override;
+  virtual bool IsCurrentUserNew() const override;
+  virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const override;
+  virtual bool CanCurrentUserLock() const override;
+  virtual bool IsUserLoggedIn() const override;
+  virtual bool IsLoggedInAsRegularUser() const override;
+  virtual bool IsLoggedInAsDemoUser() const override;
+  virtual bool IsLoggedInAsPublicAccount() const override;
+  virtual bool IsLoggedInAsGuest() const override;
+  virtual bool IsLoggedInAsSupervisedUser() const override;
+  virtual bool IsLoggedInAsKioskApp() const override;
+  virtual bool IsLoggedInAsStub() const override;
+  virtual bool IsSessionStarted() const override;
   virtual bool IsUserNonCryptohomeDataEphemeral(
-      const std::string& user_id) const OVERRIDE;
-  virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
-  virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
+      const std::string& user_id) const override;
+  virtual void AddObserver(UserManager::Observer* obs) override;
+  virtual void RemoveObserver(UserManager::Observer* obs) override;
   virtual void AddSessionStateObserver(
-      UserManager::UserSessionStateObserver* obs) OVERRIDE;
+      UserManager::UserSessionStateObserver* obs) override;
   virtual void RemoveSessionStateObserver(
-      UserManager::UserSessionStateObserver* obs) OVERRIDE;
-  virtual void NotifyLocalStateChanged() OVERRIDE;
-  virtual void ForceUpdateState() OVERRIDE;
+      UserManager::UserSessionStateObserver* obs) override;
+  virtual void NotifyLocalStateChanged() override;
+  virtual void ForceUpdateState() override;
 
   // Helper function that copies users from |users_list| to |users_vector| and
   // |users_set|. Duplicates and users already present in |existing_users| are
diff --git a/components/variations/caching_permuted_entropy_provider.h b/components/variations/caching_permuted_entropy_provider.h
index d5ee0e7..e73ed69 100644
--- a/components/variations/caching_permuted_entropy_provider.h
+++ b/components/variations/caching_permuted_entropy_provider.h
@@ -38,7 +38,7 @@ class CachingPermutedEntropyProvider : public PermutedEntropyProvider {
 
  private:
   // PermutedEntropyProvider overrides:
-  virtual uint16 GetPermutedValue(uint32 randomization_seed) const OVERRIDE;
+  virtual 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 786ae28..ff6ba87 100644
--- a/components/variations/entropy_provider.h
+++ b/components/variations/entropy_provider.h
@@ -52,7 +52,7 @@ class SHA1EntropyProvider : public base::FieldTrial::EntropyProvider {
 
   // base::FieldTrial::EntropyProvider implementation:
   virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const OVERRIDE;
+                                    uint32 randomization_seed) const override;
 
  private:
   std::string entropy_source_;
@@ -75,7 +75,7 @@ class PermutedEntropyProvider : public base::FieldTrial::EntropyProvider {
 
   // base::FieldTrial::EntropyProvider implementation:
   virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const OVERRIDE;
+                                    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 4e9a637..fd94705 100644
--- a/components/variations/entropy_provider_unittest.cc
+++ b/components/variations/entropy_provider_unittest.cc
@@ -83,7 +83,7 @@ class SHA1EntropyGenerator : public TrialEntropyGenerator {
   virtual ~SHA1EntropyGenerator() {
   }
 
-  virtual double GenerateEntropyValue() const OVERRIDE {
+  virtual 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 =
@@ -116,7 +116,7 @@ class PermutedEntropyGenerator : public TrialEntropyGenerator {
   virtual ~PermutedEntropyGenerator() {
   }
 
-  virtual double GenerateEntropyValue() const OVERRIDE {
+  virtual 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 2386a5f..30cdc3a 100644
--- a/components/variations/variations_http_header_provider.h
+++ b/components/variations/variations_http_header_provider.h
@@ -71,7 +71,7 @@ class VariationsHttpHeaderProvider : base::FieldTrialList::Observer {
   // |group_name| to the variation ID cache.
   virtual void OnFieldTrialGroupFinalized(
       const std::string& trial_name,
-      const std::string& group_name) OVERRIDE;
+      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_http_header_provider_unittest.cc b/components/variations/variations_http_header_provider_unittest.cc
index 34ab141..50e4f4b 100644
--- a/components/variations/variations_http_header_provider_unittest.cc
+++ b/components/variations/variations_http_header_provider_unittest.cc
@@ -58,7 +58,7 @@ class VariationsHttpHeaderProviderTest : public ::testing::Test {
 
   virtual ~VariationsHttpHeaderProviderTest() {}
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     testing::ClearAllVariationIDs();
   }
 };
diff --git a/components/variations/variations_seed_simulator_unittest.cc b/components/variations/variations_seed_simulator_unittest.cc
index 7e85bd2..9ae37dd 100644
--- a/components/variations/variations_seed_simulator_unittest.cc
+++ b/components/variations/variations_seed_simulator_unittest.cc
@@ -26,7 +26,7 @@ class TestEntropyProvider : public base::FieldTrial::EntropyProvider {
 
   // base::FieldTrial::EntropyProvider implementation:
   virtual double GetEntropyForTrial(const std::string& trial_name,
-                                    uint32 randomization_seed) const OVERRIDE {
+                                    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 c2de5d2..436f76d 100644
--- a/components/visitedlink/browser/visitedlink_event_listener.h
+++ b/components/visitedlink/browser/visitedlink_event_listener.h
@@ -35,9 +35,9 @@ class VisitedLinkEventListener : public VisitedLinkMaster::Listener,
                            content::BrowserContext* browser_context);
   virtual ~VisitedLinkEventListener();
 
-  virtual void NewTable(base::SharedMemory* table_memory) OVERRIDE;
-  virtual void Add(VisitedLinkMaster::Fingerprint fingerprint) OVERRIDE;
-  virtual void Reset() OVERRIDE;
+  virtual void NewTable(base::SharedMemory* table_memory) override;
+  virtual void Add(VisitedLinkMaster::Fingerprint fingerprint) override;
+  virtual void Reset() override;
 
  private:
   void CommitVisitedLinks();
@@ -45,7 +45,7 @@ class VisitedLinkEventListener : public VisitedLinkMaster::Listener,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       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 689b813..b02b076 100644
--- a/components/visitedlink/browser/visitedlink_master.cc
+++ b/components/visitedlink/browser/visitedlink_master.cc
@@ -149,8 +149,8 @@ class VisitedLinkMaster::TableBuilder
   void DisownMaster();
 
   // VisitedLinkDelegate::URLEnumerator
-  virtual void OnURL(const GURL& url) OVERRIDE;
-  virtual void OnComplete(bool succeed) OVERRIDE;
+  virtual void OnURL(const GURL& url) override;
+  virtual void OnComplete(bool succeed) override;
 
  private:
   virtual ~TableBuilder() {}
diff --git a/components/visitedlink/renderer/visitedlink_slave.h b/components/visitedlink/renderer/visitedlink_slave.h
index 425c03e..5131e65 100644
--- a/components/visitedlink/renderer/visitedlink_slave.h
+++ b/components/visitedlink/renderer/visitedlink_slave.h
@@ -21,7 +21,7 @@ class VisitedLinkSlave : public VisitedLinkCommon,
   virtual ~VisitedLinkSlave();
 
   // RenderProcessObserver implementation.
-  virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual 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 8bda800..d4dd583 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 {}
+  virtual void NewTable(base::SharedMemory* table) override {}
+  virtual void Add(VisitedLinkCommon::Fingerprint) override {}
+  virtual void Reset() override {}
 };
 
 
diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc
index 9ced29a..8822df6 100644
--- a/components/visitedlink/test/visitedlink_unittest.cc
+++ b/components/visitedlink/test/visitedlink_unittest.cc
@@ -55,7 +55,7 @@ std::vector<VisitedLinkSlave*> g_slaves;
 class TestVisitedLinkDelegate : public VisitedLinkDelegate {
  public:
   virtual void RebuildTable(
-      const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
+      const scoped_refptr<URLEnumerator>& enumerator) override;
 
   void AddURLForRebuild(const GURL& url);
 
@@ -80,8 +80,8 @@ class TestURLIterator : public VisitedLinkMaster::URLIterator {
  public:
   explicit TestURLIterator(const URLs& urls);
 
-  virtual const GURL& NextURL() OVERRIDE;
-  virtual bool HasNextURL() const OVERRIDE;
+  virtual const GURL& NextURL() override;
+  virtual bool HasNextURL() const override;
 
  private:
   URLs::const_iterator iterator_;
@@ -109,7 +109,7 @@ class TrackingVisitedLinkEventListener : public VisitedLinkMaster::Listener {
       : reset_count_(0),
         add_count_(0) {}
 
-  virtual void NewTable(base::SharedMemory* table) OVERRIDE {
+  virtual void NewTable(base::SharedMemory* table) override {
     if (table) {
       for (std::vector<VisitedLinkSlave>::size_type i = 0;
            i < g_slaves.size(); i++) {
@@ -119,8 +119,8 @@ class TrackingVisitedLinkEventListener : public VisitedLinkMaster::Listener {
       }
     }
   }
-  virtual void Add(VisitedLinkCommon::Fingerprint) OVERRIDE { add_count_++; }
-  virtual void Reset() OVERRIDE { reset_count_++; }
+  virtual void Add(VisitedLinkCommon::Fingerprint) override { add_count_++; }
+  virtual void Reset() override { reset_count_++; }
 
   void SetUp() {
     reset_count_ = 0;
@@ -543,11 +543,11 @@ class VisitRelayingRenderProcessHost : public MockRenderProcessHost {
         content::NotificationService::NoDetails());
   }
 
-  virtual void WidgetRestored() OVERRIDE { widgets_++; }
-  virtual void WidgetHidden() OVERRIDE { widgets_--; }
-  virtual int VisibleWidgetCount() const OVERRIDE { return widgets_; }
+  virtual void WidgetRestored() override { widgets_++; }
+  virtual void WidgetHidden() override { widgets_--; }
+  virtual int VisibleWidgetCount() const override { return widgets_; }
 
-  virtual bool Send(IPC::Message* msg) OVERRIDE {
+  virtual bool Send(IPC::Message* msg) override {
     VisitCountingContext* counting_context =
         static_cast<VisitCountingContext*>(
             GetBrowserContext());
@@ -580,7 +580,7 @@ class VisitedLinkRenderProcessHostFactory
       : content::RenderProcessHostFactory() {}
   virtual content::RenderProcessHost* CreateRenderProcessHost(
       content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) const OVERRIDE {
+      content::SiteInstance* site_instance) const override {
     return new VisitRelayingRenderProcessHost(browser_context);
   }
 
@@ -595,7 +595,7 @@ class VisitedLinkEventsTest : public content::RenderViewHostTestHarness {
     content::RenderViewHostTestHarness::SetUp();
   }
 
-  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE {
+  virtual 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 5d64992..ce446a7 100644
--- a/components/web_cache/browser/web_cache_manager.h
+++ b/components/web_cache/browser/web_cache_manager.h
@@ -93,7 +93,7 @@ class WebCacheManager : public content::NotificationObserver {
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Gets the default global size limit.  This interrogates system metrics to
   // tune the default size to the current system.
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 6f49a3c..622185c 100644
--- a/components/web_cache/renderer/web_cache_render_process_observer.h
+++ b/components/web_cache/renderer/web_cache_render_process_observer.h
@@ -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;
+  virtual bool OnControlMessageReceived(const IPC::Message& message) override;
+  virtual void WebKitInitialized() override;
+  virtual void OnRenderProcessShutdown() override;
 
   // Message handlers.
   void OnSetCacheCapacities(size_t min_dead_capacity,
diff --git a/components/web_contents_delegate_android/color_chooser_android.h b/components/web_contents_delegate_android/color_chooser_android.h
index eefd85b..3966d1b 100644
--- a/components/web_contents_delegate_android/color_chooser_android.h
+++ b/components/web_contents_delegate_android/color_chooser_android.h
@@ -33,8 +33,8 @@ class ColorChooserAndroid : public content::ColorChooser {
   void OnColorChosen(JNIEnv* env, jobject obj, jint color);
 
   // ColorChooser interface
-  virtual void End() OVERRIDE;
-  virtual void SetSelectedColor(SkColor color) OVERRIDE;
+  virtual void End() override;
+  virtual void SetSelectedColor(SkColor color) override;
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> j_color_chooser_;
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h
index 3a0f8ac..e64f07a 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.h
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.h
@@ -53,53 +53,53 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
   // Overridden from WebContentsDelegate:
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
   virtual content::ColorChooser* OpenColorChooser(
       content::WebContents* source,
       SkColor color,
-      const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE;
+      const std::vector<content::ColorSuggestion>& suggestions) override;
   virtual void NavigationStateChanged(
       const content::WebContents* source,
-      content::InvalidateTypes changed_flags) OVERRIDE;
+      content::InvalidateTypes changed_flags) override;
   virtual void VisibleSSLStateChanged(
-      const content::WebContents* source) OVERRIDE;
-  virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
-  virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
+      const content::WebContents* source) override;
+  virtual void ActivateContents(content::WebContents* contents) override;
+  virtual void DeactivateContents(content::WebContents* contents) override;
   virtual void LoadingStateChanged(content::WebContents* source,
-                                   bool to_different_document) OVERRIDE;
+                                   bool to_different_document) override;
   virtual void LoadProgressChanged(content::WebContents* source,
-                                   double load_progress) OVERRIDE;
-  virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
-  virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
-  virtual void CloseContents(content::WebContents* source) OVERRIDE;
+                                   double load_progress) override;
+  virtual void RendererUnresponsive(content::WebContents* source) override;
+  virtual void RendererResponsive(content::WebContents* source) override;
+  virtual void CloseContents(content::WebContents* source) override;
   virtual void MoveContents(content::WebContents* source,
-                            const gfx::Rect& pos) OVERRIDE;
+                            const gfx::Rect& pos) override;
   virtual bool AddMessageToConsole(content::WebContents* source,
                                    int32 level,
                                    const base::string16& message,
                                    int32 line_no,
-                                   const base::string16& source_id) OVERRIDE;
+                                   const base::string16& source_id) override;
   virtual void UpdateTargetURL(content::WebContents* source,
-                               const GURL& url) OVERRIDE;
+                               const GURL& url) override;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual bool TakeFocus(content::WebContents* source, bool reverse) override;
   virtual void ShowRepostFormWarningDialog(
-      content::WebContents* source) OVERRIDE;
+      content::WebContents* source) override;
   virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
-                                          bool enter_fullscreen) OVERRIDE;
+                                          bool enter_fullscreen) override;
   virtual bool IsFullscreenForTabOrPending(
-      const content::WebContents* web_contents) const OVERRIDE;
+      const content::WebContents* web_contents) const override;
   virtual void ShowValidationMessage(content::WebContents* web_contents,
                                      const gfx::Rect& anchor_in_root_view,
                                      const base::string16& main_text,
-                                     const base::string16& sub_text) OVERRIDE;
+                                     const base::string16& sub_text) override;
   virtual void HideValidationMessage(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
   virtual void MoveValidationMessage(
       content::WebContents* web_contents,
-      const gfx::Rect& anchor_in_root_view) OVERRIDE;
+      const gfx::Rect& anchor_in_root_view) override;
 
  protected:
   base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const;
diff --git a/components/web_modal/popup_manager.h b/components/web_modal/popup_manager.h
index cd4d2bb..0ce4a58 100644
--- a/components/web_modal/popup_manager.h
+++ b/components/web_modal/popup_manager.h
@@ -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;
+  virtual 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 89fb4b3..e51db7a 100644
--- a/components/web_modal/test_web_contents_modal_dialog_host.h
+++ b/components/web_modal/test_web_contents_modal_dialog_host.h
@@ -20,11 +20,11 @@ class TestWebContentsModalDialogHost : public WebContentsModalDialogHost {
   virtual ~TestWebContentsModalDialogHost();
 
   // 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;
+  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;
 
   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 3ca641a..96a48e8 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
@@ -19,12 +19,12 @@ class TestWebContentsModalDialogManagerDelegate
 
   // WebContentsModalDialogManagerDelegate overrides:
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
-                                     bool blocked) OVERRIDE;
+                                     bool blocked) override;
 
-  virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE;
+  virtual WebContentsModalDialogHost* GetWebContentsModalDialogHost() override;
 
   virtual bool IsWebContentsVisible(
-      content::WebContents* web_contents) OVERRIDE;
+      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_manager.h b/components/web_modal/web_contents_modal_dialog_manager.h
index 19d844c..4817753 100644
--- a/components/web_modal/web_contents_modal_dialog_manager.h
+++ b/components/web_modal/web_contents_modal_dialog_manager.h
@@ -50,8 +50,8 @@ class WebContentsModalDialogManager
   void FocusTopmostDialog() const;
 
   // SingleWebContentsDialogManagerDelegate:
-  virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual void WillClose(NativeWebContentsModalDialog dialog) OVERRIDE;
+  virtual content::WebContents* GetWebContents() const override;
+  virtual void WillClose(NativeWebContentsModalDialog dialog) override;
 
   // For testing.
   class TestApi {
@@ -101,12 +101,12 @@ class WebContentsModalDialogManager
   // Overridden from content::WebContentsObserver:
   virtual 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;
+      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;
 
   // 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 557df7b..e0a1e80 100644
--- a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
@@ -53,26 +53,26 @@ class TestNativeWebContentsModalDialogManager
       tracker_->SetState(NativeManagerTracker::NOT_SHOWN);
   }
 
-  virtual void Show() OVERRIDE {
+  virtual void Show() override {
     if (tracker_)
       tracker_->SetState(NativeManagerTracker::SHOWN);
   }
-  virtual void Hide() OVERRIDE {
+  virtual void Hide() override {
     if (tracker_)
       tracker_->SetState(NativeManagerTracker::HIDDEN);
   }
-  virtual void Close() OVERRIDE {
+  virtual void Close() override {
     if (tracker_)
       tracker_->SetState(NativeManagerTracker::CLOSED);
     delegate_->WillClose(dialog_);
   }
-  virtual void Focus() OVERRIDE {
+  virtual void Focus() override {
   }
-  virtual void Pulse() OVERRIDE {
+  virtual void Pulse() override {
   }
-  virtual void HostChanged(WebContentsModalDialogHost* new_host) OVERRIDE {
+  virtual void HostChanged(WebContentsModalDialogHost* new_host) override {
   }
-  virtual NativeWebContentsModalDialog dialog() OVERRIDE {
+  virtual NativeWebContentsModalDialog dialog() override {
       return dialog_;
   }
 
diff --git a/components/webdata/common/web_data_results.h b/components/webdata/common/web_data_results.h
index 1878dc0..247d99f 100644
--- a/components/webdata/common/web_data_results.h
+++ b/components/webdata/common/web_data_results.h
@@ -98,7 +98,7 @@ template <class T> class WDDestroyableResult : public WDTypedResult {
   }
 
 
-  virtual void Destroy()  OVERRIDE {
+  virtual void Destroy()  override {
     if (!callback_.is_null()) {
       callback_.Run(this);
     }
diff --git a/components/webdata/common/web_data_service_test_util.h b/components/webdata/common/web_data_service_test_util.h
index 68e6f4e..8ac2eaa 100644
--- a/components/webdata/common/web_data_service_test_util.h
+++ b/components/webdata/common/web_data_service_test_util.h
@@ -17,7 +17,7 @@ class MockWebDataServiceWrapperBase : public WebDataServiceWrapper {
   MockWebDataServiceWrapperBase();
   virtual ~MockWebDataServiceWrapperBase();
 
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockWebDataServiceWrapperBase);
@@ -34,9 +34,9 @@ class MockWebDataServiceWrapper : public MockWebDataServiceWrapperBase {
   virtual ~MockWebDataServiceWrapper();
 
   virtual scoped_refptr<autofill::AutofillWebDataService>
-      GetAutofillWebData() OVERRIDE;
+      GetAutofillWebData() override;
 
-  virtual scoped_refptr<TokenWebData> GetTokenWebData() OVERRIDE;
+  virtual 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 101c7de..4010c51 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 {
+  virtual 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 41695c2..7827471 100644
--- a/components/wifi/fake_wifi_service.h
+++ b/components/wifi/fake_wifi_service.h
@@ -20,40 +20,40 @@ class FakeWiFiService : public WiFiService {
   virtual ~FakeWiFiService();
 
   virtual void Initialize(
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
-  virtual void UnInitialize() OVERRIDE;
+      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;
+                             std::string* error) override;
   virtual void GetManagedProperties(const std::string& network_guid,
                                     base::DictionaryValue* managed_properties,
-                                    std::string* error) OVERRIDE;
+                                    std::string* error) override;
   virtual void GetState(const std::string& network_guid,
                         base::DictionaryValue* properties,
-                        std::string* error) OVERRIDE;
+                        std::string* error) override;
   virtual void SetProperties(const std::string& network_guid,
                              scoped_ptr<base::DictionaryValue> properties,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
   virtual void CreateNetwork(bool shared,
                              scoped_ptr<base::DictionaryValue> properties,
                              std::string* network_guid,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
   virtual void GetVisibleNetworks(const std::string& network_type,
                                   base::ListValue* network_list,
-                                  bool include_details) OVERRIDE;
-  virtual void RequestNetworkScan() OVERRIDE;
+                                  bool include_details) override;
+  virtual void RequestNetworkScan() override;
   virtual void StartConnect(const std::string& network_guid,
-                            std::string* error) OVERRIDE;
+                            std::string* error) override;
   virtual void StartDisconnect(const std::string& network_guid,
-                               std::string* error) OVERRIDE;
+                               std::string* error) override;
   virtual void GetKeyFromSystem(const std::string& network_guid,
                                 std::string* key_data,
-                                std::string* error) OVERRIDE;
+                                std::string* error) override;
   virtual 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;
+      const NetworkGuidListCallback& network_list_changed_observer) override;
+  virtual 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 7fccf98..f8c407e 100644
--- a/components/wifi/wifi_service_mac.mm
+++ b/components/wifi/wifi_service_mac.mm
@@ -28,53 +28,53 @@ class WiFiServiceMac : public WiFiService {
 
   // WiFiService interface implementation.
   virtual void Initialize(
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void UnInitialize() OVERRIDE;
+  virtual void UnInitialize() override;
 
   virtual void GetProperties(const std::string& network_guid,
                              base::DictionaryValue* properties,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
 
   virtual void GetManagedProperties(const std::string& network_guid,
                                     base::DictionaryValue* managed_properties,
-                                    std::string* error) OVERRIDE;
+                                    std::string* error) override;
 
   virtual void GetState(const std::string& network_guid,
                         base::DictionaryValue* properties,
-                        std::string* error) OVERRIDE;
+                        std::string* error) override;
 
   virtual void SetProperties(const std::string& network_guid,
                              scoped_ptr<base::DictionaryValue> properties,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
 
   virtual void CreateNetwork(bool shared,
                              scoped_ptr<base::DictionaryValue> properties,
                              std::string* network_guid,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
 
   virtual void GetVisibleNetworks(const std::string& network_type,
                                   base::ListValue* network_list,
-                                  bool include_details) OVERRIDE;
+                                  bool include_details) override;
 
-  virtual void RequestNetworkScan() OVERRIDE;
+  virtual void RequestNetworkScan() override;
 
   virtual void StartConnect(const std::string& network_guid,
-                            std::string* error) OVERRIDE;
+                            std::string* error) override;
 
   virtual void StartDisconnect(const std::string& network_guid,
-                               std::string* error) OVERRIDE;
+                               std::string* error) override;
 
   virtual void GetKeyFromSystem(const std::string& network_guid,
                                 std::string* key_data,
-                                std::string* error) OVERRIDE;
+                                std::string* error) override;
 
   virtual void SetEventObservers(
       scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
       const NetworkGuidListCallback& networks_changed_observer,
-      const NetworkGuidListCallback& network_list_changed_observer) OVERRIDE;
+      const NetworkGuidListCallback& network_list_changed_observer) override;
 
-  virtual void RequestConnectedNetworkUpdate() OVERRIDE;
+  virtual void RequestConnectedNetworkUpdate() override;
 
  private:
   // Checks |ns_error| and if is not |nil|, then stores |error_name|
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index 119fbe5..fe2d308 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -178,53 +178,53 @@ class WiFiServiceImpl : public WiFiService {
 
   // WiFiService interface implementation.
   virtual void Initialize(
-      scoped_refptr<base::SequencedTaskRunner> task_runner) OVERRIDE;
+      scoped_refptr<base::SequencedTaskRunner> task_runner) override;
 
-  virtual void UnInitialize() OVERRIDE;
+  virtual void UnInitialize() override;
 
   virtual void GetProperties(const std::string& network_guid,
                              base::DictionaryValue* properties,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
 
   virtual void GetManagedProperties(const std::string& network_guid,
                                     base::DictionaryValue* managed_properties,
-                                    std::string* error) OVERRIDE;
+                                    std::string* error) override;
 
   virtual void GetState(const std::string& network_guid,
                         base::DictionaryValue* properties,
-                        std::string* error) OVERRIDE;
+                        std::string* error) override;
 
   virtual void SetProperties(const std::string& network_guid,
                              scoped_ptr<base::DictionaryValue> properties,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
 
   virtual void CreateNetwork(bool shared,
                              scoped_ptr<base::DictionaryValue> properties,
                              std::string* network_guid,
-                             std::string* error) OVERRIDE;
+                             std::string* error) override;
 
   virtual void GetVisibleNetworks(const std::string& network_type,
                                   base::ListValue* network_list,
-                                  bool include_details) OVERRIDE;
+                                  bool include_details) override;
 
-  virtual void RequestNetworkScan() OVERRIDE;
+  virtual void RequestNetworkScan() override;
 
   virtual void StartConnect(const std::string& network_guid,
-                            std::string* error) OVERRIDE;
+                            std::string* error) override;
 
   virtual void StartDisconnect(const std::string& network_guid,
-                               std::string* error) OVERRIDE;
+                               std::string* error) override;
 
   virtual void GetKeyFromSystem(const std::string& network_guid,
                                 std::string* key_data,
-                                std::string* error) OVERRIDE;
+                                std::string* error) override;
 
   virtual void SetEventObservers(
       scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
       const NetworkGuidListCallback& networks_changed_observer,
-      const NetworkGuidListCallback& network_list_changed_observer) OVERRIDE;
+      const NetworkGuidListCallback& network_list_changed_observer) override;
 
-  virtual void RequestConnectedNetworkUpdate() OVERRIDE {}
+  virtual void RequestConnectedNetworkUpdate() override {}
 
  private:
   typedef int32 EncryptionType;