replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/

BUG=417463

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

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

69 files changed, 227 insertions, 227 deletions

diff --git a/chrome/browser/chromeos/policy/app_pack_updater.cc b/chrome/browser/chromeos/policy/app_pack_updater.cc
index a327d0e..6017678 100644
--- a/chrome/browser/chromeos/policy/app_pack_updater.cc
+++ b/chrome/browser/chromeos/policy/app_pack_updater.cc
@@ -44,7 +44,7 @@ class AppPackExternalLoader
   }
 
   // Implementation of extensions::ExternalLoader:
-  virtual void StartLoading() OVERRIDE {
+  virtual void StartLoading() override {
     prefs_.reset(app_pack_prefs_.DeepCopy());
     VLOG(1) << "AppPack extension loader publishing "
             << app_pack_prefs_.size() << " crx files.";
diff --git a/chrome/browser/chromeos/policy/app_pack_updater.h b/chrome/browser/chromeos/policy/app_pack_updater.h
index 2b83f54..e40698e 100644
--- a/chrome/browser/chromeos/policy/app_pack_updater.h
+++ b/chrome/browser/chromeos/policy/app_pack_updater.h
@@ -65,7 +65,7 @@ class AppPackUpdater : public chromeos::ExternalCache::Delegate {
  private:
   // Implementation of ExternalCache::Delegate:
   virtual void OnExtensionListsUpdated(
-      const base::DictionaryValue* prefs) OVERRIDE;
+      const base::DictionaryValue* prefs) override;
 
   // Called when the app pack device setting changes.
   void AppPackChanged();
diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.h b/chrome/browser/chromeos/policy/auto_enrollment_client.h
index 1adc415..e7565f3 100644
--- a/chrome/browser/chromeos/policy/auto_enrollment_client.h
+++ b/chrome/browser/chromeos/policy/auto_enrollment_client.h
@@ -110,7 +110,7 @@ class AutoEnrollmentClient
 
   // Implementation of net::NetworkChangeNotifier::NetworkChangeObserver:
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
  private:
   typedef bool (AutoEnrollmentClient::*RequestCompletionHandler)(
diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc b/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc
index d8fb571..bdeb712 100644
--- a/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc
+++ b/chrome/browser/chromeos/policy/auto_enrollment_client_unittest.cc
@@ -48,13 +48,13 @@ class AutoEnrollmentClientTest : public testing::Test {
         local_state_(scoped_testing_local_state_.Get()),
         state_(AUTO_ENROLLMENT_STATE_PENDING) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CreateClient(kStateKey, true, 4, 8);
     ASSERT_FALSE(local_state_->GetUserPref(prefs::kShouldAutoEnroll));
     ASSERT_FALSE(local_state_->GetUserPref(prefs::kAutoEnrollmentPowerLimit));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Flush any deletion tasks.
     base::RunLoop().RunUntilIdle();
   }
diff --git a/chrome/browser/chromeos/policy/blocking_login_browsertest.cc b/chrome/browser/chromeos/policy/blocking_login_browsertest.cc
index 7cae921..c0f7533 100644
--- a/chrome/browser/chromeos/policy/blocking_login_browsertest.cc
+++ b/chrome/browser/chromeos/policy/blocking_login_browsertest.cc
@@ -87,7 +87,7 @@ class BlockingLoginTest
  public:
   BlockingLoginTest() : profile_added_(NULL) {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     // Initialize the test server early, so that we can use its base url for
     // the command line flags.
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -109,7 +109,7 @@ class BlockingLoginTest
         embedded_test_server()->GetURL("/device_management").spec());
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     fake_gaia_.Initialize();
 
     embedded_test_server()->RegisterRequestHandler(
@@ -122,7 +122,7 @@ class BlockingLoginTest
                    content::NotificationService::AllSources());
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     RunUntilIdle();
     EXPECT_TRUE(responses_.empty());
     STLDeleteElements(&responses_);
@@ -131,7 +131,7 @@ class BlockingLoginTest
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     ASSERT_EQ(chrome::NOTIFICATION_PROFILE_ADDED, type);
     ASSERT_FALSE(profile_added_);
     profile_added_ = content::Source<Profile>(source).ptr();
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
index e435b88..5504eb6 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
@@ -44,7 +44,7 @@ class BrowserPolicyConnectorChromeOS : public ChromeBrowserPolicyConnector {
 
   virtual void Init(
       PrefService* local_state,
-      scoped_refptr<net::URLRequestContextGetter> request_context) OVERRIDE;
+      scoped_refptr<net::URLRequestContextGetter> request_context) override;
 
   // Shutdown() is called from BrowserProcessImpl::StartTearDown() but |this|
   // observes some objects that get destroyed earlier. PreShutdown() is called
@@ -52,7 +52,7 @@ class BrowserPolicyConnectorChromeOS : public ChromeBrowserPolicyConnector {
   // connection to these dependencies to be severed earlier.
   void PreShutdown();
 
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // Returns true if this device is managed by an enterprise (as opposed to
   // a local owner).
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h
index dc82ca6..55d2e10 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h
+++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base.h
@@ -47,14 +47,14 @@ class CloudExternalDataManagerBase : public CloudExternalDataManager,
       scoped_ptr<CloudExternalDataStore> external_data_store);
 
   // CloudExternalDataManager:
-  virtual void SetPolicyStore(CloudPolicyStore* policy_store) OVERRIDE;
-  virtual void OnPolicyStoreLoaded() OVERRIDE;
+  virtual void SetPolicyStore(CloudPolicyStore* policy_store) override;
+  virtual void OnPolicyStoreLoaded() override;
   virtual void Connect(
-      scoped_refptr<net::URLRequestContextGetter> request_context) OVERRIDE;
-  virtual void Disconnect() OVERRIDE;
+      scoped_refptr<net::URLRequestContextGetter> request_context) override;
+  virtual void Disconnect() override;
   virtual void Fetch(
       const std::string& policy,
-      const ExternalDataFetcher::FetchCallback& callback) OVERRIDE;
+      const ExternalDataFetcher::FetchCallback& callback) override;
 
   // Allows policies to reference |max_size| bytes of external data even if no
   // |max_size| was specified in policy_templates.json.
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc
index e1c6a58..fe9d3f9 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc
@@ -74,7 +74,7 @@ class FakeURLFetcherFactory : public net::FakeURLFetcherFactory {
       int id,
       const GURL& url,
       net::URLFetcher::RequestType request_type,
-      net::URLFetcherDelegate* delegate) OVERRIDE;
+      net::URLFetcherDelegate* delegate) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeURLFetcherFactory);
@@ -104,8 +104,8 @@ class CloudExternalDataManagerBaseTest : public testing::Test {
  protected:
   CloudExternalDataManagerBaseTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void SetUpExternalDataManager();
 
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc
index 084d12d..81786ec 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.cc
@@ -45,7 +45,7 @@ class CloudExternalDataPolicyObserver::PolicyServiceObserver
   // PolicyService::Observer:
   virtual void OnPolicyUpdated(const PolicyNamespace& ns,
                                const PolicyMap& previous,
-                               const PolicyMap& current) OVERRIDE;
+                               const PolicyMap& current) override;
 
  private:
   CloudExternalDataPolicyObserver* parent_;
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
index d3c4a2e..925530a 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h
@@ -69,11 +69,11 @@ class CloudExternalDataPolicyObserver
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // DeviceLocalAccountPolicyService::Observer:
-  virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE;
-  virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
+  virtual void OnPolicyUpdated(const std::string& user_id) override;
+  virtual void OnDeviceLocalAccountsChanged() override;
 
  private:
   // Helper class that observes |policy_| for a logged-in user.
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
index 6a0c5fc..1a22873 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
@@ -98,17 +98,17 @@ class CloudExternalDataPolicyObserverTest
   virtual ~CloudExternalDataPolicyObserverTest();
 
   // chromeos::DeviceSettingsTestBase:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // CloudExternalDataPolicyObserver::Delegate:
   virtual void OnExternalDataSet(const std::string& policy,
-                                 const std::string& user_id) OVERRIDE;
+                                 const std::string& user_id) override;
   virtual void OnExternalDataCleared(const std::string& policy,
-                                     const std::string& user_id) OVERRIDE;
+                                     const std::string& user_id) override;
   virtual void OnExternalDataFetched(const std::string& policy,
                                      const std::string& user_id,
-                                     scoped_ptr<std::string> data) OVERRIDE;
+                                     scoped_ptr<std::string> data) override;
 
   void CreateObserver();
 
