Standardize usage of virtual/override/final in google_apis/

This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.

BUG=417463
TBR=rogerta@chromium.org

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

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

22 files changed, 141 insertions, 151 deletions

diff --git a/google_apis/gaia/account_tracker.h b/google_apis/gaia/account_tracker.h
index 2d32b7d..41ebd2e 100644
--- a/google_apis/gaia/account_tracker.h
+++ b/google_apis/gaia/account_tracker.h
@@ -45,7 +45,7 @@ class AccountTracker : public OAuth2TokenService::Observer,
  public:
   AccountTracker(IdentityProvider* identity_provider,
                  net::URLRequestContextGetter* request_context_getter);
-  virtual ~AccountTracker();
+  ~AccountTracker() override;
 
   class Observer {
    public:
@@ -67,16 +67,16 @@ class AccountTracker : public OAuth2TokenService::Observer,
   AccountIds FindAccountIdsByGaiaId(const std::string& gaia_id);
 
   // OAuth2TokenService::Observer implementation.
-  virtual void OnRefreshTokenAvailable(const std::string& account_key) override;
-  virtual void OnRefreshTokenRevoked(const std::string& account_key) override;
+  void OnRefreshTokenAvailable(const std::string& account_key) override;
+  void OnRefreshTokenRevoked(const std::string& account_key) override;
 
   void OnUserInfoFetchSuccess(AccountIdFetcher* fetcher,
                               const std::string& gaia_id);
   void OnUserInfoFetchFailure(AccountIdFetcher* fetcher);
 
   // IdentityProvider::Observer implementation.
-  virtual void OnActiveAccountLogin() override;
-  virtual void OnActiveAccountLogout() override;
+  void OnActiveAccountLogin() override;
+  void OnActiveAccountLogout() override;
 
   // Sets the state of an account. Does not fire notifications.
   void SetAccountStateForTest(AccountIds ids, bool is_signed_in);
@@ -120,23 +120,23 @@ class AccountIdFetcher : public OAuth2TokenService::Consumer,
                    net::URLRequestContextGetter* request_context_getter,
                    AccountTracker* tracker,
                    const std::string& account_key);
-  virtual ~AccountIdFetcher();
+  ~AccountIdFetcher() override;
 
   const std::string& account_key() { return account_key_; }
 
   void Start();
 
   // OAuth2TokenService::Consumer implementation.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   // gaia::GaiaOAuthClient::Delegate implementation.
-  virtual void OnGetUserIdResponse(const std::string& gaia_id) override;
-  virtual void OnOAuthError() override;
-  virtual void OnNetworkError(int response_code) override;
+  void OnGetUserIdResponse(const std::string& gaia_id) override;
+  void OnOAuthError() override;
+  void OnNetworkError(int response_code) override;
 
  private:
   OAuth2TokenService* token_service_;
