replace OVERRIDE and FINAL with override and final in google_apis/

google_apis/gaia/merge_session_helper.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_
 #define GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_
 
 #include <deque>
 
 #include "base/observer_list.h"
@@ skipping 62 matching lines @@
     URLToTokenAndFetcher get_fetcher_map_for_testing() {
       return fetchers_;
     }
 
     // Simulate a timeout for tests.
     void TimeoutForTests();
 
    private:
     // Overridden from GaiaAuthConsumer.
     virtual void OnGetCheckConnectionInfoSuccess(
-        const std::string& data) OVERRIDE;
+        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;
+    virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
     // Any fetches still ongoing after this call are considered timed out.
     void Timeout();
 
     void CleanupTransientState();
 
     MergeSessionHelper* helper_;
     base::OneShotTimer<ExternalCcResultFetcher> timer_;
     scoped_ptr<GaiaAuthFetcher> gaia_auth_fetcher_;
     URLToTokenAndFetcher fetchers_;
@@ skipping 41 matching lines @@
   void StartFetchingExternalCcResult();
 
   // Returns true if the helper is still fetching external check connection
   // results.
   bool StillFetchingExternalCcResult();
 
  private:
   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;
+  virtual void OnUbertokenSuccess(const std::string& token) override;
+  virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) override;
 
   // Overridden from GaiaAuthConsumer.
-  virtual void OnMergeSessionSuccess(const std::string& data) OVERRIDE;
+  virtual void OnMergeSessionSuccess(const std::string& data) override;
   virtual void OnMergeSessionFailure(const GoogleServiceAuthError& error)
-      OVERRIDE;
+      override;
 
   void LogOutInternal(const std::string& account_id,
                       const std::vector<std::string>& accounts);
 
   // Starts the proess of fetching the uber token and performing a merge session
   // for the next account.  Virtual so that it can be overriden in tests.
   virtual void StartFetching();
 
   // Virtual for testing purpose.
   virtual void StartLogOutUrlFetch();
 
   // Start the next merge session, if needed.
   void HandleNextAccount();
 
   // Overridden from URLFetcherDelgate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   OAuth2TokenService* token_service_;
   net::URLRequestContextGetter* request_context_;
   scoped_ptr<GaiaAuthFetcher> gaia_auth_fetcher_;
   scoped_ptr<UbertokenFetcher> uber_token_fetcher_;
   ExternalCcResultFetcher result_fetcher_;
 
   // A worklist for this class. Accounts names are stored here if
   // we are pending a signin action for that account. Empty strings
   // represent a signout request.
   std::deque<std::string> accounts_;
 
   // List of observers to notify when merge session completes.
   // Makes sure list is empty on destruction.
   ObserverList<Observer, true> observer_list_;
 
   // Source to use with GAIA endpoints for accounting.
   std::string source_;
 
   DISALLOW_COPY_AND_ASSIGN(MergeSessionHelper);
 };
 
 #endif  // GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_