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}

4 files changed, 25 insertions, 25 deletions

diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc
index 5d9b844..3bebd30 100644
--- a/chromeos/cryptohome/async_method_caller.cc
+++ b/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(
diff --git a/chromeos/cryptohome/homedir_methods.cc b/chromeos/cryptohome/homedir_methods.cc
index 371108a..6589030 100644
--- a/chromeos/cryptohome/homedir_methods.cc
+++ b/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;
diff --git a/chromeos/cryptohome/homedir_methods_unittest.cc b/chromeos/cryptohome/homedir_methods_unittest.cc
index f22fa62..d028b89 100644
--- a/chromeos/cryptohome/homedir_methods_unittest.cc
+++ b/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);
diff --git a/chromeos/cryptohome/system_salt_getter_unittest.cc b/chromeos/cryptohome/system_salt_getter_unittest.cc
index db6bc7b..f60bc7f 100644
--- a/chromeos/cryptohome/system_salt_getter_unittest.cc
+++ b/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();
   }