replace OVERRIDE and FINAL with override and final in google_apis/

R=rogerta@chromium.org,dcheng@chromium.org
BUG=417463

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

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

47 files changed, 282 insertions, 282 deletions

diff --git a/google_apis/drive/auth_service.cc b/google_apis/drive/auth_service.cc
index 49fe38a..82fc529 100644
--- a/google_apis/drive/auth_service.cc
+++ b/google_apis/drive/auth_service.cc
@@ -47,9 +47,9 @@ class AuthRequest : public OAuth2TokenService::Consumer {
   // Overridden from OAuth2TokenService::Consumer:
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
   AuthStatusCallback callback_;
   scoped_ptr<OAuth2TokenService::Request> request_;
diff --git a/google_apis/drive/auth_service.h b/google_apis/drive/auth_service.h
index f055a1c..2c74ad1 100644
--- a/google_apis/drive/auth_service.h
+++ b/google_apis/drive/auth_service.h
@@ -40,18 +40,18 @@ class AuthService : public AuthServiceInterface,
   virtual ~AuthService();
 
   // Overriden from AuthServiceInterface:
-  virtual void AddObserver(AuthServiceObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(AuthServiceObserver* observer) OVERRIDE;
-  virtual void StartAuthentication(const AuthStatusCallback& callback) OVERRIDE;
-  virtual bool HasAccessToken() const OVERRIDE;
-  virtual bool HasRefreshToken() const OVERRIDE;
-  virtual const std::string& access_token() const OVERRIDE;
-  virtual void ClearAccessToken() OVERRIDE;
-  virtual void ClearRefreshToken() OVERRIDE;
+  virtual void AddObserver(AuthServiceObserver* observer) override;
+  virtual void RemoveObserver(AuthServiceObserver* observer) override;
+  virtual void StartAuthentication(const AuthStatusCallback& callback) override;
+  virtual bool HasAccessToken() const override;
+  virtual bool HasRefreshToken() const override;
+  virtual const std::string& access_token() const override;
+  virtual void ClearAccessToken() override;
+  virtual void ClearRefreshToken() override;
 
   // Overridden from OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
 
  private:
   // Called when the state of the refresh token changes.
diff --git a/google_apis/drive/base_requests.h b/google_apis/drive/base_requests.h
index d0b5a74..5721933 100644
--- a/google_apis/drive/base_requests.h
+++ b/google_apis/drive/base_requests.h
@@ -97,11 +97,11 @@ class ResponseWriter : public net::URLFetcherResponseWriter {
   void DisownFile();
 
   // URLFetcherResponseWriter overrides:
-  virtual int Initialize(const net::CompletionCallback& callback) OVERRIDE;
+  virtual int Initialize(const net::CompletionCallback& callback) override;
   virtual int Write(net::IOBuffer* buffer,
                     int num_bytes,
-                    const net::CompletionCallback& callback) OVERRIDE;
-  virtual int Finish(const net::CompletionCallback& callback) OVERRIDE;
+                    const net::CompletionCallback& callback) override;
+  virtual int Finish(const net::CompletionCallback& callback) override;
 
  private:
   void DidWrite(scoped_refptr<net::IOBuffer> buffer,
@@ -125,9 +125,9 @@ class UrlFetchRequestBase : public AuthenticatedRequestInterface,
   // AuthenticatedRequestInterface overrides.
   virtual void Start(const std::string& access_token,
                      const std::string& custom_user_agent,
-                     const ReAuthenticateCallback& callback) OVERRIDE;
-  virtual base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
+                     const ReAuthenticateCallback& callback) override;
+  virtual base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() override;
+  virtual void Cancel() override;
 
  protected:
   explicit UrlFetchRequestBase(RequestSender* sender);
@@ -194,10 +194,10 @@ class UrlFetchRequestBase : public AuthenticatedRequestInterface,
 
  private:
   // URLFetcherDelegate overrides.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // AuthenticatedRequestInterface overrides.
-  virtual void OnAuthFailed(GDataErrorCode code) OVERRIDE;
+  virtual void OnAuthFailed(GDataErrorCode code) override;
 
   ReAuthenticateCallback re_authenticate_callback_;
   int re_authenticate_count_;
@@ -232,8 +232,8 @@ class EntryActionRequest : public UrlFetchRequestBase {
 
  protected:
   // Overridden from UrlFetchRequestBase.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
+  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
 
  private:
   const EntryActionCallback callback_;
@@ -271,9 +271,9 @@ class InitiateUploadRequestBase : public UrlFetchRequestBase {
   virtual ~InitiateUploadRequestBase();
 
   // UrlFetchRequestBase overrides.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
-  virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
+  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
+  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
 
  private:
   const InitiateUploadCallback callback_;
@@ -314,10 +314,10 @@ class UploadRangeRequestBase : public UrlFetchRequestBase {
   virtual ~UploadRangeRequestBase();
 
   // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const OVERRIDE;
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
+  virtual GURL GetURL() const override;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
 
   // This method will be called when the request is done, regardless of
   // whether it is succeeded or failed.
@@ -381,11 +381,11 @@ class ResumeUploadRequestBase : public UploadRangeRequestBase {
   virtual ~ResumeUploadRequestBase();
 
   // UrlFetchRequestBase overrides.
-  virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
+  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
   virtual bool GetContentFile(base::FilePath* local_file_path,
                               int64* range_offset,
                               int64* range_length,
-                              std::string* upload_content_type) OVERRIDE;
+                              std::string* upload_content_type) override;
 
  private:
   // The parameters for the request. See ResumeUploadParams for the details.
@@ -420,7 +420,7 @@ class GetUploadStatusRequestBase : public UploadRangeRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
+  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
 
  private:
   const int64 content_length_;
@@ -466,16 +466,16 @@ class DownloadFileRequestBase : public UrlFetchRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const OVERRIDE;
+  virtual GURL GetURL() const override;
   virtual void GetOutputFilePath(
       base::FilePath* local_file_path,
-      GetContentCallback* get_content_callback) OVERRIDE;
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
+      GetContentCallback* get_content_callback) override;
+  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
 
   // net::URLFetcherDelegate overrides.
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                          int64 current, int64 total) OVERRIDE;
+                                          int64 current, int64 total) override;
 
  private:
   const DownloadActionCallback download_action_callback_;
diff --git a/google_apis/drive/base_requests_server_unittest.cc b/google_apis/drive/base_requests_server_unittest.cc
index 88c3bcd..e930f49 100644
--- a/google_apis/drive/base_requests_server_unittest.cc
+++ b/google_apis/drive/base_requests_server_unittest.cc
@@ -33,7 +33,7 @@ class BaseRequestsServerTest : public testing::Test {
   BaseRequestsServerTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     request_context_getter_ = new net::TestURLRequestContextGetter(
diff --git a/google_apis/drive/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc
index 11f887c..3fcce8c 100644
--- a/google_apis/drive/base_requests_unittest.cc
+++ b/google_apis/drive/base_requests_unittest.cc
@@ -39,11 +39,11 @@ class FakeUrlFetchRequest : public UrlFetchRequestBase {
   }
 
  protected:
-  virtual GURL GetURL() const OVERRIDE { return url_; }
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE {
+  virtual GURL GetURL() const override { return url_; }
+  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override {
     callback_.Run(GetErrorCode());
   }
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE {
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override {
     callback_.Run(code);
   }
 
@@ -57,7 +57,7 @@ class BaseRequestsTest : public testing::Test {
  public:
   BaseRequestsTest() : response_code_(net::HTTP_OK) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.message_loop_proxy());
 
diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_api_requests.h
index a983dd5..a160eeb 100644
--- a/google_apis/drive/drive_api_requests.h
+++ b/google_apis/drive/drive_api_requests.h
@@ -55,7 +55,7 @@ class DriveApiPartialFieldRequest : public UrlFetchRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const OVERRIDE;
+  virtual GURL GetURL() const override;
 
   // Derived classes should override GetURLInternal instead of GetURL()
   // directly.
@@ -89,7 +89,7 @@ class DriveApiDataRequest : public DriveApiPartialFieldRequest {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE {
+  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override {
     GDataErrorCode error = GetErrorCode();
     switch (error) {
       case HTTP_SUCCESS:
@@ -108,7 +108,7 @@ class DriveApiDataRequest : public DriveApiPartialFieldRequest {
     }
   }
 
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode error) OVERRIDE {
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode error) override {
     callback_.Run(error, scoped_ptr<DataType>());
   }
 
@@ -154,7 +154,7 @@ class FilesGetRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -182,10 +182,10 @@ class FilesAuthorizeRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from GetDataRequest.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -235,12 +235,12 @@ class FilesInsertRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from GetDataRequest.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
   virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) OVERRIDE;
+                              std::string* upload_content) override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -305,13 +305,13 @@ class FilesPatchRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from URLFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-  virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
   virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) OVERRIDE;
+                              std::string* upload_content) override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -359,12 +359,12 @@ class FilesCopyRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from URLFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
   virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) OVERRIDE;
+                              std::string* upload_content) override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -406,7 +406,7 @@ class FilesListRequest : public DriveApiDataRequest<FileList> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -434,7 +434,7 @@ class FilesListNextPageRequest : public DriveApiDataRequest<FileList> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   GURL next_link_;
@@ -461,9 +461,9 @@ class FilesDeleteRequest : public EntryActionRequest {
 
  protected:
   // Overridden from UrlFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-  virtual GURL GetURL() const OVERRIDE;
-  virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  virtual GURL GetURL() const override;
+  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -491,10 +491,10 @@ class FilesTrashRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from UrlFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -517,7 +517,7 @@ class AboutGetRequest : public DriveApiDataRequest<AboutResource> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -561,7 +561,7 @@ class ChangesListRequest : public DriveApiDataRequest<ChangeList> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -590,7 +590,7 @@ class ChangesListNextPageRequest : public DriveApiDataRequest<ChangeList> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   GURL next_link_;
@@ -613,7 +613,7 @@ class AppsListRequest : public DriveApiDataRequest<AppList> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const OVERRIDE;
+  virtual GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -640,8 +640,8 @@ class AppsDeleteRequest : public EntryActionRequest {
 
  protected:
   // Overridden from UrlFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-  virtual GURL GetURL() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  virtual GURL GetURL() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -674,10 +674,10 @@ class ChildrenInsertRequest : public EntryActionRequest {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-  virtual GURL GetURL() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  virtual GURL GetURL() const override;
   virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) OVERRIDE;
+                              std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -713,8 +713,8 @@ class ChildrenDeleteRequest : public EntryActionRequest {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-  virtual GURL GetURL() const OVERRIDE;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  virtual GURL GetURL() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -756,10 +756,10 @@ class InitiateUploadNewFileRequest : public InitiateUploadRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const OVERRIDE;
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual GURL GetURL() const override;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
   virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) OVERRIDE;
+                              std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -813,11 +813,11 @@ class InitiateUploadExistingFileRequest : public InitiateUploadRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const OVERRIDE;
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-  virtual std::vector<std::string> GetExtraRequestHeaders() const OVERRIDE;
+  virtual GURL GetURL() const override;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
   virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) OVERRIDE;
+                              std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -859,10 +859,10 @@ class ResumeUploadRequest : public ResumeUploadRequestBase {
   // UploadRangeRequestBase overrides.
   virtual void OnRangeRequestComplete(
       const UploadRangeResponse& response,
-      scoped_ptr<base::Value> value) OVERRIDE;
+      scoped_ptr<base::Value> value) override;
   // content::UrlFetcherDelegate overrides.
   virtual void OnURLFetchUploadProgress(const net::URLFetcher* source,
-                                        int64 current, int64 total) OVERRIDE;
+                                        int64 current, int64 total) override;
 
  private:
   const UploadRangeCallback callback_;
@@ -888,7 +888,7 @@ class GetUploadStatusRequest : public GetUploadStatusRequestBase {
   // UploadRangeRequestBase overrides.
   virtual void OnRangeRequestComplete(
       const UploadRangeResponse& response,
-      scoped_ptr<base::Value> value) OVERRIDE;
+      scoped_ptr<base::Value> value) override;
 
  private:
   const UploadRangeCallback callback_;
@@ -947,10 +947,10 @@ class PermissionsInsertRequest : public EntryActionRequest {
   void set_value(const std::string& value) { value_ = value; }
 
   // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const OVERRIDE;
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual GURL GetURL() const override;
+  virtual net::URLFetcher::RequestType GetRequestType() const override;
   virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) OVERRIDE;
+                              std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc
index d54b2d5..c6662e4 100644
--- a/google_apis/drive/drive_api_requests_unittest.cc
+++ b/google_apis/drive/drive_api_requests_unittest.cc
@@ -64,7 +64,7 @@ class DriveApiRequestsTest : public testing::Test {
   DriveApiRequestsTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.message_loop_proxy());
 
diff --git a/google_apis/drive/dummy_auth_service.h b/google_apis/drive/dummy_auth_service.h
index a69da6b..38b6774 100644
--- a/google_apis/drive/dummy_auth_service.h
+++ b/google_apis/drive/dummy_auth_service.h
@@ -24,14 +24,14 @@ class DummyAuthService : public AuthServiceInterface {
   const std::string& refresh_token() const { return refresh_token_; }
 
   // AuthServiceInterface overrides.
-  virtual void AddObserver(AuthServiceObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(AuthServiceObserver* observer) OVERRIDE;
-  virtual void StartAuthentication(const AuthStatusCallback& callback) OVERRIDE;
-  virtual bool HasAccessToken() const OVERRIDE;
-  virtual bool HasRefreshToken() const OVERRIDE;
-  virtual const std::string& access_token() const OVERRIDE;
-  virtual void ClearAccessToken() OVERRIDE;
-  virtual void ClearRefreshToken() OVERRIDE;
+  virtual void AddObserver(AuthServiceObserver* observer) override;
+  virtual void RemoveObserver(AuthServiceObserver* observer) override;
+  virtual void StartAuthentication(const AuthStatusCallback& callback) override;
+  virtual bool HasAccessToken() const override;
+  virtual bool HasRefreshToken() const override;
+  virtual const std::string& access_token() const override;
+  virtual void ClearAccessToken() override;
+  virtual void ClearRefreshToken() override;
 
  private:
   std::string access_token_;
diff --git a/google_apis/drive/gdata_wapi_requests.h b/google_apis/drive/gdata_wapi_requests.h
index c4e1d06b..aa4e69f 100644
--- a/google_apis/drive/gdata_wapi_requests.h
+++ b/google_apis/drive/gdata_wapi_requests.h
@@ -32,9 +32,9 @@ class GetResourceEntryRequest : public UrlFetchRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode error) OVERRIDE;
-  virtual GURL GetURL() const OVERRIDE;
+  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  virtual void RunCallbackOnPrematureFailure(GDataErrorCode error) override;
+  virtual GURL GetURL() const override;
 
  private:
   void OnDataParsed(GDataErrorCode error, scoped_ptr<ResourceEntry> entry);
diff --git a/google_apis/drive/gdata_wapi_requests_unittest.cc b/google_apis/drive/gdata_wapi_requests_unittest.cc
index 449cb47..eb4be74 100644
--- a/google_apis/drive/gdata_wapi_requests_unittest.cc
+++ b/google_apis/drive/gdata_wapi_requests_unittest.cc
@@ -26,7 +26,7 @@ const char kTestUserAgent[] = "test-user-agent";
 
 class GDataWapiRequestsTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.message_loop_proxy());
 
diff --git a/google_apis/drive/request_sender_unittest.cc b/google_apis/drive/request_sender_unittest.cc
index 5ac58f3..7771164 100644
--- a/google_apis/drive/request_sender_unittest.cc
+++ b/google_apis/drive/request_sender_unittest.cc
@@ -32,7 +32,7 @@ class TestAuthService : public DummyAuthService {
   TestAuthService() : auth_try_count_(0) {}
 
   virtual void StartAuthentication(
-      const AuthStatusCallback& callback) OVERRIDE {
+      const AuthStatusCallback& callback) override {
     // RequestSender should clear the rejected access token before starting
     // to request another one.
     EXPECT_FALSE(HasAccessToken());
@@ -97,7 +97,7 @@ class TestRequest : public AuthenticatedRequestInterface {
 
   virtual void Start(const std::string& access_token,
                      const std::string& custom_user_agent,
-                     const ReAuthenticateCallback& callback) OVERRIDE {
+                     const ReAuthenticateCallback& callback) override {
     *start_called_ = true;
     passed_access_token_ = access_token;
     passed_reauth_callback_ = callback;
@@ -106,18 +106,18 @@ class TestRequest : public AuthenticatedRequestInterface {
     // Each test case should respond properly by using the above methods.
   }
 
-  virtual void Cancel() OVERRIDE {
+  virtual void Cancel() override {
     EXPECT_TRUE(*start_called_);
     *finish_reason_ = CANCEL;
     sender_->RequestFinished(this);
   }
 
-  virtual void OnAuthFailed(GDataErrorCode code) OVERRIDE {
+  virtual void OnAuthFailed(GDataErrorCode code) override {
     *finish_reason_ = AUTH_FAILURE;
     sender_->RequestFinished(this);
   }
 
-  virtual base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() OVERRIDE {
+  virtual base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() override {
     return weak_ptr_factory_.GetWeakPtr();
   }
 
diff --git a/google_apis/gaia/account_tracker.h b/google_apis/gaia/account_tracker.h
index 01546b3b..2d32b7d 100644
--- a/google_apis/gaia/account_tracker.h
+++ b/google_apis/gaia/account_tracker.h
@@ -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;
+  virtual void OnRefreshTokenAvailable(const std::string& account_key) override;
+  virtual 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;
+  virtual void OnActiveAccountLogin() override;
+  virtual void OnActiveAccountLogout() override;
 
   // Sets the state of an account. Does not fire notifications.
   void SetAccountStateForTest(AccountIds ids, bool is_signed_in);
@@ -129,14 +129,14 @@ class AccountIdFetcher : public OAuth2TokenService::Consumer,
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 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;
+  virtual void OnGetUserIdResponse(const std::string& gaia_id) override;
+  virtual void OnOAuthError() override;
+  virtual 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 fe8346e..8b6d298 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 OnAccountAdded(const AccountIds& ids) override;
+  virtual void OnAccountRemoved(const AccountIds& ids) override;
   virtual void OnAccountSignInChanged(const AccountIds& ids, bool is_signed_in)
-      OVERRIDE;
+      override;
 
  private:
   testing::AssertionResult CheckEvents(
@@ -266,7 +266,7 @@ class IdentityAccountTrackerTest : public testing::Test {
 
   virtual ~IdentityAccountTrackerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
 
     fake_oauth2_token_service_.reset(new FakeOAuth2TokenService());
 
@@ -280,7 +280,7 @@ class IdentityAccountTrackerTest : public testing::Test {
     account_tracker_->AddObserver(&observer_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     account_tracker_->RemoveObserver(&observer_);
     account_tracker_->Shutdown();
   }
diff --git a/google_apis/gaia/fake_identity_provider.h b/google_apis/gaia/fake_identity_provider.h
index 28d46d9..1ba0f50 100644
--- a/google_apis/gaia/fake_identity_provider.h
+++ b/google_apis/gaia/fake_identity_provider.h
@@ -23,10 +23,10 @@ class FakeIdentityProvider : public IdentityProvider {
   void LogOut();
 
   // IdentityProvider:
-  virtual std::string GetActiveUsername() OVERRIDE;
-  virtual std::string GetActiveAccountId() OVERRIDE;
-  virtual OAuth2TokenService* GetTokenService() OVERRIDE;
-  virtual bool RequestLogin() OVERRIDE;
+  virtual std::string GetActiveUsername() override;
+  virtual std::string GetActiveAccountId() override;
+  virtual OAuth2TokenService* GetTokenService() override;
+  virtual 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 5868b1a..79f9f84 100644
--- a/google_apis/gaia/fake_oauth2_token_service.h
+++ b/google_apis/gaia/fake_oauth2_token_service.h
@@ -22,7 +22,7 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
   FakeOAuth2TokenService();
   virtual ~FakeOAuth2TokenService();
 
-  virtual std::vector<std::string> GetAccounts() OVERRIDE;
+  virtual std::vector<std::string> GetAccounts() override;
 
   void AddAccount(const std::string& account_id);
   void RemoveAccount(const std::string& account_id);
@@ -47,15 +47,15 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
                                 net::URLRequestContextGetter* getter,
                                 const std::string& client_id,
                                 const std::string& client_secret,
-                                const ScopeSet& scopes) OVERRIDE;
+                                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;
+                                     const std::string& access_token) override;
 
   virtual bool RefreshTokenIsAvailable(const std::string& account_id) const
-      OVERRIDE;
+      override;
 
  private:
   struct PendingRequest {
@@ -70,12 +70,12 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
   };
 
   // OAuth2TokenService overrides.
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+  virtual net::URLRequestContextGetter* GetRequestContext() override;
 
   virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
-      OAuth2AccessTokenConsumer* consumer) OVERRIDE;
+      OAuth2AccessTokenConsumer* consumer) override;
 
   std::set<std::string> account_ids_;
   std::vector<PendingRequest> pending_requests_;
diff --git a/google_apis/gaia/gaia_auth_fetcher.h b/google_apis/gaia/gaia_auth_fetcher.h
index 997d9ad..47e120c 100644
--- a/google_apis/gaia/gaia_auth_fetcher.h
+++ b/google_apis/gaia/gaia_auth_fetcher.h
@@ -188,7 +188,7 @@ class GaiaAuthFetcher : public net::URLFetcherDelegate {
   void StartGetCheckConnectionInfo();
 
   // Implementation of net::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 8e2d29b..b6c0d2e 100644
--- a/google_apis/gaia/gaia_oauth_client.cc
+++ b/google_apis/gaia/gaia_oauth_client.cc
@@ -64,7 +64,7 @@ class GaiaOAuthClient::Core
                     Delegate* delegate);
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 9e4bfdf..a5509be 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -50,7 +50,7 @@ class MockOAuthFetcher : public net::TestURLFetcher {
 
   virtual ~MockOAuthFetcher() { }
 
-  virtual void Start() OVERRIDE {
+  virtual void Start() override {
     if ((GetResponseCode() != net::HTTP_OK) && (max_failure_count_ != -1) &&
         (current_failure_count_ == max_failure_count_)) {
       set_response_code(net::HTTP_OK);
@@ -92,7 +92,7 @@ class MockOAuthFetcherFactory : public net::URLFetcherFactory,
       int id,
       const GURL& url,
       net::URLFetcher::RequestType request_type,
-      net::URLFetcherDelegate* d) OVERRIDE {
+      net::URLFetcherDelegate* d) override {
     url_fetcher_ = new MockOAuthFetcher(
         response_code_,
         max_failure_count_,
@@ -172,7 +172,7 @@ namespace gaia {
 
 class GaiaOAuthClientTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     client_info_.client_id = "test_client_id";
     client_info_.client_secret = "test_client_secret";
     client_info_.redirect_uri = "test_redirect_uri";
@@ -214,14 +214,14 @@ class MockGaiaOAuthClientDelegate : public gaia::GaiaOAuthClient::Delegate {
   MOCK_METHOD1(OnGetUserInfoResponsePtr,
                void(const base::DictionaryValue* user_info));
   virtual void OnGetUserInfoResponse(
-      scoped_ptr<base::DictionaryValue> user_info) OVERRIDE {
+      scoped_ptr<base::DictionaryValue> user_info) override {
     user_info_.reset(user_info.release());
     OnGetUserInfoResponsePtr(user_info_.get());
   }
   MOCK_METHOD1(OnGetTokenInfoResponsePtr,
                void(const base::DictionaryValue* token_info));
   virtual void OnGetTokenInfoResponse(
-      scoped_ptr<base::DictionaryValue> token_info) OVERRIDE {
+      scoped_ptr<base::DictionaryValue> token_info) override {
     token_info_.reset(token_info.release());
     OnGetTokenInfoResponsePtr(token_info_.get());
   }
diff --git a/google_apis/gaia/identity_provider.h b/google_apis/gaia/identity_provider.h
index e0e99ee..b84d838 100644
--- a/google_apis/gaia/identity_provider.h
+++ b/google_apis/gaia/identity_provider.h
@@ -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;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
+  virtual void OnRefreshTokensLoaded() override;
 
  protected:
   IdentityProvider();
diff --git a/google_apis/gaia/merge_session_helper.h b/google_apis/gaia/merge_session_helper.h
index ca82643..46cf686 100644
--- a/google_apis/gaia/merge_session_helper.h
+++ b/google_apis/gaia/merge_session_helper.h
@@ -80,13 +80,13 @@ class MergeSessionHelper : public GaiaAuthConsumer,
    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();
@@ -148,13 +148,13 @@ 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;
+  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);
@@ -170,7 +170,7 @@ class MergeSessionHelper : public GaiaAuthConsumer,
   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_;
diff --git a/google_apis/gaia/mock_url_fetcher_factory.h b/google_apis/gaia/mock_url_fetcher_factory.h
index 862f220..ca61dc7 100644
--- a/google_apis/gaia/mock_url_fetcher_factory.h
+++ b/google_apis/gaia/mock_url_fetcher_factory.h
@@ -33,7 +33,7 @@ class MockFetcher : public net::TestURLFetcher {
 
   virtual ~MockFetcher();
 
-  virtual void Start() OVERRIDE;
+  virtual void Start() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockFetcher);
@@ -52,7 +52,7 @@ class MockURLFetcherFactory : public net::URLFetcherFactory,
       int id,
       const GURL& url,
       net::URLFetcher::RequestType request_type,
-      net::URLFetcherDelegate* d) OVERRIDE {
+      net::URLFetcherDelegate* d) override {
     return new T(success_, url, results_, request_type, d);
   }
   void set_success(bool success) {
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl.h b/google_apis/gaia/oauth2_access_token_fetcher_impl.h
index 8839b6c..c079bfd 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_impl.h
+++ b/google_apis/gaia/oauth2_access_token_fetcher_impl.h
@@ -56,12 +56,12 @@ class OAuth2AccessTokenFetcherImpl : public OAuth2AccessTokenFetcher,
   // Implementation of OAuth2AccessTokenFetcher
   virtual void Start(const std::string& client_id,
                      const std::string& client_secret,
-                     const std::vector<std::string>& scopes) OVERRIDE;
+                     const std::vector<std::string>& scopes) override;
 
-  virtual void CancelRequest() OVERRIDE;
+  virtual void CancelRequest() override;
 
   // Implementation of net::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 70c9b51..e3d06b7 100644
--- a/google_apis/gaia/oauth2_api_call_flow.h
+++ b/google_apis/gaia/oauth2_api_call_flow.h
@@ -54,11 +54,11 @@ class OAuth2ApiCallFlow
 
   // OAuth2AccessTokenFetcher implementation.
   virtual void OnGetTokenSuccess(const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
-  virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) OVERRIDE;
+                                 const base::Time& expiration_time) override;
+  virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) override;
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual 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 6c53c94..59cec79 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.h
+++ b/google_apis/gaia/oauth2_mint_token_flow.h
@@ -108,16 +108,16 @@ class OAuth2MintTokenFlow : public OAuth2ApiCallFlow {
 
  protected:
   // Implementation of template methods in OAuth2ApiCallFlow.
-  virtual GURL CreateApiCallUrl() OVERRIDE;
-  virtual std::string CreateApiCallBody() OVERRIDE;
+  virtual GURL CreateApiCallUrl() override;
+  virtual std::string CreateApiCallBody() override;
 
   virtual void ProcessApiCallSuccess(
-      const net::URLFetcher* source) OVERRIDE;
+      const net::URLFetcher* source) override;
   virtual void ProcessApiCallFailure(
-      const net::URLFetcher* source) OVERRIDE;
-  virtual void ProcessNewAccessToken(const std::string& access_token) OVERRIDE;
+      const net::URLFetcher* source) override;
+  virtual void ProcessNewAccessToken(const std::string& access_token) override;
   virtual void ProcessMintAccessTokenFailure(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      const GoogleServiceAuthError& error) override;
 
  private:
   friend class OAuth2MintTokenFlowTest;
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc
index 2cf8a2c..563dd1a9 100644
--- a/google_apis/gaia/oauth2_token_service.cc
+++ b/google_apis/gaia/oauth2_token_service.cc
@@ -151,9 +151,9 @@ class OAuth2TokenService::Fetcher : public OAuth2AccessTokenConsumer {
  protected:
    // OAuth2AccessTokenConsumer
   virtual void OnGetTokenSuccess(const std::string& access_token,
-                                 const base::Time& expiration_date) OVERRIDE;
+                                 const base::Time& expiration_date) override;
   virtual void OnGetTokenFailure(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      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 ecef9e4..1824da3 100644
--- a/google_apis/gaia/oauth2_token_service.h
+++ b/google_apis/gaia/oauth2_token_service.h
@@ -218,7 +218,7 @@ class OAuth2TokenService : public base::NonThreadSafe {
     virtual ~RequestImpl();
 
     // Overridden from Request:
-    virtual std::string GetAccountId() const OVERRIDE;
+    virtual 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 1ef48c6..8301fd5 100644
--- a/google_apis/gaia/oauth2_token_service_request.cc
+++ b/google_apis/gaia/oauth2_token_service_request.cc
@@ -165,9 +165,9 @@ class RequestCore : public OAuth2TokenServiceRequest::Core,
   // 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;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
  private:
   friend class base::RefCountedThreadSafe<RequestCore>;
@@ -176,8 +176,8 @@ class RequestCore : public OAuth2TokenServiceRequest::Core,
   virtual ~RequestCore();
 
   // Core implementation.
-  virtual void StartOnTokenServiceThread() OVERRIDE;
-  virtual void StopOnTokenServiceThread() OVERRIDE;
+  virtual void StartOnTokenServiceThread() override;
+  virtual void StopOnTokenServiceThread() override;
 
   void InformOwnerOnGetTokenSuccess(std::string access_token,
                                     base::Time expiration_time);
@@ -282,8 +282,8 @@ class InvalidateCore : public OAuth2TokenServiceRequest::Core {
   virtual ~InvalidateCore();
 
   // Core implementation.
-  virtual void StartOnTokenServiceThread() OVERRIDE;
-  virtual void StopOnTokenServiceThread() OVERRIDE;
+  virtual void StartOnTokenServiceThread() override;
+  virtual 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 b1f0e57..ecf605f 100644
--- a/google_apis/gaia/oauth2_token_service_request.h
+++ b/google_apis/gaia/oauth2_token_service_request.h
@@ -90,7 +90,7 @@ class OAuth2TokenServiceRequest : public OAuth2TokenService::Request,
   virtual ~OAuth2TokenServiceRequest();
 
   // OAuth2TokenService::Request.
-  virtual std::string GetAccountId() const OVERRIDE;
+  virtual 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 c2683a8..0cb08d3 100644
--- a/google_apis/gaia/oauth2_token_service_request_unittest.cc
+++ b/google_apis/gaia/oauth2_token_service_request_unittest.cc
@@ -26,9 +26,9 @@ class TestingOAuth2TokenServiceConsumer : public OAuth2TokenService::Consumer {
 
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
   int num_get_token_success_;
   int num_get_token_failure_;
@@ -85,12 +85,12 @@ class MockOAuth2TokenService : public FakeOAuth2TokenService {
                                 net::URLRequestContextGetter* getter,
                                 const std::string& client_id,
                                 const std::string& client_secret,
-                                const ScopeSet& scopes) OVERRIDE;
+                                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;
+                                     const std::string& access_token) override;
 
  private:
   GoogleServiceAuthError response_error_;
@@ -145,8 +145,8 @@ void MockOAuth2TokenService::InvalidateOAuth2Token(
 
 class OAuth2TokenServiceRequestTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   class Provider : public OAuth2TokenServiceRequest::TokenServiceProvider {
@@ -155,8 +155,8 @@ class OAuth2TokenServiceRequestTest : public testing::Test {
              OAuth2TokenService* token_service);
 
     virtual scoped_refptr<base::SingleThreadTaskRunner>
-        GetTokenServiceTaskRunner() OVERRIDE;
-    virtual OAuth2TokenService* GetTokenService() OVERRIDE;
+        GetTokenServiceTaskRunner() override;
+    virtual OAuth2TokenService* GetTokenService() override;
 
    private:
     virtual ~Provider();
diff --git a/google_apis/gaia/oauth2_token_service_test_util.h b/google_apis/gaia/oauth2_token_service_test_util.h
index 53ccdf8..f31cf58 100644
--- a/google_apis/gaia/oauth2_token_service_test_util.h
+++ b/google_apis/gaia/oauth2_token_service_test_util.h
@@ -21,9 +21,9 @@ class TestingOAuth2TokenServiceConsumer : public OAuth2TokenService::Consumer {
   // OAuth2TokenService::Consumer overrides.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& token,
-                                 const base::Time& expiration_date) OVERRIDE;
+                                 const base::Time& expiration_date) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 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 b79e361..71c8d32 100644
--- a/google_apis/gaia/oauth2_token_service_unittest.cc
+++ b/google_apis/gaia/oauth2_token_service_unittest.cc
@@ -30,7 +30,7 @@ class RetryingTestingOAuth2TokenServiceConsumer
   virtual ~RetryingTestingOAuth2TokenServiceConsumer() {}
 
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE {
+                                 const GoogleServiceAuthError& error) override {
     TestingOAuth2TokenServiceConsumer::OnGetTokenFailure(request, error);
     request_.reset(oauth2_service_->StartRequest(
         account_id_, OAuth2TokenService::ScopeSet(), this).release());
@@ -63,7 +63,7 @@ class TestOAuth2TokenService : public OAuth2TokenService {
   }
 
   virtual bool RefreshTokenIsAvailable(const std::string& account_id) const
-      OVERRIDE {
+      override {
     std::map<std::string, std::string>::const_iterator it =
         refresh_tokens_.find(account_id);
 
@@ -72,14 +72,14 @@ class TestOAuth2TokenService : public OAuth2TokenService {
 
  private:
   // OAuth2TokenService implementation.
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE {
+  virtual net::URLRequestContextGetter* GetRequestContext() override {
     return request_context_getter_.get();
   }
 
   virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
-      OAuth2AccessTokenConsumer* consumer) OVERRIDE {
+      OAuth2AccessTokenConsumer* consumer) override {
     std::map<std::string, std::string>::const_iterator it =
         refresh_tokens_.find(account_id);
     DCHECK(it != refresh_tokens_.end());
@@ -93,14 +93,14 @@ class TestOAuth2TokenService : public OAuth2TokenService {
 
 class OAuth2TokenServiceTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     oauth2_service_.reset(
         new TestOAuth2TokenService(new net::TestURLRequestContextGetter(
             message_loop_.message_loop_proxy())));
     account_id_ = "test_user@gmail.com";
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Makes sure that all the clean up tasks are run.
     base::RunLoop().RunUntilIdle();
   }
diff --git a/google_apis/gaia/ubertoken_fetcher.h b/google_apis/gaia/ubertoken_fetcher.h
index 36a8ce2..9172ce1 100644
--- a/google_apis/gaia/ubertoken_fetcher.h
+++ b/google_apis/gaia/ubertoken_fetcher.h
@@ -52,16 +52,16 @@ class UbertokenFetcher : public GaiaAuthConsumer,
   virtual void StartFetchingToken(const std::string& account_id);
 
   // Overriden from GaiaAuthConsumer
-  virtual void OnUberAuthTokenSuccess(const std::string& token) OVERRIDE;
+  virtual void OnUberAuthTokenSuccess(const std::string& token) override;
   virtual void OnUberAuthTokenFailure(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      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;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 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 fe00353..ad5a5b9 100644
--- a/google_apis/gaia/ubertoken_fetcher_unittest.cc
+++ b/google_apis/gaia/ubertoken_fetcher_unittest.cc
@@ -26,13 +26,13 @@ class MockUbertokenConsumer : public UbertokenConsumer {
   }
   virtual ~MockUbertokenConsumer() {}
 
-  virtual void OnUbertokenSuccess(const std::string& token) OVERRIDE {
+  virtual void OnUbertokenSuccess(const std::string& token) override {
     last_token_ = token;
     ++ nb_correct_token_;
   }
 
   virtual void OnUbertokenFailure(const GoogleServiceAuthError& error)
-      OVERRIDE {
+      override {
     last_error_ = error;
     ++nb_error_;
   }
@@ -47,7 +47,7 @@ class MockUbertokenConsumer : public UbertokenConsumer {
 
 class UbertokenFetcherTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         base::MessageLoopProxy::current());
     fetcher_.reset(new UbertokenFetcher(&token_service_,
@@ -56,7 +56,7 @@ class UbertokenFetcherTest : public testing::Test {
                                         request_context_getter_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     fetcher_.reset();
   }
 
diff --git a/google_apis/gcm/base/fake_encryptor.h b/google_apis/gcm/base/fake_encryptor.h
index 01ae67b..894d50b 100644
--- a/google_apis/gcm/base/fake_encryptor.h
+++ b/google_apis/gcm/base/fake_encryptor.h
@@ -17,10 +17,10 @@ class FakeEncryptor : public Encryptor {
   virtual ~FakeEncryptor();
 
   virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) OVERRIDE;
+                             std::string* ciphertext) override;
 
   virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) OVERRIDE;
+                             std::string* plaintext) override;
 };
 
 }  // namespace gcm
diff --git a/google_apis/gcm/base/socket_stream.h b/google_apis/gcm/base/socket_stream.h
index 61aa1fe..4a490f2 100644
--- a/google_apis/gcm/base/socket_stream.h
+++ b/google_apis/gcm/base/socket_stream.h
@@ -66,10 +66,10 @@ class GCM_EXPORT SocketInputStream
   virtual ~SocketInputStream();
 
   // ZeroCopyInputStream implementation.
-  virtual bool Next(const void** data, int* size) OVERRIDE;
-  virtual void BackUp(int count) OVERRIDE;
-  virtual bool Skip(int count) OVERRIDE;  // Not implemented.
-  virtual int64 ByteCount() const OVERRIDE;
+  virtual bool Next(const void** data, int* size) override;
+  virtual void BackUp(int count) override;
+  virtual bool Skip(int count) override;  // Not implemented.
+  virtual int64 ByteCount() const override;
 
   // The remaining amount of valid data available to be read.
   int UnreadByteCount() const;
@@ -162,9 +162,9 @@ class GCM_EXPORT SocketOutputStream
   virtual ~SocketOutputStream();
 
   // ZeroCopyOutputStream implementation.
-  virtual bool Next(void** data, int* size) OVERRIDE;
-  virtual void BackUp(int count) OVERRIDE;
-  virtual int64 ByteCount() const OVERRIDE;
+  virtual bool Next(void** data, int* size) override;
+  virtual void BackUp(int count) override;
+  virtual int64 ByteCount() const override;
 
   // Writes the buffer into the Socket.
   net::Error Flush(const base::Closure& callback);
diff --git a/google_apis/gcm/engine/checkin_request.h b/google_apis/gcm/engine/checkin_request.h
index c48f3c9..af9e48f 100644
--- a/google_apis/gcm/engine/checkin_request.h
+++ b/google_apis/gcm/engine/checkin_request.h
@@ -69,7 +69,7 @@ class GCM_EXPORT CheckinRequest : public net::URLFetcherDelegate {
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // Schedules a retry attempt, informs the backoff of a previous request's
diff --git a/google_apis/gcm/engine/connection_factory_impl.h b/google_apis/gcm/engine/connection_factory_impl.h
index ddd8173..21eeedbe 100644
--- a/google_apis/gcm/engine/connection_factory_impl.h
+++ b/google_apis/gcm/engine/connection_factory_impl.h
@@ -48,18 +48,18 @@ class GCM_EXPORT ConnectionFactoryImpl :
   virtual void Initialize(
       const BuildLoginRequestCallback& request_builder,
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
-      const ConnectionHandler::ProtoSentCallback& write_callback) OVERRIDE;
-  virtual ConnectionHandler* GetConnectionHandler() const OVERRIDE;
-  virtual void Connect() OVERRIDE;
-  virtual bool IsEndpointReachable() const OVERRIDE;
-  virtual std::string GetConnectionStateString() const OVERRIDE;
-  virtual base::TimeTicks NextRetryAttempt() const OVERRIDE;
-  virtual void SignalConnectionReset(ConnectionResetReason reason) OVERRIDE;
-  virtual void SetConnectionListener(ConnectionListener* listener) OVERRIDE;
+      const ConnectionHandler::ProtoSentCallback& write_callback) override;
+  virtual ConnectionHandler* GetConnectionHandler() const override;
+  virtual void Connect() override;
+  virtual bool IsEndpointReachable() const override;
+  virtual std::string GetConnectionStateString() const override;
+  virtual base::TimeTicks NextRetryAttempt() const override;
+  virtual void SignalConnectionReset(ConnectionResetReason reason) override;
+  virtual void SetConnectionListener(ConnectionListener* listener) override;
 
   // NetworkChangeObserver implementation.
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   // Returns the server to which the factory is currently connected, or if
   // a connection is currently pending, the server to which the next connection
diff --git a/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
index 51958ea..0be24e7 100644
--- a/google_apis/gcm/engine/connection_factory_impl_unittest.cc
+++ b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
@@ -85,7 +85,7 @@ class TestBackoffEntry : public net::BackoffEntry {
   explicit TestBackoffEntry(base::SimpleTestTickClock* tick_clock);
   virtual ~TestBackoffEntry();
 
-  virtual base::TimeTicks ImplGetTimeNow() const OVERRIDE;
+  virtual base::TimeTicks ImplGetTimeNow() const override;
 
  private:
   base::SimpleTestTickClock* tick_clock_;
@@ -112,17 +112,17 @@ class TestConnectionFactoryImpl : public ConnectionFactoryImpl {
   void InitializeFactory();
 
   // Overridden stubs.
-  virtual void ConnectImpl() OVERRIDE;
-  virtual void InitHandler() OVERRIDE;
+  virtual void ConnectImpl() override;
+  virtual void InitHandler() override;
   virtual scoped_ptr<net::BackoffEntry> CreateBackoffEntry(
-      const net::BackoffEntry::Policy* const policy) OVERRIDE;
+      const net::BackoffEntry::Policy* const policy) override;
   virtual scoped_ptr<ConnectionHandler> CreateConnectionHandler(
       base::TimeDelta read_timeout,
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
       const ConnectionHandler::ProtoSentCallback& write_callback,
       const ConnectionHandler::ConnectionChangedCallback& connection_callback)
-          OVERRIDE;
-  virtual base::TimeTicks NowTicks() OVERRIDE;
+          override;
+  virtual base::TimeTicks NowTicks() override;
 
   // Helpers for verifying connection attempts are made. Connection results
   // must be consumed.
@@ -271,8 +271,8 @@ class ConnectionFactoryImplTest
 
   // ConnectionFactory::ConnectionListener
   virtual void OnConnected(const GURL& current_server,
-                           const net::IPEndPoint& ip_endpoint) OVERRIDE;
-  virtual void OnDisconnected() OVERRIDE;
+                           const net::IPEndPoint& ip_endpoint) override;
+  virtual void OnDisconnected() override;
 
  private:
   void ConnectionsComplete();
diff --git a/google_apis/gcm/engine/connection_handler_impl.h b/google_apis/gcm/engine/connection_handler_impl.h
index 9f9daa9..296bf6d 100644
--- a/google_apis/gcm/engine/connection_handler_impl.h
+++ b/google_apis/gcm/engine/connection_handler_impl.h
@@ -34,11 +34,11 @@ class GCM_EXPORT ConnectionHandlerImpl : public ConnectionHandler {
 
   // ConnectionHandler implementation.
   virtual void Init(const mcs_proto::LoginRequest& login_request,
-                    net::StreamSocket* socket) OVERRIDE;
-  virtual void Reset() OVERRIDE;
-  virtual bool CanSendMessage() const OVERRIDE;
+                    net::StreamSocket* socket) override;
+  virtual void Reset() override;
+  virtual bool CanSendMessage() const override;
   virtual void SendMessage(const google::protobuf::MessageLite& message)
-      OVERRIDE;
+      override;
 
  private:
   // State machine for handling incoming data. See WaitForData(..) for usage.
diff --git a/google_apis/gcm/engine/fake_connection_factory.h b/google_apis/gcm/engine/fake_connection_factory.h
index b4f0e88..dfba154 100644
--- a/google_apis/gcm/engine/fake_connection_factory.h
+++ b/google_apis/gcm/engine/fake_connection_factory.h
@@ -23,14 +23,14 @@ class FakeConnectionFactory : public ConnectionFactory {
   virtual void Initialize(
       const BuildLoginRequestCallback& request_builder,
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
-      const ConnectionHandler::ProtoSentCallback& write_callback) OVERRIDE;
-  virtual ConnectionHandler* GetConnectionHandler() const OVERRIDE;
-  virtual void Connect() OVERRIDE;
-  virtual bool IsEndpointReachable() const OVERRIDE;
-  virtual std::string GetConnectionStateString() const OVERRIDE;
-  virtual base::TimeTicks NextRetryAttempt() const OVERRIDE;
-  virtual void SignalConnectionReset(ConnectionResetReason reason) OVERRIDE;
-  virtual void SetConnectionListener(ConnectionListener* listener) OVERRIDE;
+      const ConnectionHandler::ProtoSentCallback& write_callback) override;
+  virtual ConnectionHandler* GetConnectionHandler() const override;
+  virtual void Connect() override;
+  virtual bool IsEndpointReachable() const override;
+  virtual std::string GetConnectionStateString() const override;
+  virtual base::TimeTicks NextRetryAttempt() const override;
+  virtual void SignalConnectionReset(ConnectionResetReason reason) override;
+  virtual void SetConnectionListener(ConnectionListener* listener) override;
 
   // Whether a connection reset has been triggered and is yet to run.
   bool reconnect_pending() const { return reconnect_pending_; }
diff --git a/google_apis/gcm/engine/fake_connection_handler.h b/google_apis/gcm/engine/fake_connection_handler.h
index 5229e3f..e176e3a 100644
--- a/google_apis/gcm/engine/fake_connection_handler.h
+++ b/google_apis/gcm/engine/fake_connection_handler.h
@@ -23,11 +23,11 @@ class FakeConnectionHandler : public ConnectionHandler {
 
   // ConnectionHandler implementation.
   virtual void Init(const mcs_proto::LoginRequest& login_request,
-                    net::StreamSocket* socket) OVERRIDE;
-  virtual void Reset() OVERRIDE;
-  virtual bool CanSendMessage() const OVERRIDE;
+                    net::StreamSocket* socket) override;
+  virtual void Reset() override;
+  virtual bool CanSendMessage() const override;
   virtual void SendMessage(const google::protobuf::MessageLite& message)
-      OVERRIDE;
+      override;
 
   // EXPECT's receipt of |message| via SendMessage(..).
   void ExpectOutgoingMessage(const MCSMessage& message);
diff --git a/google_apis/gcm/engine/gcm_store_impl.h b/google_apis/gcm/engine/gcm_store_impl.h
index f860973..b597d6f 100644
--- a/google_apis/gcm/engine/gcm_store_impl.h
+++ b/google_apis/gcm/engine/gcm_store_impl.h
@@ -31,67 +31,67 @@ class GCM_EXPORT GCMStoreImpl : public GCMStore {
   virtual ~GCMStoreImpl();
 
   // Load the directory and pass the initial state back to caller.
-  virtual void Load(const LoadCallback& callback) OVERRIDE;
+  virtual void Load(const LoadCallback& callback) override;
 
   // Closes the GCM store.
-  virtual void Close() OVERRIDE;
+  virtual void Close() override;
 
   // Clears the GCM store of all data and destroys any LevelDB files associated
   // with this store.
   // WARNING: this will permanently destroy any pending outgoing messages
   // and require the device to re-create credentials and serial number mapping
   // tables.
-  virtual void Destroy(const UpdateCallback& callback) OVERRIDE;
+  virtual void Destroy(const UpdateCallback& callback) override;
 
   // Sets this device's messaging credentials.
   virtual void SetDeviceCredentials(uint64 device_android_id,
                                     uint64 device_security_token,
-                                    const UpdateCallback& callback) OVERRIDE;
+                                    const UpdateCallback& callback) override;
 
   // Registration info.
   virtual void AddRegistration(const std::string& app_id,
                                const linked_ptr<RegistrationInfo>& registration,
-                               const UpdateCallback& callback) OVERRIDE;
+                               const UpdateCallback& callback) override;
   virtual void RemoveRegistration(const std::string& app_id,
-                                  const UpdateCallback& callback) OVERRIDE;
+                                  const UpdateCallback& callback) override;
 
   // Unacknowledged incoming message handling.
   virtual void AddIncomingMessage(const std::string& persistent_id,
-                                  const UpdateCallback& callback) OVERRIDE;
+                                  const UpdateCallback& callback) override;
   virtual void RemoveIncomingMessage(const std::string& persistent_id,
-                                     const UpdateCallback& callback) OVERRIDE;
+                                     const UpdateCallback& callback) override;
   virtual void RemoveIncomingMessages(const PersistentIdList& persistent_ids,
-                                      const UpdateCallback& callback) OVERRIDE;
+                                      const UpdateCallback& callback) override;
 
   // Unacknowledged outgoing messages handling.
   virtual bool AddOutgoingMessage(const std::string& persistent_id,
                                   const MCSMessage& message,
-                                  const UpdateCallback& callback) OVERRIDE;
+                                  const UpdateCallback& callback) override;
   virtual void OverwriteOutgoingMessage(const std::string& persistent_id,
                                         const MCSMessage& message,
                                         const UpdateCallback& callback)
-      OVERRIDE;
+      override;
   virtual void RemoveOutgoingMessage(const std::string& persistent_id,
-                                     const UpdateCallback& callback) OVERRIDE;
+                                     const UpdateCallback& callback) override;
   virtual void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
-                                      const UpdateCallback& callback) OVERRIDE;
+                                      const UpdateCallback& callback) override;
 
   // Sets last device's checkin information.
   virtual void SetLastCheckinInfo(const base::Time& time,
                                   const std::set<std::string>& accounts,
-                                  const UpdateCallback& callback) OVERRIDE;
+                                  const UpdateCallback& callback) override;
 
   // G-service settings handling.
   virtual void SetGServicesSettings(
       const std::map<std::string, std::string>& settings,
       const std::string& settings_digest,
-      const UpdateCallback& callback) OVERRIDE;
+      const UpdateCallback& callback) override;
 
   // Sets the account information related to device to account mapping.
   virtual void AddAccountMapping(const AccountMapping& account_mapping,
-                                 const UpdateCallback& callback) OVERRIDE;
+                                 const UpdateCallback& callback) override;
   virtual void RemoveAccountMapping(const std::string& account_id,
-                                    const UpdateCallback& callback) OVERRIDE;
+                                    const UpdateCallback& callback) override;
 
  private:
   typedef std::map<std::string, int> AppIdToMessageCountMap;
diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc
index 0dc1328..16ca617 100644
--- a/google_apis/gcm/engine/mcs_client_unittest.cc
+++ b/google_apis/gcm/engine/mcs_client_unittest.cc
@@ -74,7 +74,7 @@ class TestMCSClient : public MCSClient {
       next_id_(0) {
   }
 
-  virtual std::string GetNextPersistentId() OVERRIDE {
+  virtual std::string GetNextPersistentId() override {
     return base::UintToString(++next_id_);
   }
 
@@ -87,7 +87,7 @@ class MCSClientTest : public testing::Test {
   MCSClientTest();
   virtual ~MCSClientTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   void BuildMCSClient();
   void InitializeClient();
diff --git a/google_apis/gcm/engine/registration_request.h b/google_apis/gcm/engine/registration_request.h
index d41f285..736f4b4 100644
--- a/google_apis/gcm/engine/registration_request.h
+++ b/google_apis/gcm/engine/registration_request.h
@@ -94,7 +94,7 @@ class GCM_EXPORT RegistrationRequest : public net::URLFetcherDelegate {
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // Schedules a retry attempt, informs the backoff of a previous request's
diff --git a/google_apis/gcm/engine/unregistration_request.h b/google_apis/gcm/engine/unregistration_request.h
index aec3331..39887ab 100644
--- a/google_apis/gcm/engine/unregistration_request.h
+++ b/google_apis/gcm/engine/unregistration_request.h
@@ -86,7 +86,7 @@ class GCM_EXPORT UnregistrationRequest : public net::URLFetcherDelegate {
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // Schedules a retry attempt and informs the backoff of previous request's
diff --git a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
index 95d9aa2..9e8646e 100644
--- a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
+++ b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
@@ -15,52 +15,52 @@ class FakeGCMStatsRecorder : public GCMStatsRecorder {
   FakeGCMStatsRecorder();
   virtual ~FakeGCMStatsRecorder();
 
-  virtual void RecordCheckinInitiated(uint64 android_id) OVERRIDE;
-  virtual void RecordCheckinDelayedDueToBackoff(int64 delay_msec) OVERRIDE;
-  virtual void RecordCheckinSuccess() OVERRIDE;
+  virtual void RecordCheckinInitiated(uint64 android_id) override;
+  virtual void RecordCheckinDelayedDueToBackoff(int64 delay_msec) override;
+  virtual void RecordCheckinSuccess() override;
   virtual void RecordCheckinFailure(std::string status,
-                                    bool will_retry) OVERRIDE;
-  virtual void RecordConnectionInitiated(const std::string& host) OVERRIDE;
-  virtual void RecordConnectionDelayedDueToBackoff(int64 delay_msec) OVERRIDE;
-  virtual void RecordConnectionSuccess() OVERRIDE;
-  virtual void RecordConnectionFailure(int network_error) OVERRIDE;
+                                    bool will_retry) override;
+  virtual void RecordConnectionInitiated(const std::string& host) override;
+  virtual void RecordConnectionDelayedDueToBackoff(int64 delay_msec) override;
+  virtual void RecordConnectionSuccess() override;
+  virtual void RecordConnectionFailure(int network_error) override;
   virtual void RecordConnectionResetSignaled(
-      ConnectionFactory::ConnectionResetReason reason) OVERRIDE;
+      ConnectionFactory::ConnectionResetReason reason) override;
   virtual void RecordRegistrationSent(const std::string& app_id,
-                                      const std::string& sender_ids) OVERRIDE;
+                                      const std::string& sender_ids) override;
   virtual void RecordRegistrationResponse(
       const std::string& app_id,
       const std::vector<std::string>& sender_ids,
-      RegistrationRequest::Status status) OVERRIDE;
+      RegistrationRequest::Status status) override;
   virtual void RecordRegistrationRetryRequested(
       const std::string& app_id,
       const std::vector<std::string>& sender_ids,
-      int retries_left) OVERRIDE;
-  virtual void RecordUnregistrationSent(const std::string& app_id) OVERRIDE;
+      int retries_left) override;
+  virtual void RecordUnregistrationSent(const std::string& app_id) override;
   virtual void RecordUnregistrationResponse(
       const std::string& app_id,
-      UnregistrationRequest::Status status) OVERRIDE;
+      UnregistrationRequest::Status status) override;
   virtual void RecordUnregistrationRetryDelayed(const std::string& app_id,
-                                                int64 delay_msec) OVERRIDE;
+                                                int64 delay_msec) override;
   virtual void RecordDataMessageReceived(
       const std::string& app_id,
       const std::string& from,
       int message_byte_size,
       bool to_registered_app,
-      ReceivedMessageType message_type) OVERRIDE;
+      ReceivedMessageType message_type) override;
   virtual void RecordDataSentToWire(const std::string& app_id,
                                     const std::string& receiver_id,
                                     const std::string& message_id,
-                                    int queued) OVERRIDE;
+                                    int queued) override;
   virtual void RecordNotifySendStatus(const std::string& app_id,
                                       const std::string& receiver_id,
                                       const std::string& message_id,
                                       MCSClient::MessageSendStatus status,
                                       int byte_size,
-                                      int ttl) OVERRIDE;
+                                      int ttl) override;
   virtual void RecordIncomingSendError(const std::string& app_id,
                                        const std::string& receiver_id,
-                                       const std::string& message_id) OVERRIDE;
+                                       const std::string& message_id) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeGCMStatsRecorder);
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc
index 099035d..7c83afc 100644
--- a/google_apis/gcm/tools/mcs_probe.cc
+++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -148,7 +148,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
       const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy)
       : TestURLRequestContextGetter(io_message_loop_proxy) {}
 
-  virtual net::TestURLRequestContext* GetURLRequestContext() OVERRIDE {
+  virtual net::TestURLRequestContext* GetURLRequestContext() override {
     // Construct |context_| lazily so it gets constructed on the right
     // thread (the IO thread).
     if (!context_)
@@ -175,11 +175,11 @@ class MyTestCertVerifier : public net::CertVerifier {
                      net::CertVerifyResult* verify_result,
                      const net::CompletionCallback& callback,
                      RequestHandle* out_req,
-                     const net::BoundNetLog& net_log) OVERRIDE {
+                     const net::BoundNetLog& net_log) override {
     return net::OK;
   }
 
-  virtual void CancelRequest(RequestHandle req) OVERRIDE {
+  virtual void CancelRequest(RequestHandle req) override {
     // Do nothing.
   }
 };