diff --git a/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc
index 9491b3a..4ac05cd1 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_store_unittest.cc
@@ -31,7 +31,7 @@ class CouldExternalDataStoreTest : public testing::Test {
  public:
   CouldExternalDataStoreTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  protected:
   const std::string kData1Hash;
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h
index 66f6deb..4bd8d36 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h
@@ -29,10 +29,10 @@ class ExternalDataPolicyHandler : public TypeCheckingPolicyHandler {
 
   // TypeCheckingPolicyHandler:
   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(ExternalDataPolicyHandler);
@@ -50,10 +50,10 @@ class NetworkConfigurationPolicyHandler : public TypeCheckingPolicyHandler {
 
   // ConfigurationPolicyHandler methods:
   virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) OVERRIDE;
+                                   PolicyErrorMap* errors) override;
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
-  virtual void PrepareForDisplaying(PolicyMap* policies) const OVERRIDE;
+                                   PrefValueMap* prefs) override;
+  virtual void PrepareForDisplaying(PolicyMap* policies) const override;
 
  private:
   explicit NetworkConfigurationPolicyHandler(
@@ -86,7 +86,7 @@ class PinnedLauncherAppsPolicyHandler
 
   // ExtensionListPolicyHandler methods:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PinnedLauncherAppsPolicyHandler);
@@ -99,7 +99,7 @@ class ScreenMagnifierPolicyHandler : public IntRangePolicyHandlerBase {
 
   // IntRangePolicyHandlerBase:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenMagnifierPolicyHandler);
@@ -116,7 +116,7 @@ class LoginScreenPowerManagementPolicyHandler
 
   // SchemaValidatingPolicyHandler:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LoginScreenPowerManagementPolicyHandler);
@@ -131,7 +131,7 @@ class DeprecatedIdleActionHandler : public IntRangePolicyHandlerBase {
 
   // ConfigurationPolicyHandler methods:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeprecatedIdleActionHandler);
@@ -146,7 +146,7 @@ class PowerManagementIdleSettingsPolicyHandler
 
   // SchemaValidatingPolicyHandler:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PowerManagementIdleSettingsPolicyHandler);
@@ -159,7 +159,7 @@ class ScreenLockDelayPolicyHandler : public SchemaValidatingPolicyHandler {
 
   // SchemaValidatingPolicyHandler:
   virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) OVERRIDE;
+                                   PrefValueMap* prefs) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenLockDelayPolicyHandler);
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
index 8ab6517..6a62d33 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
@@ -34,7 +34,7 @@ class LoginScreenPowerManagementPolicyHandlerTest : public testing::Test {
  protected:
   LoginScreenPowerManagementPolicyHandlerTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   Schema chrome_schema_;
 
diff --git a/chrome/browser/chromeos/policy/consumer_management_service.cc b/chrome/browser/chromeos/policy/consumer_management_service.cc
index 448b97d..b6d0961 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service.cc
+++ b/chrome/browser/chromeos/policy/consumer_management_service.cc
@@ -80,13 +80,13 @@ class DesktopNotificationDelegate : public NotificationDelegate {
                               const base::Closure& button_click_callback);
 
   // NotificationDelegate:
-  virtual std::string id() const OVERRIDE;
-  virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual void Display() OVERRIDE;
-  virtual void ButtonClick(int button_index) OVERRIDE;
-  virtual void Error() OVERRIDE;
-  virtual void Close(bool by_user) OVERRIDE;
-  virtual void Click() OVERRIDE;
+  virtual std::string id() const override;
+  virtual content::WebContents* GetWebContents() const override;
+  virtual void Display() override;
+  virtual void ButtonClick(int button_index) override;
+  virtual void Error() override;
+  virtual void Close(bool by_user) override;
+  virtual void Click() override;
 
  private:
   virtual ~DesktopNotificationDelegate();
diff --git a/chrome/browser/chromeos/policy/consumer_management_service.h b/chrome/browser/chromeos/policy/consumer_management_service.h
index c460658..cf10abc 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service.h
+++ b/chrome/browser/chromeos/policy/consumer_management_service.h
@@ -145,25 +145,25 @@ class ConsumerManagementService
   void SetOwner(const std::string& user_id, const SetOwnerCallback& callback);
 
   // chromeos::DeviceSettingsService::Observer:
-  virtual void OwnershipStatusChanged() OVERRIDE;
-  virtual void DeviceSettingsUpdated() OVERRIDE;
+  virtual void OwnershipStatusChanged() override;
+  virtual void DeviceSettingsUpdated() override;
 
   // content::NotificationObserver implmentation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
 
   // 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;
 
   OAuth2TokenService::Request* GetTokenRequestForTesting() {
     return token_request_.get();
diff --git a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc
index 512eef3..e27c298 100644
--- a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc
@@ -78,7 +78,7 @@ class ConsumerManagementServiceTest : public BrowserWithTestWindowTest {
                        MockFlushAndSignBootAttributes));
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
 
     testing_profile_manager_.reset(new TestingProfileManager(
@@ -89,7 +89,7 @@ class ConsumerManagementServiceTest : public BrowserWithTestWindowTest {
                                                  NULL));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     testing_profile_manager_.reset();
 
     service_.reset();
@@ -247,7 +247,7 @@ class ConsumerManagementServiceEnrollmentTest
         scoped_ptr<DeviceCloudPolicyInitializer>(fake_initializer_));
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ConsumerManagementServiceTest::SetUp();
 
     // Set up the testing profile.
@@ -269,7 +269,7 @@ class ConsumerManagementServiceEnrollmentTest
         ConsumerManagementService::ENROLLMENT_STAGE_OWNER_STORED);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     g_browser_process->notification_ui_manager()->CancelAll();
 
     ConsumerManagementServiceTest::TearDown();
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
index e5a13d4..8023ec2 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
@@ -19,7 +19,7 @@ class DeviceCloudPolicyManagedBrowserTest : public DevicePolicyCrosBrowserTest {
  protected:
   DeviceCloudPolicyManagedBrowserTest() {}
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
     InstallOwnerKey();
     MarkAsEnterpriseOwned();
@@ -42,7 +42,7 @@ class DeviceCloudPolicyUnmanagedBrowserTest
  protected:
   DeviceCloudPolicyUnmanagedBrowserTest() {}
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
   }
 
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
index c487ac7..4483d19 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
@@ -95,8 +95,8 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
   std::string GetForcedEnrollmentDomain() const;
 
   // 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;
 
  private:
   // Handles completion signaled by |enrollment_handler_|.
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc
index 4fca55a..0f62250 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc
@@ -57,10 +57,10 @@ class DeviceCloudPolicyInvalidator::InvalidationServiceObserver
 
   // public syncer::InvalidationHandler:
   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;
 
  private:
   DeviceCloudPolicyInvalidator* parent_;
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h
index 875719f..f180225 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h
@@ -39,7 +39,7 @@ class DeviceCloudPolicyInvalidator : public content::NotificationObserver {
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
  private:
   friend class DeviceCloudPolicyInvalidatorTest;
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
index 808b73c..6b03b66 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
@@ -76,8 +76,8 @@ class DeviceCloudPolicyInvalidatorTest : public testing::Test {
   virtual ~DeviceCloudPolicyInvalidatorTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Ownership is not passed. The Profile is owned by the global ProfileManager.
   Profile *LogInAndReturnProfile(const std::string& user_id);
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
index 5cb0be5..f98284d 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
@@ -55,7 +55,7 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
   bool IsSharkRequisition() const;
 
   // CloudPolicyManager:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // Pref registration helper.
   static void RegisterPrefs(PrefRegistrySimple* registry);
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 09d8da2..121b7bc 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -94,7 +94,7 @@ class DeviceCloudPolicyManagerChromeOSTest
     chromeos::system::StatisticsProvider::SetTestProvider(NULL);
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     DeviceSettingsTestBase::SetUp();
     dbus_setter_->SetCryptohomeClient(
         scoped_ptr<chromeos::CryptohomeClient>(fake_cryptohome_client_));
@@ -130,7 +130,7 @@ class DeviceCloudPolicyManagerChromeOSTest
                                    "\"refresh_token\":\"refreshToken4Test\"}";
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     manager_->Shutdown();
     if (initializer_)
       initializer_->Shutdown();
@@ -309,7 +309,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
         status_(EnrollmentStatus::ForStatus(EnrollmentStatus::STATUS_SUCCESS)),
         done_(false) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     DeviceCloudPolicyManagerChromeOSTest::SetUp();
 
     // Set up test data.
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h
index dea0277..8ad3c5b 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h
@@ -40,8 +40,8 @@ class DeviceCloudPolicyStoreChromeOS
 
   // CloudPolicyStore:
   virtual void Store(
-      const enterprise_management::PolicyFetchResponse& policy) OVERRIDE;
-  virtual void Load() OVERRIDE;
+      const enterprise_management::PolicyFetchResponse& policy) override;
+  virtual void Load() override;
 
   // Installs initial policy. This is different from Store() in that it skips
   // the signature validation step against already-installed policy. The checks
@@ -52,8 +52,8 @@ class DeviceCloudPolicyStoreChromeOS
       const enterprise_management::PolicyFetchResponse& policy);
 
   // chromeos::DeviceSettingsService::Observer:
-  virtual void OwnershipStatusChanged() OVERRIDE;
-  virtual void DeviceSettingsUpdated() OVERRIDE;
+  virtual void OwnershipStatusChanged() override;
+  virtual void DeviceSettingsUpdated() override;
 
  private:
   // Create a validator for |policy| with basic device policy configuration and
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
index acd1b98..e6e47a7 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
@@ -51,7 +51,7 @@ class DeviceCloudPolicyStoreChromeOSTest
             base::MessageLoopProxy::current())) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     DeviceSettingsTestBase::SetUp();
 
     dbus_setter_->SetCryptohomeClient(
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 89e9898..55fe1f8 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -402,7 +402,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
 
   virtual ~DeviceLocalAccountTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Configure and start the test server.
     scoped_ptr<crypto::RSAPrivateKey> signing_key(
         PolicyBuilder::CreateTestSigningKey());
@@ -418,7 +418,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
     DevicePolicyCrosBrowserTest::SetUp();
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     DevicePolicyCrosBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
     command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
@@ -427,7 +427,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
                                     test_server_.GetServiceURL().spec());
   }
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
 
     // Clear command-line arguments (but keep command-line switches) so the
