replace OVERRIDE and FINAL with override and final in chromeos/

BUG=417463

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

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

chromeos/attestation/mock_attestation_flow.h

@@ -25,10 +25,10 @@ class FakeServerProxy : public ServerProxy {
   }
 
   virtual void SendEnrollRequest(const std::string& request,
-                                 const DataCallback& callback) OVERRIDE;
+                                 const DataCallback& callback) override;
 
   virtual void SendCertificateRequest(const std::string& request,
-                                      const DataCallback& callback) OVERRIDE;
+                                      const DataCallback& callback) override;
 
  private:
   bool result_;

chromeos/audio/audio_devices_pref_handler_stub.h

@@ -22,16 +22,16 @@ class CHROMEOS_EXPORT AudioDevicesPrefHandlerStub
 
   AudioDevicesPrefHandlerStub();
 
-  virtual double GetOutputVolumeValue(const AudioDevice* device) OVERRIDE;
-  virtual double GetInputGainValue(const AudioDevice* device) OVERRIDE;
+  virtual double GetOutputVolumeValue(const AudioDevice* device) override;
+  virtual double GetInputGainValue(const AudioDevice* device) override;
   virtual void SetVolumeGainValue(const AudioDevice& device,
-                                  double value) OVERRIDE;
-  virtual bool GetMuteValue(const AudioDevice& device) OVERRIDE;
-  virtual void SetMuteValue(const AudioDevice& device, bool mute_on) OVERRIDE;
-  virtual bool GetAudioCaptureAllowedValue() OVERRIDE;
-  virtual bool GetAudioOutputAllowedValue() OVERRIDE;
-  virtual void AddAudioPrefObserver(AudioPrefObserver* observer) OVERRIDE;
-  virtual void RemoveAudioPrefObserver(AudioPrefObserver* observer) OVERRIDE;
+                                  double value) override;
+  virtual bool GetMuteValue(const AudioDevice& device) override;
+  virtual void SetMuteValue(const AudioDevice& device, bool mute_on) override;
+  virtual bool GetAudioCaptureAllowedValue() override;
+  virtual bool GetAudioOutputAllowedValue() override;
+  virtual void AddAudioPrefObserver(AudioPrefObserver* observer) override;
+  virtual void RemoveAudioPrefObserver(AudioPrefObserver* observer) override;
 
  protected:
   virtual ~AudioDevicesPrefHandlerStub();

chromeos/audio/cras_audio_handler.h

@@ -202,16 +202,16 @@ class CHROMEOS_EXPORT CrasAudioHandler : public CrasAudioClient::Observer,
   friend class CrasAudioHandlerTest;
 
   // CrasAudioClient::Observer overrides.
-  virtual void AudioClientRestarted() OVERRIDE;
-  virtual void NodesChanged() OVERRIDE;
-  virtual void ActiveOutputNodeChanged(uint64 node_id) OVERRIDE;
-  virtual void ActiveInputNodeChanged(uint64 node_id) OVERRIDE;
+  virtual void AudioClientRestarted() override;
+  virtual void NodesChanged() override;
+  virtual void ActiveOutputNodeChanged(uint64 node_id) override;
+  virtual void ActiveInputNodeChanged(uint64 node_id) override;
 
   // AudioPrefObserver overrides.
-  virtual void OnAudioPolicyPrefChanged() OVERRIDE;
+  virtual void OnAudioPolicyPrefChanged() override;
 
   // SessionManagerClient::Observer overrides.
-  virtual void EmitLoginPromptVisibleCalled() OVERRIDE;
+  virtual void EmitLoginPromptVisibleCalled() override;
 
   // Sets the active audio output/input node to the node with |node_id|.
   void SetActiveOutputNode(uint64 node_id);

chromeos/audio/cras_audio_handler_unittest.cc