diff --git a/google_apis/gaia/account_tracker_unittest.cc b/google_apis/gaia/account_tracker_unittest.cc
index 8b6d298..f3792a7 100644
--- a/google_apis/gaia/account_tracker_unittest.cc
+++ b/google_apis/gaia/account_tracker_unittest.cc
@@ -136,10 +136,10 @@ class AccountTrackerObserver : public AccountTracker::Observer {
   void SortEventsByUser();
 
   // AccountTracker::Observer implementation
-  virtual void OnAccountAdded(const AccountIds& ids) override;
-  virtual void OnAccountRemoved(const AccountIds& ids) override;
-  virtual void OnAccountSignInChanged(const AccountIds& ids, bool is_signed_in)
-      override;
+  void OnAccountAdded(const AccountIds& ids) override;
+  void OnAccountRemoved(const AccountIds& ids) override;
+  void OnAccountSignInChanged(const AccountIds& ids,
+                              bool is_signed_in) override;
 
  private:
   testing::AssertionResult CheckEvents(
diff --git a/google_apis/gaia/fake_identity_provider.h b/google_apis/gaia/fake_identity_provider.h
index 1ba0f50..2140808 100644
--- a/google_apis/gaia/fake_identity_provider.h
+++ b/google_apis/gaia/fake_identity_provider.h
@@ -17,16 +17,16 @@ class OAuth2TokenService;
 class FakeIdentityProvider : public IdentityProvider {
  public:
   explicit FakeIdentityProvider(OAuth2TokenService* token_service);
-  virtual ~FakeIdentityProvider();
+  ~FakeIdentityProvider() override;
 
   void LogIn(const std::string& account_id);
   void LogOut();
 
   // IdentityProvider:
-  virtual std::string GetActiveUsername() override;
-  virtual std::string GetActiveAccountId() override;
-  virtual OAuth2TokenService* GetTokenService() override;
-  virtual bool RequestLogin() override;
+  std::string GetActiveUsername() override;
+  std::string GetActiveAccountId() override;
+  OAuth2TokenService* GetTokenService() override;
+  bool RequestLogin() override;
 
  private:
   std::string account_id_;
diff --git a/google_apis/gaia/fake_oauth2_token_service.h b/google_apis/gaia/fake_oauth2_token_service.h
index 79f9f84..ffe7b6a 100644
--- a/google_apis/gaia/fake_oauth2_token_service.h
+++ b/google_apis/gaia/fake_oauth2_token_service.h
@@ -20,9 +20,9 @@ class URLRequestContextGetter;
 class FakeOAuth2TokenService : public OAuth2TokenService {
  public:
   FakeOAuth2TokenService();
-  virtual ~FakeOAuth2TokenService();
+  ~FakeOAuth2TokenService() override;
 
-  virtual std::vector<std::string> GetAccounts() override;
+  std::vector<std::string> GetAccounts() override;
 
   void AddAccount(const std::string& account_id);
   void RemoveAccount(const std::string& account_id);
@@ -42,20 +42,19 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
 
  protected:
   // OAuth2TokenService overrides.
-  virtual void FetchOAuth2Token(RequestImpl* request,
-                                const std::string& account_id,
-                                net::URLRequestContextGetter* getter,
-                                const std::string& client_id,
-                                const std::string& client_secret,
-                                const ScopeSet& scopes) override;
+  void FetchOAuth2Token(RequestImpl* request,
+                        const std::string& account_id,
+                        net::URLRequestContextGetter* getter,
+                        const std::string& client_id,
+                        const std::string& client_secret,
+                        const ScopeSet& scopes) override;
 
-  virtual void InvalidateOAuth2Token(const std::string& account_id,
-                                     const std::string& client_id,
-                                     const ScopeSet& scopes,
-                                     const std::string& access_token) override;
+  void InvalidateOAuth2Token(const std::string& account_id,
+                             const std::string& client_id,
+                             const ScopeSet& scopes,
+                             const std::string& access_token) override;
 
-  virtual bool RefreshTokenIsAvailable(const std::string& account_id) const
-      override;
+  bool RefreshTokenIsAvailable(const std::string& account_id) const override;
 
  private:
   struct PendingRequest {
@@ -70,9 +69,9 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
   };
 
   // OAuth2TokenService overrides.
-  virtual net::URLRequestContextGetter* GetRequestContext() override;
+  net::URLRequestContextGetter* GetRequestContext() override;
 
-  virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
+  OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
       OAuth2AccessTokenConsumer* consumer) override;
diff --git a/google_apis/gaia/gaia_auth_fetcher.h b/google_apis/gaia/gaia_auth_fetcher.h
index 4e745d3..744c33f 100644
--- a/google_apis/gaia/gaia_auth_fetcher.h
+++ b/google_apis/gaia/gaia_auth_fetcher.h
@@ -53,7 +53,7 @@ class GaiaAuthFetcher : public net::URLFetcherDelegate {
   GaiaAuthFetcher(GaiaAuthConsumer* consumer,
                   const std::string& source,
                   net::URLRequestContextGetter* getter);
-  virtual ~GaiaAuthFetcher();
+  ~GaiaAuthFetcher() override;
 
   // Start a request to obtain the SID and LSID cookies for the the account
   // identified by |username| and |password|.  If |service| is not null or
@@ -192,7 +192,7 @@ class GaiaAuthFetcher : public net::URLFetcherDelegate {
   void StartGetCheckConnectionInfo();
 
   // Implementation of net::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // StartClientLogin been called && results not back yet?
   bool HasPendingFetch();
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc
index 8f2565e..0660507 100644
--- a/google_apis/gaia/gaia_oauth_client.cc
+++ b/google_apis/gaia/gaia_oauth_client.cc
@@ -65,7 +65,7 @@ class GaiaOAuthClient::Core
                     Delegate* delegate);
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
@@ -80,7 +80,7 @@ class GaiaOAuthClient::Core
     USER_INFO,
   };
 
-  virtual ~Core() {}
+  ~Core() override {}
 
   void GetUserInfoImpl(RequestType type,
                        const std::string& oauth_access_token,
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index a5509be..e9d2a29 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -48,9 +48,9 @@ class MockOAuthFetcher : public net::TestURLFetcher {
     SetResponseString(results);
   }
 
-  virtual ~MockOAuthFetcher() { }
+  ~MockOAuthFetcher() override {}
 
-  virtual void Start() override {
+  void Start() override {
     if ((GetResponseCode() != net::HTTP_OK) && (max_failure_count_ != -1) &&
         (current_failure_count_ == max_failure_count_)) {
       set_response_code(net::HTTP_OK);
@@ -87,12 +87,11 @@ class MockOAuthFetcherFactory : public net::URLFetcherFactory,
         response_code_(net::HTTP_OK),
         complete_immediately_(true) {
   }
-  virtual ~MockOAuthFetcherFactory() {}
-  virtual net::URLFetcher* CreateURLFetcher(
-      int id,
-      const GURL& url,
-      net::URLFetcher::RequestType request_type,
-      net::URLFetcherDelegate* d) override {
+  ~MockOAuthFetcherFactory() override {}
+  net::URLFetcher* CreateURLFetcher(int id,
+                                    const GURL& url,
+                                    net::URLFetcher::RequestType request_type,
+                                    net::URLFetcherDelegate* d) override {
     url_fetcher_ = new MockOAuthFetcher(
         response_code_,
         max_failure_count_,
diff --git a/google_apis/gaia/identity_provider.h b/google_apis/gaia/identity_provider.h
index b84d838..6ee9b8c 100644
--- a/google_apis/gaia/identity_provider.h
+++ b/google_apis/gaia/identity_provider.h
@@ -41,7 +41,7 @@ class IdentityProvider : public OAuth2TokenService::Observer {
     virtual ~Observer();
   };
 
-  virtual ~IdentityProvider();
+  ~IdentityProvider() override;
 
   // Adds and removes observers that will be notified of changes to the refresh
   // token availability for the active account.
@@ -69,9 +69,9 @@ class IdentityProvider : public OAuth2TokenService::Observer {
   void RemoveObserver(Observer* observer);
 
   // OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
-  virtual void OnRefreshTokensLoaded() override;
+  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void OnRefreshTokenRevoked(const std::string& account_id) override;
+  void OnRefreshTokensLoaded() override;
 
  protected:
   IdentityProvider();
diff --git a/google_apis/gaia/merge_session_helper.h b/google_apis/gaia/merge_session_helper.h
index 46cf686..dd3bf5f 100644
--- a/google_apis/gaia/merge_session_helper.h
+++ b/google_apis/gaia/merge_session_helper.h
@@ -57,7 +57,7 @@ class MergeSessionHelper : public GaiaAuthConsumer,
     typedef std::map<std::string, std::string> ResultMap;
 
     ExternalCcResultFetcher(MergeSessionHelper* helper);
-    virtual ~ExternalCcResultFetcher();
+    ~ExternalCcResultFetcher() override;
 
     // Gets the current value of the external connection check result string.
     std::string GetExternalCcResult();
@@ -79,14 +79,13 @@ class MergeSessionHelper : public GaiaAuthConsumer,
 
    private:
     // Overridden from GaiaAuthConsumer.
-    virtual void OnGetCheckConnectionInfoSuccess(
-        const std::string& data) override;
+    void OnGetCheckConnectionInfoSuccess(const std::string& data) override;
 
     // Creates and initializes a URL fetcher for doing a connection check.
     net::URLFetcher* CreateFetcher(const GURL& url);
 
     // Overridden from URLFetcherDelgate.
-    virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+    void OnURLFetchComplete(const net::URLFetcher* source) override;
 
     // Any fetches still ongoing after this call are considered timed out.
     void Timeout();
@@ -106,7 +105,7 @@ class MergeSessionHelper : public GaiaAuthConsumer,
                      const std::string& source,
                      net::URLRequestContextGetter* request_context,
                      Observer* observer);
-  virtual ~MergeSessionHelper();
+  ~MergeSessionHelper() override;
 
   void LogIn(const std::string& account_id);
 
@@ -148,13 +147,12 @@ class MergeSessionHelper : public GaiaAuthConsumer,
   net::URLRequestContextGetter* request_context() { return request_context_; }
 
   // Overridden from UbertokenConsumer.
-  virtual void OnUbertokenSuccess(const std::string& token) override;
-  virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) override;
+  void OnUbertokenSuccess(const std::string& token) override;
+  void OnUbertokenFailure(const GoogleServiceAuthError& error) override;
 
   // Overridden from GaiaAuthConsumer.
-  virtual void OnMergeSessionSuccess(const std::string& data) override;
-  virtual void OnMergeSessionFailure(const GoogleServiceAuthError& error)
-      override;
+  void OnMergeSessionSuccess(const std::string& data) override;
+  void OnMergeSessionFailure(const GoogleServiceAuthError& error) override;
 
   void LogOutInternal(const std::string& account_id,
                       const std::vector<std::string>& accounts);
@@ -170,7 +168,7 @@ class MergeSessionHelper : public GaiaAuthConsumer,
   void HandleNextAccount();
 
   // Overridden from URLFetcherDelgate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   OAuth2TokenService* token_service_;
   net::URLRequestContextGetter* request_context_;
diff --git a/google_apis/gaia/mock_url_fetcher_factory.h b/google_apis/gaia/mock_url_fetcher_factory.h
index ca61dc7..68e30aa 100644
--- a/google_apis/gaia/mock_url_fetcher_factory.h
+++ b/google_apis/gaia/mock_url_fetcher_factory.h
@@ -31,9 +31,9 @@ class MockFetcher : public net::TestURLFetcher {
               net::URLFetcher::RequestType request_type,
               net::URLFetcherDelegate* d);
 
-  virtual ~MockFetcher();
+  ~MockFetcher() override;
 
-  virtual void Start() override;
+  void Start() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockFetcher);
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl.h b/google_apis/gaia/oauth2_access_token_fetcher_impl.h
index c079bfd..6944d24 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_impl.h
+++ b/google_apis/gaia/oauth2_access_token_fetcher_impl.h
@@ -51,17 +51,17 @@ class OAuth2AccessTokenFetcherImpl : public OAuth2AccessTokenFetcher,
   OAuth2AccessTokenFetcherImpl(OAuth2AccessTokenConsumer* consumer,
                                net::URLRequestContextGetter* getter,
                                const std::string& refresh_token);
-  virtual ~OAuth2AccessTokenFetcherImpl();
+  ~OAuth2AccessTokenFetcherImpl() override;
 
   // Implementation of OAuth2AccessTokenFetcher
-  virtual void Start(const std::string& client_id,
-                     const std::string& client_secret,
-                     const std::vector<std::string>& scopes) override;
+  void Start(const std::string& client_id,
+             const std::string& client_secret,
+             const std::vector<std::string>& scopes) override;
 
-  virtual void CancelRequest() override;
+  void CancelRequest() override;
 
   // Implementation of net::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   enum State {
diff --git a/google_apis/gaia/oauth2_api_call_flow.h b/google_apis/gaia/oauth2_api_call_flow.h
index 26feefb..164e2d1 100644
--- a/google_apis/gaia/oauth2_api_call_flow.h
+++ b/google_apis/gaia/oauth2_api_call_flow.h
@@ -32,14 +32,14 @@ class OAuth2ApiCallFlow
  public:
   OAuth2ApiCallFlow();
 
-  virtual ~OAuth2ApiCallFlow();
+  ~OAuth2ApiCallFlow() override;
 
   // Start the flow.
   virtual void Start(net::URLRequestContextGetter* context,
                      const std::string& access_token);
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  protected:
   // Template methods for sub-classes.
diff --git a/google_apis/gaia/oauth2_mint_token_flow.h b/google_apis/gaia/oauth2_mint_token_flow.h
index aded2eef..1f4180d 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.h
+++ b/google_apis/gaia/oauth2_mint_token_flow.h
@@ -99,17 +99,15 @@ class OAuth2MintTokenFlow : public OAuth2ApiCallFlow {
   };
 
   OAuth2MintTokenFlow(Delegate* delegate, const Parameters& parameters);
-  virtual ~OAuth2MintTokenFlow();
+  ~OAuth2MintTokenFlow() override;
 
  protected:
   // Implementation of template methods in OAuth2ApiCallFlow.
-  virtual GURL CreateApiCallUrl() override;
-  virtual std::string CreateApiCallBody() override;
+  GURL CreateApiCallUrl() override;
+  std::string CreateApiCallBody() override;
 
-  virtual void ProcessApiCallSuccess(
-      const net::URLFetcher* source) override;
-  virtual void ProcessApiCallFailure(
-      const net::URLFetcher* source) override;
+  void ProcessApiCallSuccess(const net::URLFetcher* source) override;
+  void ProcessApiCallFailure(const net::URLFetcher* source) override;
 
  private:
   friend class OAuth2MintTokenFlowTest;
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc
index 9152c51..df46b2c 100644
--- a/google_apis/gaia/oauth2_token_service.cc
+++ b/google_apis/gaia/oauth2_token_service.cc
@@ -128,7 +128,7 @@ class OAuth2TokenService::Fetcher : public OAuth2AccessTokenConsumer {
                                  const std::string& client_secret,
                                  const ScopeSet& scopes,
                                  base::WeakPtr<RequestImpl> waiting_request);
-  virtual ~Fetcher();
+  ~Fetcher() override;
 
   // Add a request that is waiting for the result of this Fetcher.
   void AddWaitingRequest(base::WeakPtr<RequestImpl> waiting_request);
@@ -151,10 +151,9 @@ class OAuth2TokenService::Fetcher : public OAuth2AccessTokenConsumer {
 
  protected:
    // OAuth2AccessTokenConsumer
-  virtual void OnGetTokenSuccess(const std::string& access_token,
-                                 const base::Time& expiration_date) override;
-  virtual void OnGetTokenFailure(
-      const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const std::string& access_token,
+                         const base::Time& expiration_date) override;
+  void OnGetTokenFailure(const GoogleServiceAuthError& error) override;
 
  private:
   Fetcher(OAuth2TokenService* oauth2_token_service,
diff --git a/google_apis/gaia/oauth2_token_service.h b/google_apis/gaia/oauth2_token_service.h
index 1824da3..202d7d2 100644
--- a/google_apis/gaia/oauth2_token_service.h
+++ b/google_apis/gaia/oauth2_token_service.h
@@ -215,10 +215,10 @@ class OAuth2TokenService : public base::NonThreadSafe {
    public:
     // |consumer| is required to outlive this.
     explicit RequestImpl(const std::string& account_id, Consumer* consumer);
-    virtual ~RequestImpl();
+    ~RequestImpl() override;
 
     // Overridden from Request:
-    virtual std::string GetAccountId() const override;
+    std::string GetAccountId() const override;
 
     std::string GetConsumerId() const;
 
diff --git a/google_apis/gaia/oauth2_token_service_request.cc b/google_apis/gaia/oauth2_token_service_request.cc
index 8301fd5..ee7d650 100644
--- a/google_apis/gaia/oauth2_token_service_request.cc
+++ b/google_apis/gaia/oauth2_token_service_request.cc
@@ -163,21 +163,21 @@ class RequestCore : public OAuth2TokenServiceRequest::Core,
               const OAuth2TokenService::ScopeSet& scopes);
 
   // OAuth2TokenService::Consumer.  Must be called on the token service thread.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
  private:
   friend class base::RefCountedThreadSafe<RequestCore>;
 
   // Must be destroyed on the owner thread.
-  virtual ~RequestCore();
+  ~RequestCore() override;
 
   // Core implementation.
-  virtual void StartOnTokenServiceThread() override;
-  virtual void StopOnTokenServiceThread() override;
+  void StartOnTokenServiceThread() override;
+  void StopOnTokenServiceThread() override;
 
   void InformOwnerOnGetTokenSuccess(std::string access_token,
                                     base::Time expiration_time);
@@ -279,11 +279,11 @@ class InvalidateCore : public OAuth2TokenServiceRequest::Core {
   friend class base::RefCountedThreadSafe<InvalidateCore>;
 
   // Must be destroyed on the owner thread.
-  virtual ~InvalidateCore();
+  ~InvalidateCore() override;
 
   // Core implementation.
-  virtual void StartOnTokenServiceThread() override;
-  virtual void StopOnTokenServiceThread() override;
+  void StartOnTokenServiceThread() override;
+  void StopOnTokenServiceThread() override;
 
   std::string access_token_;
   std::string account_id_;
diff --git a/google_apis/gaia/oauth2_token_service_request.h b/google_apis/gaia/oauth2_token_service_request.h
index ecf605f..8d81ba4 100644
--- a/google_apis/gaia/oauth2_token_service_request.h
+++ b/google_apis/gaia/oauth2_token_service_request.h
@@ -87,10 +87,10 @@ class OAuth2TokenServiceRequest : public OAuth2TokenService::Request,
       const OAuth2TokenService::ScopeSet& scopes,
       const std::string& access_token);
 
-  virtual ~OAuth2TokenServiceRequest();
+  ~OAuth2TokenServiceRequest() override;
 
   // OAuth2TokenService::Request.
-  virtual std::string GetAccountId() const override;
+  std::string GetAccountId() const override;
 
  private:
   OAuth2TokenServiceRequest(const std::string& account_id);
diff --git a/google_apis/gaia/oauth2_token_service_request_unittest.cc b/google_apis/gaia/oauth2_token_service_request_unittest.cc
index 0cb08d3..691c3542 100644
--- a/google_apis/gaia/oauth2_token_service_request_unittest.cc
+++ b/google_apis/gaia/oauth2_token_service_request_unittest.cc
@@ -22,13 +22,13 @@ const char kScope[] = "SCOPE";
 class TestingOAuth2TokenServiceConsumer : public OAuth2TokenService::Consumer {
  public:
   TestingOAuth2TokenServiceConsumer();
-  virtual ~TestingOAuth2TokenServiceConsumer();
+  ~TestingOAuth2TokenServiceConsumer() override;
 
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   int num_get_token_success_;
   int num_get_token_failure_;
@@ -67,7 +67,7 @@ void TestingOAuth2TokenServiceConsumer::OnGetTokenFailure(
 class MockOAuth2TokenService : public FakeOAuth2TokenService {
  public:
   MockOAuth2TokenService();
-  virtual ~MockOAuth2TokenService();
+  ~MockOAuth2TokenService() override;
 
   void SetResponse(const GoogleServiceAuthError& error,
                    const std::string& access_token,
@@ -80,17 +80,17 @@ class MockOAuth2TokenService : public FakeOAuth2TokenService {
   }
 
  protected:
-  virtual void FetchOAuth2Token(RequestImpl* request,
-                                const std::string& account_id,
-                                net::URLRequestContextGetter* getter,
-                                const std::string& client_id,
-                                const std::string& client_secret,
-                                const ScopeSet& scopes) override;
-
-  virtual void InvalidateOAuth2Token(const std::string& account_id,
-                                     const std::string& client_id,
-                                     const ScopeSet& scopes,
-                                     const std::string& access_token) override;
+  void FetchOAuth2Token(RequestImpl* request,
+                        const std::string& account_id,
+                        net::URLRequestContextGetter* getter,
+                        const std::string& client_id,
+                        const std::string& client_secret,
+                        const ScopeSet& scopes) override;
+
+  void InvalidateOAuth2Token(const std::string& account_id,
+                             const std::string& client_id,
+                             const ScopeSet& scopes,
+                             const std::string& access_token) override;
 
  private:
   GoogleServiceAuthError response_error_;
@@ -154,12 +154,12 @@ class OAuth2TokenServiceRequestTest : public testing::Test {
     Provider(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
              OAuth2TokenService* token_service);
 
-    virtual scoped_refptr<base::SingleThreadTaskRunner>
-        GetTokenServiceTaskRunner() override;
-    virtual OAuth2TokenService* GetTokenService() override;
+    scoped_refptr<base::SingleThreadTaskRunner> GetTokenServiceTaskRunner()
+        override;
+    OAuth2TokenService* GetTokenService() override;
 
    private:
-    virtual ~Provider();
+    ~Provider() override;
 
     scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
     OAuth2TokenService* token_service_;
diff --git a/google_apis/gaia/oauth2_token_service_test_util.h b/google_apis/gaia/oauth2_token_service_test_util.h
index f31cf58..6a14f13 100644
--- a/google_apis/gaia/oauth2_token_service_test_util.h
+++ b/google_apis/gaia/oauth2_token_service_test_util.h
@@ -16,14 +16,14 @@ std::string GetValidTokenResponse(std::string token, int expiration);
 class TestingOAuth2TokenServiceConsumer : public OAuth2TokenService::Consumer {
  public:
   TestingOAuth2TokenServiceConsumer();
-  virtual ~TestingOAuth2TokenServiceConsumer();
+  ~TestingOAuth2TokenServiceConsumer() override;
 
   // OAuth2TokenService::Consumer overrides.
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& token,
-                                 const base::Time& expiration_date) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& token,
+                         const base::Time& expiration_date) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
   std::string last_token_;
   int number_of_successful_tokens_;
diff --git a/google_apis/gaia/oauth2_token_service_unittest.cc b/google_apis/gaia/oauth2_token_service_unittest.cc
index 71c8d32..153db65 100644
--- a/google_apis/gaia/oauth2_token_service_unittest.cc
+++ b/google_apis/gaia/oauth2_token_service_unittest.cc
@@ -27,10 +27,10 @@ class RetryingTestingOAuth2TokenServiceConsumer
       const std::string& account_id)
       : oauth2_service_(oauth2_service),
         account_id_(account_id) {}
-  virtual ~RetryingTestingOAuth2TokenServiceConsumer() {}
+  ~RetryingTestingOAuth2TokenServiceConsumer() override {}
 
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override {
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override {
     TestingOAuth2TokenServiceConsumer::OnGetTokenFailure(request, error);
     request_.reset(oauth2_service_->StartRequest(
         account_id_, OAuth2TokenService::ScopeSet(), this).release());
@@ -62,8 +62,7 @@ class TestOAuth2TokenService : public OAuth2TokenService {
       refresh_tokens_[account_id] = refresh_token;
   }
 
-  virtual bool RefreshTokenIsAvailable(const std::string& account_id) const
-      override {
+  bool RefreshTokenIsAvailable(const std::string& account_id) const override {
     std::map<std::string, std::string>::const_iterator it =
         refresh_tokens_.find(account_id);
 
@@ -72,11 +71,11 @@ class TestOAuth2TokenService : public OAuth2TokenService {
 
  private:
   // OAuth2TokenService implementation.
-  virtual net::URLRequestContextGetter* GetRequestContext() override {
+  net::URLRequestContextGetter* GetRequestContext() override {
     return request_context_getter_.get();
   }
 
-  virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
+  OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
       OAuth2AccessTokenConsumer* consumer) override {
diff --git a/google_apis/gaia/ubertoken_fetcher.h b/google_apis/gaia/ubertoken_fetcher.h
index 9172ce1..54835e1 100644
--- a/google_apis/gaia/ubertoken_fetcher.h
+++ b/google_apis/gaia/ubertoken_fetcher.h
@@ -46,22 +46,21 @@ class UbertokenFetcher : public GaiaAuthConsumer,
                    UbertokenConsumer* consumer,
                    const std::string& source,
                    net::URLRequestContextGetter* request_context);
-  virtual ~UbertokenFetcher();
+  ~UbertokenFetcher() override;
 
   // Start fetching the token for |account_id|.
   virtual void StartFetchingToken(const std::string& account_id);
 
   // Overriden from GaiaAuthConsumer
-  virtual void OnUberAuthTokenSuccess(const std::string& token) override;
-  virtual void OnUberAuthTokenFailure(
-      const GoogleServiceAuthError& error) override;
+  void OnUberAuthTokenSuccess(const std::string& token) override;
+  void OnUberAuthTokenFailure(const GoogleServiceAuthError& error) override;
 
   // Overriden from OAuth2TokenService::Consumer:
-  virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                                 const std::string& access_token,
-                                 const base::Time& expiration_time) override;
-  virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) override;
+  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
+                         const std::string& access_token,
+                         const base::Time& expiration_time) override;
+  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
+                         const GoogleServiceAuthError& error) override;
 
  private:
   // Request a login-scoped access token from the token service.
diff --git a/google_apis/gaia/ubertoken_fetcher_unittest.cc b/google_apis/gaia/ubertoken_fetcher_unittest.cc
index ad5a5b9..6659cca 100644
--- a/google_apis/gaia/ubertoken_fetcher_unittest.cc
+++ b/google_apis/gaia/ubertoken_fetcher_unittest.cc
@@ -24,15 +24,14 @@ class MockUbertokenConsumer : public UbertokenConsumer {
         last_error_(GoogleServiceAuthError::AuthErrorNone()),
         nb_error_(0) {
   }
-  virtual ~MockUbertokenConsumer() {}
+  ~MockUbertokenConsumer() override {}
 
-  virtual void OnUbertokenSuccess(const std::string& token) override {
+  void OnUbertokenSuccess(const std::string& token) override {
     last_token_ = token;
     ++ nb_correct_token_;
   }
 
-  virtual void OnUbertokenFailure(const GoogleServiceAuthError& error)
-      override {
+  void OnUbertokenFailure(const GoogleServiceAuthError& error) override {
     last_error_ = error;
     ++nb_error_;
   }