@@ -444,7 +444,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
     InitializePolicy();
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     DevicePolicyCrosBrowserTest::SetUpOnMainThread();
 
     initial_locale_ = g_browser_process->GetApplicationLocale();
@@ -500,7 +500,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
     wizard_controller->SkipToLoginForTesting(LoginScreenContext());
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     BrowserList::RemoveObserver(this);
 
     // This shuts down the login UI.
@@ -510,22 +510,22 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
   }
 
   virtual void LocalStateChanged(
-      user_manager::UserManager* user_manager) OVERRIDE {
+      user_manager::UserManager* user_manager) override {
     if (run_loop_)
       run_loop_->Quit();
   }
 
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE {
+  virtual void OnBrowserRemoved(Browser* browser) override {
     if (run_loop_)
       run_loop_->Quit();
   }
 
-  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE {
+  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override {
     if (run_loop_)
       run_loop_->Quit();
   }
 
-  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE {
+  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override {
     if (run_loop_)
       run_loop_->Quit();
   }
diff --git a/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h b/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h
index e985c4e..a357986e 100644
--- a/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h
+++ b/chrome/browser/chromeos/policy/device_local_account_extension_tracker.h
@@ -26,8 +26,8 @@ class DeviceLocalAccountExtensionTracker : public CloudPolicyStore::Observer {
   virtual ~DeviceLocalAccountExtensionTracker();
 
   // 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;
 
  private:
   void UpdateFromStore();
diff --git a/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h b/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h
index 473b937..626e09a 100644
--- a/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h
+++ b/chrome/browser/chromeos/policy/device_local_account_external_data_manager.h
@@ -57,7 +57,7 @@ class DeviceLocalAccountExternalDataManager
   virtual ~DeviceLocalAccountExternalDataManager();
 
   // CloudExternalDataManagerBase:
-  virtual void OnPolicyStoreLoaded() OVERRIDE;
+  virtual void OnPolicyStoreLoaded() override;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountExternalDataManager);
 };
diff --git a/chrome/browser/chromeos/policy/device_local_account_external_data_service.h b/chrome/browser/chromeos/policy/device_local_account_external_data_service.h
index 2174ef8..f825d5d 100644
--- a/chrome/browser/chromeos/policy/device_local_account_external_data_service.h
+++ b/chrome/browser/chromeos/policy/device_local_account_external_data_service.h
@@ -36,8 +36,8 @@ class DeviceLocalAccountExternalDataService
   virtual ~DeviceLocalAccountExternalDataService();
 
   // DeviceLocalAccountPolicyService::Observer:
-  virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE;
-  virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
+  virtual void OnPolicyUpdated(const std::string& user_id) override;
+  virtual void OnDeviceLocalAccountsChanged() override;
 
   scoped_refptr<DeviceLocalAccountExternalDataManager>
       GetExternalDataManager(const std::string& account_id,
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
index 7807976..130c925 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.h
@@ -44,12 +44,12 @@ class DeviceLocalAccountPolicyProvider
       DeviceLocalAccountPolicyService* service);
 
   // ConfigurationPolicyProvider:
-  virtual bool IsInitializationComplete(PolicyDomain domain) const OVERRIDE;
-  virtual void RefreshPolicies() OVERRIDE;
+  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
+  virtual void RefreshPolicies() override;
 
   // DeviceLocalAccountPolicyService::Observer:
-  virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE;
-  virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
+  virtual void OnPolicyUpdated(const std::string& user_id) override;
+  virtual void OnDeviceLocalAccountsChanged() override;
 
  private:
   // Returns the broker for |user_id_| or NULL if not available.
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service.h b/chrome/browser/chromeos/policy/device_local_account_policy_service.h
index 6643960..814437e 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service.h
@@ -104,11 +104,11 @@ class DeviceLocalAccountPolicyBroker
   std::string GetDisplayName() const;
 
   // 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;
 
   // ComponentCloudPolicyService::Delegate:
-  virtual void OnComponentCloudPolicyUpdated() OVERRIDE;
+  virtual void OnComponentCloudPolicyUpdated() override;
 
  private:
   void CreateComponentCloudPolicyService(
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
index 6a86173..b9e81a4 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
@@ -81,8 +81,8 @@ class DeviceLocalAccountPolicyServiceTestBase
  public:
   DeviceLocalAccountPolicyServiceTestBase();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void CreatePolicyService();
 
@@ -112,10 +112,10 @@ class DeviceLocalAccountPolicyServiceTest
  protected:
   DeviceLocalAccountPolicyServiceTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
-  void InstallDevicePolicy() OVERRIDE;
+  void InstallDevicePolicy() override;
 
   MockDeviceLocalAccountPolicyServiceObserver service_observer_;
 
@@ -493,7 +493,7 @@ class DeviceLocalAccountPolicyExtensionCacheTest
  protected:
   DeviceLocalAccountPolicyExtensionCacheTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   base::FilePath GetCacheDirectoryForAccountID(const std::string& account_id);
 
@@ -772,8 +772,8 @@ class DeviceLocalAccountPolicyProviderTest
  protected:
   DeviceLocalAccountPolicyProviderTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   SchemaRegistry schema_registry_;
   scoped_ptr<DeviceLocalAccountPolicyProvider> provider_;
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.h b/chrome/browser/chromeos/policy/device_local_account_policy_store.h
index d0e2192..80383d3 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_store.h
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.h
@@ -49,8 +49,8 @@ class DeviceLocalAccountPolicyStore
 
   // CloudPolicyStore:
   virtual void Store(
-      const enterprise_management::PolicyFetchResponse& policy) OVERRIDE;
-  virtual void Load() OVERRIDE;
+      const enterprise_management::PolicyFetchResponse& policy) override;
+  virtual void Load() override;
 
  private:
   // Called back by |session_manager_client_| after policy retrieval. Checks for
diff --git a/chrome/browser/chromeos/policy/device_network_configuration_updater.h b/chrome/browser/chromeos/policy/device_network_configuration_updater.h
index bcf1dd2..b02b411 100644
--- a/chrome/browser/chromeos/policy/device_network_configuration_updater.h
+++ b/chrome/browser/chromeos/policy/device_network_configuration_updater.h
@@ -57,12 +57,12 @@ class DeviceNetworkConfigurationUpdater : public NetworkConfigurationUpdater {
       chromeos::NetworkDeviceHandler* network_device_handler,
       chromeos::CrosSettings* cros_settings);
 
-  virtual void Init() OVERRIDE;
+  virtual void Init() override;
   virtual void ImportCertificates(const base::ListValue& certificates_onc)
-      OVERRIDE;
+      override;
   virtual void ApplyNetworkPolicy(base::ListValue* network_configs_onc,
                                   base::DictionaryValue* global_network_config)
-      OVERRIDE;
+      override;
   void OnDataRoamingSettingChanged();
 
   chromeos::NetworkDeviceHandler* network_device_handler_;
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
index 9ec7f82..03847dd 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
@@ -47,8 +47,8 @@ class DevicePolicyCrosBrowserTest : public InProcessBrowserTest {
   DevicePolicyCrosBrowserTest();
   virtual ~DevicePolicyCrosBrowserTest();
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
-  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
+  virtual void SetUpInProcessBrowserTestFixture() override;
+  virtual void TearDownInProcessBrowserTestFixture() override;
 
   // Marks the device as enterprise-owned. Must be called to make device
   // policies apply Chrome-wide. If this is not called, device policies will
diff --git a/chrome/browser/chromeos/policy/device_status_collector.h b/chrome/browser/chromeos/policy/device_status_collector.h
index 7a77b0f..35e66a5 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.h
+++ b/chrome/browser/chromeos/policy/device_status_collector.h
@@ -63,10 +63,10 @@ class DeviceStatusCollector : public CloudPolicyClient::StatusProvider {
 
   // CloudPolicyClient::StatusProvider:
   virtual bool GetDeviceStatus(
-      enterprise_management::DeviceStatusReportRequest* status) OVERRIDE;
+      enterprise_management::DeviceStatusReportRequest* status) override;
   virtual bool GetSessionStatus(
-      enterprise_management::SessionStatusReportRequest* status) OVERRIDE;
-  virtual void OnSubmittedSuccessfully() OVERRIDE;
+      enterprise_management::SessionStatusReportRequest* status) override;
+  virtual void OnSubmittedSuccessfully() override;
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
index 9e1137d..6459fc9 100644
--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
@@ -108,14 +108,14 @@ class TestingDeviceStatusCollector : public policy::DeviceStatusCollector {
   }
 
  protected:
-  virtual void CheckIdleState() OVERRIDE {
+  virtual void CheckIdleState() override {
     // This should never be called in testing, as it results in a dbus call.
     ADD_FAILURE();
   }
 
   // Each time this is called, returns a time that is a fixed increment
   // later than the previous time.
-  virtual Time GetCurrentTime() OVERRIDE {
+  virtual Time GetCurrentTime() override {
     int poll_interval = policy::DeviceStatusCollector::kIdlePollIntervalSeconds;
     return baseline_time_ +
         TimeDelta::FromSeconds(poll_interval * baseline_offset_periods_++);
@@ -191,7 +191,7 @@ class DeviceStatusCollectorTest : public testing::Test {
     cros_settings_->AddSettingsProvider(device_settings_provider_);
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Disable network interface reporting since it requires additional setup.
     cros_settings_->SetBoolean(chromeos::kReportDeviceNetworkInterfaces, false);
   }
@@ -708,7 +708,7 @@ static const FakeDeviceData kFakeDevices[] = {
 class DeviceStatusCollectorNetworkInterfacesTest
     : public DeviceStatusCollectorTest {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     chromeos::DBusThreadManager::Initialize();
     chromeos::NetworkHandler::Initialize();
     chromeos::ShillDeviceClient::TestInterface* test_device_client =
@@ -740,7 +740,7 @@ class DeviceStatusCollectorNetworkInterfacesTest
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     chromeos::NetworkHandler::Shutdown();
     chromeos::DBusThreadManager::Shutdown();
   }
diff --git a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
index 397288e..e676c93 100644
--- a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
@@ -25,12 +25,12 @@ class SystemUse24HourClockPolicyTest
   SystemUse24HourClockPolicyTest() {
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
   }
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     InstallOwnerKey();
     MarkAsEnterpriseOwned();
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
diff --git a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
index 71bd5fa..38cd1d5 100644
--- a/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
+++ b/chrome/browser/chromeos/policy/enrollment_handler_chromeos.h
@@ -83,23 +83,23 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,
   scoped_ptr<CloudPolicyClient> ReleaseClient();
 
   // CloudPolicyClient::Observer:
-  virtual void OnPolicyFetched(CloudPolicyClient* client) OVERRIDE;
-  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) OVERRIDE;
-  virtual void OnRobotAuthCodesFetched(CloudPolicyClient* client) OVERRIDE;
-  virtual void OnClientError(CloudPolicyClient* client) OVERRIDE;
+  virtual void OnPolicyFetched(CloudPolicyClient* client) override;
+  virtual void OnRegistrationStateChanged(CloudPolicyClient* client) override;
+  virtual void OnRobotAuthCodesFetched(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;
 
   // GaiaOAuthClient::Delegate:
   virtual void OnGetTokensResponse(const std::string& refresh_token,
                                    const std::string& access_token,
-                                   int expires_in_seconds) OVERRIDE;
+                                   int expires_in_seconds) override;
   virtual void OnRefreshTokenResponse(const std::string& access_token,
-                                      int expires_in_seconds) OVERRIDE;
-  virtual void OnOAuthError() OVERRIDE;
-  virtual void OnNetworkError(int response_code) OVERRIDE;
+                                      int expires_in_seconds) override;
+  virtual void OnOAuthError() override;
+  virtual void OnNetworkError(int response_code) override;
 
  private:
   // Indicates what step of the process is currently pending. These steps need
diff --git a/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc b/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc
index 9b66adb..5df7349 100644
--- a/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc
+++ b/chrome/browser/chromeos/policy/enterprise_install_attributes_unittest.cc
@@ -43,7 +43,7 @@ class EnterpriseInstallAttributesTest : public testing::Test {
  protected:
   EnterpriseInstallAttributesTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
         chromeos::FILE_INSTALL_ATTRIBUTES, GetTempPath(), true, false));
@@ -52,7 +52,7 @@ class EnterpriseInstallAttributesTest : public testing::Test {
         chromeos::DBusThreadManager::Get()->GetCryptohomeClient()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     chromeos::DBusThreadManager::Shutdown();
   }
 
diff --git a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h
index 7668713..396b852 100644
--- a/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h
+++ b/chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h
@@ -21,8 +21,8 @@ class FakeDeviceCloudPolicyInitializer : public DeviceCloudPolicyInitializer {
  public:
   FakeDeviceCloudPolicyInitializer();
 
-  virtual void Init() OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
+  virtual void Init() override;
+  virtual void Shutdown() override;
 
   virtual void StartEnrollment(
       enterprise_management::PolicyData::ManagementMode management_mode,
@@ -30,7 +30,7 @@ class FakeDeviceCloudPolicyInitializer : public DeviceCloudPolicyInitializer {
       const std::string& auth_token,
       bool is_auto_enrollment,
       const AllowedDeviceModes& allowed_modes,
-      const EnrollmentCallback& enrollment_callback) OVERRIDE;
+      const EnrollmentCallback& enrollment_callback) override;
 
   bool was_start_enrollment_called() {
     return was_start_enrollment_called_;
diff --git a/chrome/browser/chromeos/policy/login_profile_policy_provider.h b/chrome/browser/chromeos/policy/login_profile_policy_provider.h
index e8fbd91..6680394 100644
--- a/chrome/browser/chromeos/policy/login_profile_policy_provider.h
+++ b/chrome/browser/chromeos/policy/login_profile_policy_provider.h
@@ -24,15 +24,15 @@ class LoginProfilePolicyProvider : public ConfigurationPolicyProvider,
   virtual ~LoginProfilePolicyProvider();
 
   // ConfigurationPolicyProvider:
-  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;
 
   // PolicyService::Observer:
   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;
 
   void OnDevicePolicyRefreshDone();
 
diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
index 3142f4e..4349e208 100644
--- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
@@ -85,8 +85,8 @@ class LoginScreenDefaultPolicyBrowsertestBase
   virtual ~LoginScreenDefaultPolicyBrowsertestBase();
 
   // DevicePolicyCrosBrowserTest:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpInProcessBrowserTestFixture() override;
+  virtual void SetUpOnMainThread() override;
 
   void RefreshDevicePolicyAndWaitForPrefChange(const char* pref_name);
 
@@ -103,9 +103,9 @@ class LoginScreenDefaultPolicyLoginScreenBrowsertest
   virtual ~LoginScreenDefaultPolicyLoginScreenBrowsertest();
 
   // LoginScreenDefaultPolicyBrowsertestBase:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void TearDownOnMainThread() OVERRIDE;
+  virtual void SetUpCommandLine(CommandLine* command_line) override;
+  virtual void SetUpOnMainThread() override;
+  virtual void TearDownOnMainThread() override;
 
   void VerifyPrefFollowsRecommendation(const char* pref_name,
                                        const base::Value& recommended_value);
@@ -121,7 +121,7 @@ class LoginScreenDefaultPolicyInSessionBrowsertest
   virtual ~LoginScreenDefaultPolicyInSessionBrowsertest();
 
   // LoginScreenDefaultPolicyBrowsertestBase:
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
   void VerifyPrefFollowsDefault(const char* pref_name);
 
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater.h b/chrome/browser/chromeos/policy/network_configuration_updater.h
index e4da21b..93d9674 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater.h
+++ b/chrome/browser/chromeos/policy/network_configuration_updater.h
@@ -40,8 +40,8 @@ class NetworkConfigurationUpdater : public PolicyService::Observer {
   // PolicyService::Observer overrides
   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;
 
  protected:
   NetworkConfigurationUpdater(
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
index 2629ee4..0d508ed 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
@@ -60,7 +60,7 @@ class FakeUser : public user_manager::User {
   virtual ~FakeUser() {}
 
   // User overrides
-  virtual user_manager::UserType GetType() const OVERRIDE {
+  virtual user_manager::UserType GetType() const override {
     return user_manager::USER_TYPE_REGULAR;
   }
 
@@ -74,7 +74,7 @@ class FakeWebTrustedCertsObserver
   FakeWebTrustedCertsObserver() {}
 
   virtual void OnTrustAnchorsChanged(
-      const net::CertificateList& trust_anchors) OVERRIDE {
+      const net::CertificateList& trust_anchors) override {
     trust_anchors_ = trust_anchors;
   }
   net::CertificateList trust_anchors_;
@@ -87,7 +87,7 @@ class FakeNetworkDeviceHandler : public chromeos::FakeNetworkDeviceHandler {
   public:
    FakeNetworkDeviceHandler() : allow_roaming_(false) {}
 
-   virtual void SetCellularAllowRoaming(bool allow_roaming) OVERRIDE {
+   virtual void SetCellularAllowRoaming(bool allow_roaming) override {
      allow_roaming_ = allow_roaming;
    }
 
@@ -124,7 +124,7 @@ class FakeCertificateImporter : public chromeos::onc::CertificateImporter {
 
   virtual void ImportCertificates(const base::ListValue& certificates,
                                   ::onc::ONCSource source,
-                                  const DoneCallback& done_callback) OVERRIDE {
+                                  const DoneCallback& done_callback) override {
     if (expected_onc_source_ != ::onc::ONC_SOURCE_UNKNOWN)
       EXPECT_EQ(expected_onc_source_, source);
     if (expected_onc_certificates_) {
@@ -202,7 +202,7 @@ class NetworkConfigurationUpdaterTest : public testing::Test {
  protected:
   NetworkConfigurationUpdaterTest() : certificate_importer_(NULL) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(provider_, IsInitializationComplete(_))
         .WillRepeatedly(Return(false));
     provider_.Init();
@@ -232,7 +232,7 @@ class NetworkConfigurationUpdaterTest : public testing::Test {
     certificate_importer_owned_.reset(certificate_importer_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     network_configuration_updater_.reset();
     provider_.Shutdown();
     base::RunLoop().RunUntilIdle();
diff --git a/chrome/browser/chromeos/policy/policy_cert_service.h b/chrome/browser/chromeos/policy/policy_cert_service.h
index e32ca25..b014edf 100644
--- a/chrome/browser/chromeos/policy/policy_cert_service.h
+++ b/chrome/browser/chromeos/policy/policy_cert_service.h
@@ -56,10 +56,10 @@ class PolicyCertService
 
   // UserNetworkConfigurationUpdater::WebTrustedCertsObserver:
   virtual void OnTrustAnchorsChanged(const net::CertificateList& trust_anchors)
-      OVERRIDE;
+      override;
 
   // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   static scoped_ptr<PolicyCertService> CreateForTesting(
       const std::string& user_id,
diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.h b/chrome/browser/chromeos/policy/policy_cert_service_factory.h
index b3c9d4e..6a5e50b 100644
--- a/chrome/browser/chromeos/policy/policy_cert_service_factory.h
+++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.h
@@ -56,12 +56,12 @@ class PolicyCertServiceFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   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;
   virtual void RegisterProfilePrefs(
-      user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+      user_prefs::PrefRegistrySyncable* registry) override;
+  virtual bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyCertServiceFactory);
 };
diff --git a/chrome/browser/chromeos/policy/policy_cert_verifier.h b/chrome/browser/chromeos/policy/policy_cert_verifier.h
index 6a2f0ff..a7f9b80 100644
--- a/chrome/browser/chromeos/policy/policy_cert_verifier.h
+++ b/chrome/browser/chromeos/policy/policy_cert_verifier.h
@@ -54,12 +54,12 @@ class PolicyCertVerifier : public net::CertVerifier,
                      net::CertVerifyResult* verify_result,
                      const net::CompletionCallback& callback,
                      RequestHandle* out_req,
-                     const net::BoundNetLog& net_log) OVERRIDE;
+                     const net::BoundNetLog& net_log) override;
 
-  virtual void CancelRequest(RequestHandle req) OVERRIDE;
+  virtual void CancelRequest(RequestHandle req) override;
 
   // CertTrustAnchorProvider:
-  virtual const net::CertificateList& GetAdditionalTrustAnchors() OVERRIDE;
+  virtual const net::CertificateList& GetAdditionalTrustAnchors() override;
 
  private:
   net::CertificateList trust_anchors_;
diff --git a/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc b/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
index 3196661d..46b64f4 100644
--- a/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
+++ b/chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc
@@ -34,7 +34,7 @@ class PolicyCertVerifierTest : public testing::Test {
 
   virtual ~PolicyCertVerifierTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(test_nss_user_.constructed_successfully());
     test_nss_user_.FinishInit();
 
@@ -57,7 +57,7 @@ class PolicyCertVerifierTest : public testing::Test {
     test_ca_cert_list_.push_back(test_ca_cert_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Destroy |cert_verifier_| before destroying the ThreadBundle, otherwise
     // BrowserThread::CurrentlyOn checks fail.
     cert_verifier_.reset();
diff --git a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
index a9ff26d..2fc2b2f 100644
--- a/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
+++ b/chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h
@@ -65,14 +65,14 @@ class PolicyOAuth2TokenFetcher
  private:
   // GaiaAuthConsumer overrides.
   virtual void OnClientOAuthSuccess(
-      const GaiaAuthConsumer::ClientOAuthResult& oauth_tokens) OVERRIDE;
+      const GaiaAuthConsumer::ClientOAuthResult& oauth_tokens) override;
   virtual void OnClientOAuthFailure(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      const GoogleServiceAuthError& error) override;
 
   // OAuth2AccessTokenConsumer overrides.
   virtual void OnGetTokenSuccess(const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
-  virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) OVERRIDE;
+                                 const base::Time& expiration_time) override;
+  virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) override;
 
   // Starts fetching OAuth2 refresh token.
   void StartFetchingRefreshToken();
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index feacbd1..022cd3d 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -123,8 +123,8 @@ class PowerPolicyBrowserTestBase : public DevicePolicyCrosBrowserTest {
   PowerPolicyBrowserTestBase();
 
   // DevicePolicyCrosBrowserTest:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpInProcessBrowserTestFixture() override;
+  virtual void SetUpOnMainThread() override;
 
   void InstallUserKey();
   void StoreAndReloadUserPolicy();
@@ -155,9 +155,9 @@ class PowerPolicyLoginScreenBrowserTest : public PowerPolicyBrowserTestBase {
   PowerPolicyLoginScreenBrowserTest();
 
   // PowerPolicyBrowserTestBase:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void TearDownOnMainThread() OVERRIDE;
+  virtual void SetUpCommandLine(CommandLine* command_line) override;
+  virtual void SetUpOnMainThread() override;
+  virtual void TearDownOnMainThread() override;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPolicyLoginScreenBrowserTest);
 };
@@ -167,7 +167,7 @@ class PowerPolicyInSessionBrowserTest : public PowerPolicyBrowserTestBase {
   PowerPolicyInSessionBrowserTest();
 
   // PowerPolicyBrowserTestBase:
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPolicyInSessionBrowserTest);
 };
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h
index c81b06e..4e96c60 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer.h
+++ b/chrome/browser/chromeos/policy/recommendation_restorer.h
@@ -34,15 +34,15 @@ class RecommendationRestorer : public KeyedService,
   virtual ~RecommendationRestorer();
 
   // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // wm::UserActivityObserver:
-  virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
+  virtual void OnUserActivity(const ui::Event* event) override;
 
   // If a recommended value and a user setting exist for |pref_name|, clears the
   // user setting so that the recommended value can take effect. If
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h
index 5d36fba..e137d0d 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h
+++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h
@@ -25,8 +25,8 @@ class RecommendationRestorerFactory : public BrowserContextKeyedServiceFactory {
  protected:
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
+      content::BrowserContext* context) const override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
 
  private:
   friend struct DefaultSingletonTraits<RecommendationRestorerFactory>;
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
index 03018ce..9875951 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
+++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
@@ -41,7 +41,7 @@ class RecommendationRestorerTest : public testing::Test {
   RecommendationRestorerTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void RegisterUserProfilePrefs();
   void RegisterLoginProfilePrefs();
diff --git a/chrome/browser/chromeos/policy/ticl_device_settings_provider.h b/chrome/browser/chromeos/policy/ticl_device_settings_provider.h
index 9da8f27..85cf48e 100644
--- a/chrome/browser/chromeos/policy/ticl_device_settings_provider.h
+++ b/chrome/browser/chromeos/policy/ticl_device_settings_provider.h
@@ -19,7 +19,7 @@ class TiclDeviceSettingsProvider : public invalidation::TiclSettingsProvider {
   virtual ~TiclDeviceSettingsProvider();
 
   // TiclInvalidationServiceSettingsProvider:
-  virtual bool UseGCMChannel() const OVERRIDE;
+  virtual bool UseGCMChannel() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TiclDeviceSettingsProvider);
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
index 8e55eb5..c8e9fb4 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
@@ -90,23 +90,23 @@ class UserCloudPolicyManagerChromeOS : public CloudPolicyManager,
   void EnableWildcardLoginCheck(const std::string& username);
 
   // ConfigurationPolicyProvider:
-  virtual void Shutdown() OVERRIDE;
-  virtual bool IsInitializationComplete(PolicyDomain domain) const OVERRIDE;
+  virtual void Shutdown() override;
+  virtual bool IsInitializationComplete(PolicyDomain domain) const override;
 
   // CloudPolicyService::Observer:
-  virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE;
+  virtual void OnInitializationCompleted(CloudPolicyService* service) override;
 
   // 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;
 
   // ComponentCloudPolicyService::Delegate:
-  virtual void OnComponentCloudPolicyUpdated() OVERRIDE;
+  virtual void OnComponentCloudPolicyUpdated() override;
 
  protected:
   // CloudPolicyManager:
-  virtual void GetChromePolicy(PolicyMap* policy_map) OVERRIDE;
+  virtual void GetChromePolicy(PolicyMap* policy_map) override;
 
  private:
   // Fetches a policy token using the authentication context of the signin
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
index 2ecec4c..e66780a 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
@@ -58,7 +58,7 @@ class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest {
 
   virtual ~UserCloudPolicyManagerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     SetServerPolicy();
 
@@ -68,13 +68,13 @@ class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest {
     OobeBaseTest::SetUp();
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl,
                                     test_server_->GetServiceURL().spec());
     OobeBaseTest::SetUpCommandLine(command_line);
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     SetMergeSessionParams(kAccountId);
     SetupGaiaServerWithAccessTokens();
     OobeBaseTest::SetUpOnMainThread();
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
index 4490749..087b82a 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
@@ -82,7 +82,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
         profile_(NULL),
         signin_profile_(NULL) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // The initialization path that blocks on the initial policy fetch requires
     // a signin Profile to use its URLRequestContext.
     profile_manager_.reset(
@@ -144,7 +144,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
         .Times(AnyNumber());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (token_forwarder_)
       token_forwarder_->Shutdown();
     if (manager_) {
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
index e1cf16f..077daf9 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
@@ -76,13 +76,13 @@ class UserCloudPolicyManagerFactoryChromeOS
 
   // BrowserContextKeyedBaseFactory:
   virtual void BrowserContextShutdown(
-      content::BrowserContext* context) OVERRIDE;
+      content::BrowserContext* context) override;
   virtual void BrowserContextDestroyed(
-      content::BrowserContext* context) OVERRIDE;
+      content::BrowserContext* context) override;
   virtual void SetEmptyTestingFactory(
-      content::BrowserContext* context) OVERRIDE;
-  virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE;
-  virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE;
+      content::BrowserContext* context) override;
+  virtual bool HasTestingFactory(content::BrowserContext* context) override;
+  virtual void CreateServiceNow(content::BrowserContext* context) override;
 
   typedef std::map<Profile*, UserCloudPolicyManagerChromeOS*> ManagerMap;
   ManagerMap managers_;
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
index 2f2f86f..f252624 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.cc
@@ -76,12 +76,12 @@ class LegacyPolicyCacheLoader : public UserPolicyTokenLoader::Delegate,
 
   // UserPolicyTokenLoader::Delegate:
   virtual void OnTokenLoaded(const std::string& token,
-                             const std::string& device_id) OVERRIDE;
+                             const std::string& device_id) override;
 
   // UserPolicyDiskCache::Delegate:
   virtual void OnDiskCacheLoaded(
       UserPolicyDiskCache::LoadResult result,
-      const em::CachedCloudPolicyResponse& policy) OVERRIDE;
+      const em::CachedCloudPolicyResponse& policy) override;
 
  private:
   // Checks whether the load operations from the legacy caches completed. If so,
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
index 65d3832..07805d9 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h
@@ -52,8 +52,8 @@ class UserCloudPolicyStoreChromeOS : public UserCloudPolicyStoreBase {
 
   // CloudPolicyStore:
   virtual void Store(
-      const enterprise_management::PolicyFetchResponse& policy) OVERRIDE;
-  virtual void Load() OVERRIDE;
+      const enterprise_management::PolicyFetchResponse& policy) override;
+  virtual void Load() override;
 
   // Loads the policy synchronously on the current thread.
   void LoadImmediately();
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
index f695148..a1d834f 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
@@ -54,7 +54,7 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test {
  protected:
   UserCloudPolicyStoreChromeOSTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(cryptohome_client_,
                 GetSanitizedUsername(PolicyBuilder::kFakeUsername, _))
         .Times(AnyNumber())
@@ -82,7 +82,7 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test {
     policy_.Build();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     store_->RemoveObserver(&observer_);
     store_.reset();
     RunUntilIdle();
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h
index 04148d8..76f322b 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h
@@ -36,20 +36,20 @@ class UserCloudPolicyTokenForwarder : public KeyedService,
   virtual ~UserCloudPolicyTokenForwarder();
 
   // KeyedService:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
 
   // 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;
 
   // CloudPolicyService::Observer:
-  virtual void OnInitializationCompleted(CloudPolicyService* service) OVERRIDE;
+  virtual void OnInitializationCompleted(CloudPolicyService* service) override;
 
  private:
   void Initialize();
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h
index b138507..5f62067 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h
@@ -31,9 +31,9 @@ class UserCloudPolicyTokenForwarderFactory
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+      content::BrowserContext* context) const override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
+  virtual bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyTokenForwarderFactory);
 };
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.h b/chrome/browser/chromeos/policy/user_network_configuration_updater.h
index b851242..3c85009 100644
--- a/chrome/browser/chromeos/policy/user_network_configuration_updater.h
+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.h
@@ -102,16 +102,16 @@ class UserNetworkConfigurationUpdater : public NetworkConfigurationUpdater,
 
   // NetworkConfigurationUpdater:
   virtual void ImportCertificates(
-      const base::ListValue& certificates_onc) OVERRIDE;
+      const base::ListValue& certificates_onc) override;
   virtual void ApplyNetworkPolicy(
       base::ListValue* network_configs_onc,
-      base::DictionaryValue* global_network_config) OVERRIDE;
+      base::DictionaryValue* global_network_config) override;
 
   // content::NotificationObserver implementation. Observes the profile to which
   // |this| belongs to for PROFILE_ADDED notification.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Creates onc::CertImporter with |database| and passes it to
   // |SetCertificateImporter|.
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h
index 52257b9..ab1c2fe 100644
--- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h
+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h
@@ -37,11 +37,11 @@ class UserNetworkConfigurationUpdaterFactory
 
   // BrowserContextKeyedServiceFactory:
   virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+      content::BrowserContext* context) const override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
+  virtual bool ServiceIsNULLWhileTesting() const override;
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(UserNetworkConfigurationUpdaterFactory);
 };
diff --git a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
index 86c6a70..c8eba3d 100644
--- a/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/variations_service_policy_browsertest.cc
@@ -17,7 +17,7 @@ class VariationsServiceDevicePolicyTest : public DevicePolicyCrosBrowserTest {
  protected:
   VariationsServiceDevicePolicyTest() {}
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
 
     InstallOwnerKey();
diff --git a/chrome/browser/chromeos/policy/wildcard_login_checker.h b/chrome/browser/chromeos/policy/wildcard_login_checker.h
index 358788d..d3ca9a4 100644
--- a/chrome/browser/chromeos/policy/wildcard_login_checker.h
+++ b/chrome/browser/chromeos/policy/wildcard_login_checker.h
@@ -47,9 +47,9 @@ class WildcardLoginChecker : public UserInfoFetcher::Delegate {
 
   // UserInfoFetcher::Delegate:
   virtual void OnGetUserInfoSuccess(const base::DictionaryValue* response)
-      OVERRIDE;
+      override;
   virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
+      override;
 
  private:
   // Starts the check after successful token minting.