@@ -193,31 +193,31 @@ class TestObserver : public chromeos::CrasAudioHandler::AudioObserver {
 
  protected:
   // chromeos::CrasAudioHandler::AudioObserver overrides.
-  virtual void OnActiveOutputNodeChanged() OVERRIDE {
+  virtual void OnActiveOutputNodeChanged() override {
     ++active_output_node_changed_count_;
   }
 
-  virtual void OnActiveInputNodeChanged() OVERRIDE {
+  virtual void OnActiveInputNodeChanged() override {
     ++active_input_node_changed_count_;
   }
 
-  virtual void OnAudioNodesChanged() OVERRIDE {
+  virtual void OnAudioNodesChanged() override {
     ++audio_nodes_changed_count_;
   }
 
-  virtual void OnOutputMuteChanged() OVERRIDE {
+  virtual void OnOutputMuteChanged() override {
     ++output_mute_changed_count_;
   }
 
-  virtual void OnInputMuteChanged() OVERRIDE {
+  virtual void OnInputMuteChanged() override {
     ++input_mute_changed_count_;
   }
 
-  virtual void OnOutputVolumeChanged() OVERRIDE {
+  virtual void OnOutputVolumeChanged() override {
     ++output_volume_changed_count_;
   }
 
-  virtual void OnInputGainChanged() OVERRIDE {
+  virtual void OnInputGainChanged() override {
     ++input_gain_changed_count_;
   }
 
@@ -240,10 +240,10 @@ class CrasAudioHandlerTest : public testing::Test {
   }
   virtual ~CrasAudioHandlerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     cras_audio_handler_->RemoveAudioObserver(test_observer_.get());
     test_observer_.reset();
     CrasAudioHandler::Shutdown();

chromeos/cert_loader.h

@@ -107,9 +107,9 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer {
   void NotifyCertificatesLoaded(bool initial_load);
 
   // net::CertDatabase::Observer
-  virtual void OnCACertChanged(const net::X509Certificate* cert) OVERRIDE;
-  virtual void OnCertAdded(const net::X509Certificate* cert) OVERRIDE;
-  virtual void OnCertRemoved(const net::X509Certificate* cert) OVERRIDE;
+  virtual void OnCACertChanged(const net::X509Certificate* cert) override;
+  virtual void OnCertAdded(const net::X509Certificate* cert) override;
+  virtual void OnCertRemoved(const net::X509Certificate* cert) override;
 
   ObserverList<Observer> observers_;
 

chromeos/cert_loader_unittest.cc

@@ -53,7 +53,7 @@ class CertLoaderTest : public testing::Test,
 
   virtual ~CertLoaderTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(primary_user_.constructed_successfully());
     ASSERT_TRUE(
         crypto::GetPublicSlotForChromeOSUser(primary_user_.username_hash()));
@@ -80,7 +80,7 @@ class CertLoaderTest : public testing::Test,
   // CertLoader::Observer:
   // The test keeps count of times the observer method was called.
   virtual void OnCertificatesLoaded(const net::CertificateList& cert_list,
-                                    bool initial_load) OVERRIDE {
+                                    bool initial_load) override {
     EXPECT_TRUE(certificates_loaded_events_count_ == 0 || !initial_load);
     certificates_loaded_events_count_++;
   }

chromeos/cryptohome/async_method_caller.cc

@@ -37,7 +37,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
 
   virtual void AsyncCheckKey(const std::string& user_email,
                              const std::string& passhash,
-                             Callback callback) OVERRIDE {
+                             Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncCheckKey(user_email, passhash, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -49,7 +49,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   virtual void AsyncMigrateKey(const std::string& user_email,
                                const std::string& old_hash,
                                const std::string& new_hash,
-                               Callback callback) OVERRIDE {
+                               Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMigrateKey(user_email, old_hash, new_hash, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -61,7 +61,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   virtual void AsyncMount(const std::string& user_email,
                           const std::string& passhash,
                           int flags,
-                          Callback callback) OVERRIDE {
+                          Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMount(user_email, passhash, flags, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -73,7 +73,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   virtual void AsyncAddKey(const std::string& user_email,
                            const std::string& passhash,
                            const std::string& new_passhash,
-                           Callback callback) OVERRIDE {
+                           Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncAddKey(user_email, passhash, new_passhash, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -82,7 +82,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async key addition."));
   }
 
-  virtual void AsyncMountGuest(Callback callback) OVERRIDE {
+  virtual void AsyncMountGuest(Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMountGuest(base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -93,7 +93,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
 
   virtual void AsyncMountPublic(const std::string& public_mount_id,
                                 int flags,
-                                Callback callback) OVERRIDE {
+                                Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMountPublic(public_mount_id, flags, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -103,7 +103,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   }
 
   virtual void AsyncRemove(const std::string& user_email,
-                           Callback callback) OVERRIDE {
+                           Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncRemove(user_email, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -114,7 +114,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
 
   virtual void AsyncTpmAttestationCreateEnrollRequest(
       chromeos::attestation::PrivacyCAType pca_type,
-      const DataCallback& callback) OVERRIDE {
+      const DataCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncTpmAttestationCreateEnrollRequest(pca_type, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncDataCallback,
@@ -126,7 +126,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   virtual void AsyncTpmAttestationEnroll(
       chromeos::attestation::PrivacyCAType pca_type,
       const std::string& pca_response,
-      const Callback& callback) OVERRIDE {
+      const Callback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncTpmAttestationEnroll(pca_type, pca_response, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -140,7 +140,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       chromeos::attestation::AttestationCertificateProfile certificate_profile,
       const std::string& user_id,
       const std::string& request_origin,
-      const DataCallback& callback) OVERRIDE {
+      const DataCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncTpmAttestationCreateCertRequest(
             pca_type,
@@ -158,7 +158,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       chromeos::attestation::AttestationKeyType key_type,
       const std::string& user_id,
       const std::string& key_name,
-      const DataCallback& callback) OVERRIDE {
+      const DataCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncTpmAttestationFinishCertRequest(
             pca_response,
@@ -176,7 +176,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       chromeos::attestation::AttestationKeyType key_type,
       const std::string& user_id,
       const std::string& key_name,
-      const Callback& callback) OVERRIDE {
+      const Callback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         TpmAttestationRegisterKey(
             key_type,
@@ -197,7 +197,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       const std::string& device_id,
       chromeos::attestation::AttestationChallengeOptions options,
       const std::string& challenge,
-      const DataCallback& callback) OVERRIDE {
+      const DataCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         TpmAttestationSignEnterpriseChallenge(
             key_type,
@@ -219,7 +219,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
       const std::string& user_id,
       const std::string& key_name,
       const std::string& challenge,
-      const DataCallback& callback) OVERRIDE {
+      const DataCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         TpmAttestationSignSimpleChallenge(
             key_type,
@@ -235,7 +235,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
 
   virtual void AsyncGetSanitizedUsername(
       const std::string& user,
-      const DataCallback& callback) OVERRIDE {
+      const DataCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         GetSanitizedUsername(user,
         base::Bind(

chromeos/cryptohome/homedir_methods.cc

@@ -178,7 +178,7 @@ class HomedirMethodsImpl : public HomedirMethods {
 
   virtual void GetKeyDataEx(const Identification& id,
                             const std::string& label,
-                            const GetKeyDataCallback& callback) OVERRIDE {
+                            const GetKeyDataCallback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest kEmptyAuthProto;
     cryptohome::GetKeyDataRequest request;
@@ -197,7 +197,7 @@ class HomedirMethodsImpl : public HomedirMethods {
 
   virtual void CheckKeyEx(const Identification& id,
                           const Authorization& auth,
-                          const Callback& callback) OVERRIDE {
+                          const Callback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::CheckKeyRequest request;
@@ -217,7 +217,7 @@ class HomedirMethodsImpl : public HomedirMethods {
   virtual void MountEx(const Identification& id,
                        const Authorization& auth,
                        const MountParameters& request,
-                       const MountCallback& callback) OVERRIDE {
+                       const MountCallback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::MountRequest request_proto;
@@ -247,7 +247,7 @@ class HomedirMethodsImpl : public HomedirMethods {
                         const Authorization& auth,
                         const KeyDefinition& new_key,
                         bool clobber_if_exists,
-                        const Callback& callback) OVERRIDE {
+                        const Callback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::AddKeyRequest request;
@@ -269,7 +269,7 @@ class HomedirMethodsImpl : public HomedirMethods {
   virtual void RemoveKeyEx(const Identification& id,
                            const Authorization& auth,
                            const std::string& label,
-                           const Callback& callback) OVERRIDE {
+                           const Callback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::RemoveKeyRequest request;
@@ -291,7 +291,7 @@ class HomedirMethodsImpl : public HomedirMethods {
                            const Authorization& auth,
                            const KeyDefinition& new_key,
                            const std::string& signature,
-                           const Callback& callback) OVERRIDE {
+                           const Callback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::UpdateKeyRequest pb_update_key;

chromeos/cryptohome/homedir_methods_unittest.cc

@@ -49,8 +49,8 @@ class HomedirMethodsTest : public testing::Test {
   virtual ~HomedirMethodsTest();
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void RunProtobufMethodCallback(
       const chromeos::CryptohomeClient::ProtobufMethodCallback& callback);

chromeos/cryptohome/system_salt_getter_unittest.cc

@@ -24,7 +24,7 @@ class SystemSaltGetterTest : public testing::Test {
  protected:
   SystemSaltGetterTest() : fake_cryptohome_client_(NULL) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     fake_cryptohome_client_ = new FakeCryptohomeClient;
     DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient(
         scoped_ptr<CryptohomeClient>(fake_cryptohome_client_));
@@ -35,7 +35,7 @@ class SystemSaltGetterTest : public testing::Test {
     ASSERT_TRUE(SystemSaltGetter::Get());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     SystemSaltGetter::Shutdown();
     DBusThreadManager::Shutdown();
   }

chromeos/dbus/blocking_method_caller_unittest.cc

@@ -27,11 +27,11 @@ class FakeTaskRunner : public base::TaskRunner {
  public:
   virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
                                const base::Closure& task,
-                               base::TimeDelta delay) OVERRIDE {
+                               base::TimeDelta delay) override {
     task.Run();
     return true;
   }
-  virtual bool RunsTasksOnCurrentThread() const OVERRIDE { return true; }
+  virtual bool RunsTasksOnCurrentThread() const override { return true; }
 
  protected:
   virtual ~FakeTaskRunner() {}