Update {virtual,override,final} to follow C++11 style in chromeos.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463
R=zelidrag@chromium.org

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

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

4 files changed, 62 insertions, 65 deletions

diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc
index 37a8168..0b137b0 100644
--- a/chromeos/cryptohome/async_method_caller.cc
+++ b/chromeos/cryptohome/async_method_caller.cc
@@ -30,14 +30,14 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  virtual ~AsyncMethodCallerImpl() {
+  ~AsyncMethodCallerImpl() override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         ResetAsyncCallStatusHandlers();
   }
 
-  virtual void AsyncCheckKey(const std::string& user_email,
-                             const std::string& passhash,
-                             Callback callback) override {
+  void AsyncCheckKey(const std::string& user_email,
+                     const std::string& passhash,
+                     Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncCheckKey(user_email, passhash, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -46,10 +46,10 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async check of user's key."));
   }
 
-  virtual void AsyncMigrateKey(const std::string& user_email,
-                               const std::string& old_hash,
-                               const std::string& new_hash,
-                               Callback callback) override {
+  void AsyncMigrateKey(const std::string& user_email,
+                       const std::string& old_hash,
+                       const std::string& new_hash,
+                       Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMigrateKey(user_email, old_hash, new_hash, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -58,10 +58,10 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate aync migration of user's key"));
   }
 
-  virtual void AsyncMount(const std::string& user_email,
-                          const std::string& passhash,
-                          int flags,
-                          Callback callback) override {
+  void AsyncMount(const std::string& user_email,
+                  const std::string& passhash,
+                  int flags,
+                  Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMount(user_email, passhash, flags, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -70,10 +70,10 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async mount of cryptohome."));
   }
 
-  virtual void AsyncAddKey(const std::string& user_email,
-                           const std::string& passhash,
-                           const std::string& new_passhash,
-                           Callback callback) override {
+  void AsyncAddKey(const std::string& user_email,
+                   const std::string& passhash,
+                   const std::string& new_passhash,
+                   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 {
+  void AsyncMountGuest(Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMountGuest(base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -91,9 +91,9 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async mount of cryptohome."));
   }
 
-  virtual void AsyncMountPublic(const std::string& public_mount_id,
-                                int flags,
-                                Callback callback) override {
+  void AsyncMountPublic(const std::string& public_mount_id,
+                        int flags,
+                        Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncMountPublic(public_mount_id, flags, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -102,8 +102,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async mount public of cryptohome."));
   }
 
-  virtual void AsyncRemove(const std::string& user_email,
-                           Callback callback) override {
+  void AsyncRemove(const std::string& user_email, Callback callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncRemove(user_email, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -112,7 +111,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async removal of cryptohome."));
   }
 
-  virtual void AsyncTpmAttestationCreateEnrollRequest(
+  void AsyncTpmAttestationCreateEnrollRequest(
       chromeos::attestation::PrivacyCAType pca_type,
       const DataCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
@@ -123,10 +122,9 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async attestation enroll request."));
   }
 
-  virtual void AsyncTpmAttestationEnroll(
-      chromeos::attestation::PrivacyCAType pca_type,
-      const std::string& pca_response,
-      const Callback& callback) override {
+  void AsyncTpmAttestationEnroll(chromeos::attestation::PrivacyCAType pca_type,
+                                 const std::string& pca_response,
+                                 const Callback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncTpmAttestationEnroll(pca_type, pca_response, base::Bind(
             &AsyncMethodCallerImpl::RegisterAsyncCallback,
@@ -135,7 +133,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
             "Couldn't initiate async attestation enroll."));
   }
 
-  virtual void AsyncTpmAttestationCreateCertRequest(
+  void AsyncTpmAttestationCreateCertRequest(
       chromeos::attestation::PrivacyCAType pca_type,
       chromeos::attestation::AttestationCertificateProfile certificate_profile,
       const std::string& user_id,
@@ -153,7 +151,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
                        "Couldn't initiate async attestation cert request."));
   }
 
-  virtual void AsyncTpmAttestationFinishCertRequest(
+  void AsyncTpmAttestationFinishCertRequest(
       const std::string& pca_response,
       chromeos::attestation::AttestationKeyType key_type,
       const std::string& user_id,
@@ -172,7 +170,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
                 "Couldn't initiate async attestation finish cert request."));
   }
 
-  virtual void TpmAttestationRegisterKey(
+  void TpmAttestationRegisterKey(
       chromeos::attestation::AttestationKeyType key_type,
       const std::string& user_id,
       const std::string& key_name,
@@ -189,7 +187,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
                 "Couldn't initiate async attestation register key."));
   }
 
-  virtual void TpmAttestationSignEnterpriseChallenge(
+  void TpmAttestationSignEnterpriseChallenge(
       chromeos::attestation::AttestationKeyType key_type,
       const std::string& user_id,
       const std::string& key_name,
@@ -214,7 +212,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
                 "Couldn't initiate async attestation enterprise challenge."));
   }
 
-  virtual void TpmAttestationSignSimpleChallenge(
+  void TpmAttestationSignSimpleChallenge(
       chromeos::attestation::AttestationKeyType key_type,
       const std::string& user_id,
       const std::string& key_name,
@@ -233,9 +231,8 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
                 "Couldn't initiate async attestation simple challenge."));
   }
 
-  virtual void AsyncGetSanitizedUsername(
-      const std::string& user,
-      const DataCallback& callback) override {
+  void AsyncGetSanitizedUsername(const std::string& user,
+                                 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 6589030..cbb934c 100644
--- a/chromeos/cryptohome/homedir_methods.cc
+++ b/chromeos/cryptohome/homedir_methods.cc
@@ -174,11 +174,11 @@ class HomedirMethodsImpl : public HomedirMethods {
  public:
   HomedirMethodsImpl() : weak_ptr_factory_(this) {}
 
-  virtual ~HomedirMethodsImpl() {}
+  ~HomedirMethodsImpl() override {}
 
-  virtual void GetKeyDataEx(const Identification& id,
-                            const std::string& label,
-                            const GetKeyDataCallback& callback) override {
+  void GetKeyDataEx(const Identification& id,
+                    const std::string& label,
+                    const GetKeyDataCallback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest kEmptyAuthProto;
     cryptohome::GetKeyDataRequest request;
@@ -195,9 +195,9 @@ class HomedirMethodsImpl : public HomedirMethods {
                    callback));
   }
 
-  virtual void CheckKeyEx(const Identification& id,
-                          const Authorization& auth,
-                          const Callback& callback) override {
+  void CheckKeyEx(const Identification& id,
+                  const Authorization& auth,
+                  const Callback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::CheckKeyRequest request;
@@ -214,10 +214,10 @@ class HomedirMethodsImpl : public HomedirMethods {
                    callback));
   }
 
-  virtual void MountEx(const Identification& id,
-                       const Authorization& auth,
-                       const MountParameters& request,
-                       const MountCallback& callback) override {
+  void MountEx(const Identification& id,
+               const Authorization& auth,
+               const MountParameters& request,
+               const MountCallback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::MountRequest request_proto;
@@ -243,11 +243,11 @@ class HomedirMethodsImpl : public HomedirMethods {
                    callback));
   }
 
-  virtual void AddKeyEx(const Identification& id,
-                        const Authorization& auth,
-                        const KeyDefinition& new_key,
-                        bool clobber_if_exists,
-                        const Callback& callback) override {
+  void AddKeyEx(const Identification& id,
+                const Authorization& auth,
+                const KeyDefinition& new_key,
+                bool clobber_if_exists,
+                const Callback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::AddKeyRequest request;
@@ -266,10 +266,10 @@ class HomedirMethodsImpl : public HomedirMethods {
                    callback));
   }
 
-  virtual void RemoveKeyEx(const Identification& id,
-                           const Authorization& auth,
-                           const std::string& label,
-                           const Callback& callback) override {
+  void RemoveKeyEx(const Identification& id,
+                   const Authorization& auth,
+                   const std::string& label,
+                   const Callback& callback) override {
     cryptohome::AccountIdentifier id_proto;
     cryptohome::AuthorizationRequest auth_proto;
     cryptohome::RemoveKeyRequest request;
@@ -287,11 +287,11 @@ class HomedirMethodsImpl : public HomedirMethods {
                    callback));
   }
 
-  virtual void UpdateKeyEx(const Identification& id,
-                           const Authorization& auth,
-                           const KeyDefinition& new_key,
-                           const std::string& signature,
-                           const Callback& callback) override {
+  void UpdateKeyEx(const Identification& id,
+                   const Authorization& auth,
+                   const KeyDefinition& new_key,
+                   const std::string& signature,
+                   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 3ed9753..9edd7b0 100644
--- a/chromeos/cryptohome/homedir_methods_unittest.cc
+++ b/chromeos/cryptohome/homedir_methods_unittest.cc
@@ -46,11 +46,11 @@ const char kProviderData2Bytes[] = "data_2 bytes";
 class HomedirMethodsTest : public testing::Test {
  public:
   HomedirMethodsTest();
-  virtual ~HomedirMethodsTest();
+  ~HomedirMethodsTest() override;
 
   // testing::Test:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  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 f60bc7f..43e1690 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 {
+  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 {
+  void TearDown() override {
     SystemSaltGetter::Shutdown();
     DBusThreadManager::Shutdown();
   }