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}

45 files changed, 459 insertions, 480 deletions

diff --git a/google_apis/drive/auth_service.cc b/google_apis/drive/auth_service.cc
index 82fc529..db49760 100644
--- a/google_apis/drive/auth_service.cc
+++ b/google_apis/drive/auth_service.cc
@@ -41,15 +41,15 @@ class AuthRequest : public OAuth2TokenService::Consumer {
               net::URLRequestContextGetter* url_request_context_getter,
               const AuthStatusCallback& callback,
               const std::vector<std::string>& scopes);
-  virtual ~AuthRequest();
+  ~AuthRequest() override;
 
  private:
   // Overridden 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;
 
   AuthStatusCallback callback_;
   scoped_ptr<OAuth2TokenService::Request> request_;
diff --git a/google_apis/drive/auth_service.h b/google_apis/drive/auth_service.h
index 2c74ad1..381abeb 100644
--- a/google_apis/drive/auth_service.h
+++ b/google_apis/drive/auth_service.h
@@ -37,21 +37,21 @@ class AuthService : public AuthServiceInterface,
               const std::string& account_id,
               net::URLRequestContextGetter* url_request_context_getter,
               const std::vector<std::string>& scopes);
-  virtual ~AuthService();
+  ~AuthService() override;
 
   // 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;
+  void AddObserver(AuthServiceObserver* observer) override;
+  void RemoveObserver(AuthServiceObserver* observer) override;
+  void StartAuthentication(const AuthStatusCallback& callback) override;
+  bool HasAccessToken() const override;
+  bool HasRefreshToken() const override;
+  const std::string& access_token() const override;
+  void ClearAccessToken() override;
+  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;
+  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  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 5721933..fb1bf08 100644
--- a/google_apis/drive/base_requests.h
+++ b/google_apis/drive/base_requests.h
@@ -89,7 +89,7 @@ class ResponseWriter : public net::URLFetcherResponseWriter {
   ResponseWriter(base::SequencedTaskRunner* file_task_runner,
                  const base::FilePath& file_path,
                  const GetContentCallback& get_content_callback);
-  virtual ~ResponseWriter();
+  ~ResponseWriter() override;
 
   const std::string& data() const { return data_; }
 
@@ -97,11 +97,11 @@ class ResponseWriter : public net::URLFetcherResponseWriter {
   void DisownFile();
 
   // URLFetcherResponseWriter overrides:
-  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;
+  int Initialize(const net::CompletionCallback& callback) override;
+  int Write(net::IOBuffer* buffer,
+            int num_bytes,
+            const net::CompletionCallback& callback) override;
+  int Finish(const net::CompletionCallback& callback) override;
 
  private:
   void DidWrite(scoped_refptr<net::IOBuffer> buffer,
@@ -123,15 +123,15 @@ class UrlFetchRequestBase : public AuthenticatedRequestInterface,
                             public net::URLFetcherDelegate {
  public:
   // 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;
+  void Start(const std::string& access_token,
+             const std::string& custom_user_agent,
+             const ReAuthenticateCallback& callback) override;
+  base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() override;
+  void Cancel() override;
 
  protected:
   explicit UrlFetchRequestBase(RequestSender* sender);
-  virtual ~UrlFetchRequestBase();
+  ~UrlFetchRequestBase() override;
 
   // Gets URL for the request.
   virtual GURL GetURL() const = 0;
@@ -194,10 +194,10 @@ class UrlFetchRequestBase : public AuthenticatedRequestInterface,
 
  private:
   // URLFetcherDelegate overrides.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // AuthenticatedRequestInterface overrides.
-  virtual void OnAuthFailed(GDataErrorCode code) override;
+  void OnAuthFailed(GDataErrorCode code) override;
 
   ReAuthenticateCallback re_authenticate_callback_;
   int re_authenticate_count_;
@@ -228,12 +228,12 @@ class EntryActionRequest : public UrlFetchRequestBase {
   // failure. It must not be null.
   EntryActionRequest(RequestSender* sender,
                      const EntryActionCallback& callback);
-  virtual ~EntryActionRequest();
+  ~EntryActionRequest() override;
 
  protected:
   // Overridden from UrlFetchRequestBase.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
+  void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
 
  private:
   const EntryActionCallback callback_;
@@ -268,12 +268,12 @@ class InitiateUploadRequestBase : public UrlFetchRequestBase {
                             const InitiateUploadCallback& callback,
                             const std::string& content_type,
                             int64 content_length);
-  virtual ~InitiateUploadRequestBase();
+  ~InitiateUploadRequestBase() override;
 
   // UrlFetchRequestBase overrides.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
-  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
+  void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
+  std::vector<std::string> GetExtraRequestHeaders() const override;
 
  private:
   const InitiateUploadCallback callback_;
@@ -311,13 +311,13 @@ class UploadRangeRequestBase : public UrlFetchRequestBase {
  protected:
   // |upload_url| is the URL of where to upload the file to.
   UploadRangeRequestBase(RequestSender* sender, const GURL& upload_url);
-  virtual ~UploadRangeRequestBase();
+  ~UploadRangeRequestBase() override;
 
   // 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;
+  GURL GetURL() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
 
   // This method will be called when the request is done, regardless of
   // whether it is succeeded or failed.
@@ -378,14 +378,14 @@ class ResumeUploadRequestBase : public UploadRangeRequestBase {
                           int64 content_length,
                           const std::string& content_type,
                           const base::FilePath& local_file_path);
-  virtual ~ResumeUploadRequestBase();
+  ~ResumeUploadRequestBase() override;
 
   // UrlFetchRequestBase overrides.
-  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::vector<std::string> GetExtraRequestHeaders() const override;
+  bool GetContentFile(base::FilePath* local_file_path,
+                      int64* range_offset,
+                      int64* range_length,
+                      std::string* upload_content_type) override;
 
  private:
   // The parameters for the request. See ResumeUploadParams for the details.
@@ -416,11 +416,11 @@ class GetUploadStatusRequestBase : public UploadRangeRequestBase {
   GetUploadStatusRequestBase(RequestSender* sender,
                              const GURL& upload_url,
                              int64 content_length);
-  virtual ~GetUploadStatusRequestBase();
+  ~GetUploadStatusRequestBase() override;
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual std::vector<std::string> GetExtraRequestHeaders() const override;
+  std::vector<std::string> GetExtraRequestHeaders() const override;
 
  private:
   const int64 content_length_;
@@ -462,20 +462,20 @@ class DownloadFileRequestBase : public UrlFetchRequestBase {
       const ProgressCallback& progress_callback,
       const GURL& download_url,
       const base::FilePath& output_file_path);
-  virtual ~DownloadFileRequestBase();
+  ~DownloadFileRequestBase() override;
 
  protected:
   // UrlFetchRequestBase overrides.
-  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;
+  GURL GetURL() const override;
+  void GetOutputFilePath(base::FilePath* local_file_path,
+                         GetContentCallback* get_content_callback) override;
+  void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  void RunCallbackOnPrematureFailure(GDataErrorCode code) override;
 
   // net::URLFetcherDelegate overrides.
-  virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                          int64 current, int64 total) override;
+  void OnURLFetchDownloadProgress(const net::URLFetcher* source,
+                                  int64 current,
+                                  int64 total) override;
 
  private:
   const DownloadActionCallback download_action_callback_;
diff --git a/google_apis/drive/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc
index 3865eee..e4e918b 100644
--- a/google_apis/drive/base_requests_unittest.cc
+++ b/google_apis/drive/base_requests_unittest.cc
@@ -35,15 +35,14 @@ class FakeUrlFetchRequest : public UrlFetchRequestBase {
         url_(url) {
   }
 
-  virtual ~FakeUrlFetchRequest() {
-  }
+  ~FakeUrlFetchRequest() override {}
 
  protected:
-  virtual GURL GetURL() const override { return url_; }
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override {
+  GURL GetURL() const override { return url_; }
+  void ProcessURLFetchResults(const net::URLFetcher* source) override {
     callback_.Run(GetErrorCode());
   }
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) override {
+  void RunCallbackOnPrematureFailure(GDataErrorCode code) override {
     callback_.Run(code);
   }
 
diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_api_requests.h
index a160eeb..f7ff826 100644
--- a/google_apis/drive/drive_api_requests.h
+++ b/google_apis/drive/drive_api_requests.h
@@ -47,7 +47,7 @@ namespace drive {
 class DriveApiPartialFieldRequest : public UrlFetchRequestBase {
  public:
   explicit DriveApiPartialFieldRequest(RequestSender* sender);
-  virtual ~DriveApiPartialFieldRequest();
+  ~DriveApiPartialFieldRequest() override;
 
   // Optional parameter.
   const std::string& fields() const { return fields_; }
@@ -55,7 +55,7 @@ class DriveApiPartialFieldRequest : public UrlFetchRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const override;
+  GURL GetURL() const override;
 
   // Derived classes should override GetURLInternal instead of GetURL()
   // directly.
@@ -146,7 +146,7 @@ class FilesGetRequest : public DriveApiDataRequest<FileResource> {
   FilesGetRequest(RequestSender* sender,
                   const DriveApiUrlGenerator& url_generator,
                   const FileResourceCallback& callback);
-  virtual ~FilesGetRequest();
+  ~FilesGetRequest() override;
 
   // Required parameter.
   const std::string& file_id() const { return file_id_; }
@@ -154,7 +154,7 @@ class FilesGetRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -172,7 +172,7 @@ class FilesAuthorizeRequest : public DriveApiDataRequest<FileResource> {
   FilesAuthorizeRequest(RequestSender* sender,
                         const DriveApiUrlGenerator& url_generator,
                         const FileResourceCallback& callback);
-  virtual ~FilesAuthorizeRequest();
+  ~FilesAuthorizeRequest() override;
 
   // Required parameter.
   const std::string& file_id() const { return file_id_; }
@@ -182,10 +182,10 @@ class FilesAuthorizeRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from GetDataRequest.
-  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -207,7 +207,7 @@ class FilesInsertRequest : public DriveApiDataRequest<FileResource> {
   FilesInsertRequest(RequestSender* sender,
                      const DriveApiUrlGenerator& url_generator,
                      const FileResourceCallback& callback);
-  virtual ~FilesInsertRequest();
+  ~FilesInsertRequest() override;
 
   // Optional request body.
   const base::Time& last_viewed_by_me_date() const {
@@ -235,12 +235,12 @@ class FilesInsertRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from GetDataRequest.
-  virtual net::URLFetcher::RequestType GetRequestType() const override;
-  virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  bool GetContentData(std::string* upload_content_type,
+                      std::string* upload_content) override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -264,7 +264,7 @@ class FilesPatchRequest : public DriveApiDataRequest<FileResource> {
   FilesPatchRequest(RequestSender* sender,
                     const DriveApiUrlGenerator& url_generator,
                     const FileResourceCallback& callback);
-  virtual ~FilesPatchRequest();
+  ~FilesPatchRequest() override;
 
   // Required parameter.
   const std::string& file_id() const { return file_id_; }
@@ -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 bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  std::vector<std::string> GetExtraRequestHeaders() const override;
+  bool GetContentData(std::string* upload_content_type,
+                      std::string* upload_content) override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -339,7 +339,7 @@ class FilesCopyRequest : public DriveApiDataRequest<FileResource> {
   FilesCopyRequest(RequestSender* sender,
                    const DriveApiUrlGenerator& url_generator,
                    const FileResourceCallback& callback);
-  virtual ~FilesCopyRequest();
+  ~FilesCopyRequest() override;
 
   // Required parameter.
   const std::string& file_id() const { return file_id_; }
@@ -359,12 +359,12 @@ class FilesCopyRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from URLFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const override;
-  virtual bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  bool GetContentData(std::string* upload_content_type,
+                      std::string* upload_content) override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -390,7 +390,7 @@ class FilesListRequest : public DriveApiDataRequest<FileList> {
   FilesListRequest(RequestSender* sender,
                    const DriveApiUrlGenerator& url_generator,
                    const FileListCallback& callback);
-  virtual ~FilesListRequest();
+  ~FilesListRequest() override;
 
   // Optional parameter
   int max_results() const { return max_results_; }
@@ -406,7 +406,7 @@ class FilesListRequest : public DriveApiDataRequest<FileList> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -427,14 +427,14 @@ class FilesListNextPageRequest : public DriveApiDataRequest<FileList> {
  public:
   FilesListNextPageRequest(RequestSender* sender,
                            const FileListCallback& callback);
-  virtual ~FilesListNextPageRequest();
+  ~FilesListNextPageRequest() override;
 
   const GURL& next_link() const { return next_link_; }
   void set_next_link(const GURL& next_link) { next_link_ = next_link; }
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   GURL next_link_;
@@ -452,7 +452,7 @@ class FilesDeleteRequest : public EntryActionRequest {
   FilesDeleteRequest(RequestSender* sender,
                      const DriveApiUrlGenerator& url_generator,
                      const EntryActionCallback& callback);
-  virtual ~FilesDeleteRequest();
+  ~FilesDeleteRequest() override;
 
   // Required parameter.
   const std::string& file_id() const { return file_id_; }
@@ -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;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  GURL GetURL() const override;
+  std::vector<std::string> GetExtraRequestHeaders() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -483,7 +483,7 @@ class FilesTrashRequest : public DriveApiDataRequest<FileResource> {
   FilesTrashRequest(RequestSender* sender,
                     const DriveApiUrlGenerator& url_generator,
                     const FileResourceCallback& callback);
-  virtual ~FilesTrashRequest();
+  ~FilesTrashRequest() override;
 
   // Required parameter.
   const std::string& file_id() const { return file_id_; }
@@ -491,10 +491,10 @@ class FilesTrashRequest : public DriveApiDataRequest<FileResource> {
 
  protected:
   // Overridden from UrlFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
 
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -513,11 +513,11 @@ class AboutGetRequest : public DriveApiDataRequest<AboutResource> {
   AboutGetRequest(RequestSender* sender,
                   const DriveApiUrlGenerator& url_generator,
                   const AboutResourceCallback& callback);
-  virtual ~AboutGetRequest();
+  ~AboutGetRequest() override;
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -538,7 +538,7 @@ class ChangesListRequest : public DriveApiDataRequest<ChangeList> {
   ChangesListRequest(RequestSender* sender,
                      const DriveApiUrlGenerator& url_generator,
                      const ChangeListCallback& callback);
-  virtual ~ChangesListRequest();
+  ~ChangesListRequest() override;
 
   // Optional parameter
   bool include_deleted() const { return include_deleted_; }
@@ -561,7 +561,7 @@ class ChangesListRequest : public DriveApiDataRequest<ChangeList> {
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -583,14 +583,14 @@ class ChangesListNextPageRequest : public DriveApiDataRequest<ChangeList> {
  public:
   ChangesListNextPageRequest(RequestSender* sender,
                              const ChangeListCallback& callback);
-  virtual ~ChangesListNextPageRequest();
+  ~ChangesListNextPageRequest() override;
 
   const GURL& next_link() const { return next_link_; }
   void set_next_link(const GURL& next_link) { next_link_ = next_link; }
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   GURL next_link_;
@@ -609,11 +609,11 @@ class AppsListRequest : public DriveApiDataRequest<AppList> {
                   const DriveApiUrlGenerator& url_generator,
                   bool use_internal_endpoint,
                   const AppListCallback& callback);
-  virtual ~AppsListRequest();
+  ~AppsListRequest() override;
 
  protected:
   // Overridden from DriveApiDataRequest.
-  virtual GURL GetURLInternal() const override;
+  GURL GetURLInternal() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -632,7 +632,7 @@ class AppsDeleteRequest : public EntryActionRequest {
   AppsDeleteRequest(RequestSender* sender,
                     const DriveApiUrlGenerator& url_generator,
                     const EntryActionCallback& callback);
-  virtual ~AppsDeleteRequest();
+  ~AppsDeleteRequest() override;
 
   // Required parameter.
   const std::string& app_id() const { return app_id_; }
@@ -640,8 +640,8 @@ class AppsDeleteRequest : public EntryActionRequest {
 
  protected:
   // Overridden from UrlFetchRequestBase.
-  virtual net::URLFetcher::RequestType GetRequestType() const override;
-  virtual GURL GetURL() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  GURL GetURL() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -660,7 +660,7 @@ class ChildrenInsertRequest : public EntryActionRequest {
   ChildrenInsertRequest(RequestSender* sender,
                         const DriveApiUrlGenerator& url_generator,
                         const EntryActionCallback& callback);
-  virtual ~ChildrenInsertRequest();
+  ~ChildrenInsertRequest() override;
 
   // Required parameter.
   const std::string& folder_id() const { return folder_id_; }
@@ -674,10 +674,10 @@ class ChildrenInsertRequest : public EntryActionRequest {
 
  protected:
   // UrlFetchRequestBase overrides.
-  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;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  GURL GetURL() const override;
+  bool GetContentData(std::string* upload_content_type,
+                      std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -698,7 +698,7 @@ class ChildrenDeleteRequest : public EntryActionRequest {
   ChildrenDeleteRequest(RequestSender* sender,
                         const DriveApiUrlGenerator& url_generator,
                         const EntryActionCallback& callback);
-  virtual ~ChildrenDeleteRequest();
+  ~ChildrenDeleteRequest() override;
 
   // Required parameter.
   const std::string& child_id() const { return child_id_; }
@@ -713,8 +713,8 @@ class ChildrenDeleteRequest : public EntryActionRequest {
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual net::URLFetcher::RequestType GetRequestType() const override;
-  virtual GURL GetURL() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  GURL GetURL() const override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -740,7 +740,7 @@ class InitiateUploadNewFileRequest : public InitiateUploadRequestBase {
                                const std::string& parent_resource_id,
                                const std::string& title,
                                const InitiateUploadCallback& callback);
-  virtual ~InitiateUploadNewFileRequest();
+  ~InitiateUploadNewFileRequest() override;
 
   // Optional parameters.
   const base::Time& modified_date() const { return modified_date_; }
@@ -756,10 +756,10 @@ class InitiateUploadNewFileRequest : public InitiateUploadRequestBase {
 
  protected:
   // UrlFetchRequestBase overrides.
-  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;
+  GURL GetURL() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  bool GetContentData(std::string* upload_content_type,
+                      std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -790,8 +790,7 @@ class InitiateUploadExistingFileRequest : public InitiateUploadRequestBase {
                                     const std::string& resource_id,
                                     const std::string& etag,
                                     const InitiateUploadCallback& callback);
-  virtual ~InitiateUploadExistingFileRequest();
-
+  ~InitiateUploadExistingFileRequest() override;
 
   // Optional parameters.
   const std::string& parent_resource_id() const { return parent_resource_id_; }
@@ -813,11 +812,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 bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) override;
+  GURL GetURL() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  std::vector<std::string> GetExtraRequestHeaders() const override;
+  bool GetContentData(std::string* upload_content_type,
+                      std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
@@ -853,16 +852,16 @@ class ResumeUploadRequest : public ResumeUploadRequestBase {
                       const base::FilePath& local_file_path,
                       const UploadRangeCallback& callback,
                       const ProgressCallback& progress_callback);
-  virtual ~ResumeUploadRequest();
+  ~ResumeUploadRequest() override;
 
  protected:
   // UploadRangeRequestBase overrides.
-  virtual void OnRangeRequestComplete(
-      const UploadRangeResponse& response,
-      scoped_ptr<base::Value> value) override;
+  void OnRangeRequestComplete(const UploadRangeResponse& response,
+                              scoped_ptr<base::Value> value) override;
   // content::UrlFetcherDelegate overrides.
-  virtual void OnURLFetchUploadProgress(const net::URLFetcher* source,
-                                        int64 current, int64 total) override;
+  void OnURLFetchUploadProgress(const net::URLFetcher* source,
+                                int64 current,
+                                int64 total) override;
 
  private:
   const UploadRangeCallback callback_;
@@ -882,13 +881,12 @@ class GetUploadStatusRequest : public GetUploadStatusRequestBase {
                          const GURL& upload_url,
                          int64 content_length,
                          const UploadRangeCallback& callback);
-  virtual ~GetUploadStatusRequest();
+  ~GetUploadStatusRequest() override;
 
  protected:
   // UploadRangeRequestBase overrides.
-  virtual void OnRangeRequestComplete(
-      const UploadRangeResponse& response,
-      scoped_ptr<base::Value> value) override;
+  void OnRangeRequestComplete(const UploadRangeResponse& response,
+                              scoped_ptr<base::Value> value) override;
 
  private:
   const UploadRangeCallback callback_;
@@ -909,7 +907,7 @@ class DownloadFileRequest : public DownloadFileRequestBase {
                       const DownloadActionCallback& download_action_callback,
                       const GetContentCallback& get_content_callback,
                       const ProgressCallback& progress_callback);
-  virtual ~DownloadFileRequest();
+  ~DownloadFileRequest() override;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileRequest);
 };
@@ -939,7 +937,7 @@ class PermissionsInsertRequest : public EntryActionRequest {
   PermissionsInsertRequest(RequestSender* sender,
                            const DriveApiUrlGenerator& url_generator,
                            const EntryActionCallback& callback);
-  virtual ~PermissionsInsertRequest();
+  ~PermissionsInsertRequest() override;
 
   void set_id(const std::string& id) { id_ = id; }
   void set_type(PermissionType type) { type_ = type; }
@@ -947,10 +945,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 bool GetContentData(std::string* upload_content_type,
-                              std::string* upload_content) override;
+  GURL GetURL() const override;
+  net::URLFetcher::RequestType GetRequestType() const override;
+  bool GetContentData(std::string* upload_content_type,
+                      std::string* upload_content) override;
 
  private:
   const DriveApiUrlGenerator url_generator_;
diff --git a/google_apis/drive/dummy_auth_service.h b/google_apis/drive/dummy_auth_service.h
index 38b6774..87236e6 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;
+  void AddObserver(AuthServiceObserver* observer) override;
+  void RemoveObserver(AuthServiceObserver* observer) override;
+  void StartAuthentication(const AuthStatusCallback& callback) override;
+  bool HasAccessToken() const override;
+  bool HasRefreshToken() const override;
+  const std::string& access_token() const override;
+  void ClearAccessToken() override;
+  void ClearRefreshToken() override;
 
  private:
   std::string access_token_;
diff --git a/google_apis/drive/gdata_wapi_parser.h b/google_apis/drive/gdata_wapi_parser.h
index f7bce81..5d2ec50 100644
--- a/google_apis/drive/gdata_wapi_parser.h
+++ b/google_apis/drive/gdata_wapi_parser.h
@@ -317,7 +317,7 @@ class ResourceEntry : public CommonMetadata {
     ENTRY_KIND_FILE
   };
   ResourceEntry();
-  virtual ~ResourceEntry();
+  ~ResourceEntry() override;
 
   // Extracts "entry" dictionary from the JSON value, and parse the contents,
   // using CreateFrom(). Returns NULL on failure. The input JSON data, coming
@@ -517,7 +517,7 @@ class ResourceEntry : public CommonMetadata {
 class ResourceList : public CommonMetadata {
  public:
   ResourceList();
-  virtual ~ResourceList();
+  ~ResourceList() override;
 
   // Extracts "feed" dictionary from the JSON value, and parse the contents,
   // using CreateFrom(). Returns NULL on failure. The input JSON data, coming
diff --git a/google_apis/drive/gdata_wapi_requests.h b/google_apis/drive/gdata_wapi_requests.h
index aa4e69f..4a9962b 100644
--- a/google_apis/drive/gdata_wapi_requests.h
+++ b/google_apis/drive/gdata_wapi_requests.h
@@ -28,13 +28,13 @@ class GetResourceEntryRequest : public UrlFetchRequestBase {
                           const std::string& resource_id,
                           const GURL& embed_origin,
                           const GetResourceEntryCallback& callback);
-  virtual ~GetResourceEntryRequest();
+  ~GetResourceEntryRequest() override;
 
  protected:
   // UrlFetchRequestBase overrides.
-  virtual void ProcessURLFetchResults(const net::URLFetcher* source) override;
-  virtual void RunCallbackOnPrematureFailure(GDataErrorCode error) override;
-  virtual GURL GetURL() const override;
+  void ProcessURLFetchResults(const net::URLFetcher* source) override;
+  void RunCallbackOnPrematureFailure(GDataErrorCode error) override;
+  GURL GetURL() const override;
 
  private:
   void OnDataParsed(GDataErrorCode error, scoped_ptr<ResourceEntry> entry);
diff --git a/google_apis/drive/request_sender_unittest.cc b/google_apis/drive/request_sender_unittest.cc
index 7771164..5452578 100644
--- a/google_apis/drive/request_sender_unittest.cc
+++ b/google_apis/drive/request_sender_unittest.cc
@@ -31,8 +31,7 @@ class TestAuthService : public DummyAuthService {
  public:
   TestAuthService() : auth_try_count_(0) {}
 
-  virtual void StartAuthentication(
-      const AuthStatusCallback& callback) override {
+  void StartAuthentication(const AuthStatusCallback& callback) override {
     // RequestSender should clear the rejected access token before starting
     // to request another one.
     EXPECT_FALSE(HasAccessToken());
@@ -95,9 +94,9 @@ class TestRequest : public AuthenticatedRequestInterface {
     return passed_reauth_callback_;
   }
 
-  virtual void Start(const std::string& access_token,
-                     const std::string& custom_user_agent,
-                     const ReAuthenticateCallback& callback) override {
+  void Start(const std::string& access_token,
+             const std::string& custom_user_agent,
+             const ReAuthenticateCallback& callback) override {
     *start_called_ = true;
     passed_access_token_ = access_token;
     passed_reauth_callback_ = callback;
@@ -106,18 +105,18 @@ class TestRequest : public AuthenticatedRequestInterface {
     // Each test case should respond properly by using the above methods.
   }
 
-  virtual void Cancel() override {
+  void Cancel() override {
     EXPECT_TRUE(*start_called_);
     *finish_reason_ = CANCEL;
     sender_->RequestFinished(this);
   }
 
-  virtual void OnAuthFailed(GDataErrorCode code) override {
+  void OnAuthFailed(GDataErrorCode code) override {
     *finish_reason_ = AUTH_FAILURE;
     sender_->RequestFinished(this);
   }
 
-  virtual base::WeakPtr<AuthenticatedRequestInterface> GetWeakPtr() override {
+  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 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_;
   }
diff --git a/google_apis/gcm/base/fake_encryptor.h b/google_apis/gcm/base/fake_encryptor.h
index 894d50b..4277292 100644
--- a/google_apis/gcm/base/fake_encryptor.h
+++ b/google_apis/gcm/base/fake_encryptor.h
@@ -14,13 +14,13 @@ namespace gcm {
 // ciphertext.  Obviously, this should be used only for testing.
 class FakeEncryptor : public Encryptor {
  public:
-  virtual ~FakeEncryptor();
+  ~FakeEncryptor() override;
 
-  virtual bool EncryptString(const std::string& plaintext,
-                             std::string* ciphertext) override;
+  bool EncryptString(const std::string& plaintext,
+                     std::string* ciphertext) override;
 
-  virtual bool DecryptString(const std::string& ciphertext,
-                             std::string* plaintext) override;
+  bool DecryptString(const std::string& ciphertext,
+                     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 4a490f2..527056a 100644
--- a/google_apis/gcm/base/socket_stream.h
+++ b/google_apis/gcm/base/socket_stream.h
@@ -63,13 +63,13 @@ class GCM_EXPORT SocketInputStream
 
   // |socket| should already be connected.
   explicit SocketInputStream(net::StreamSocket* socket);
-  virtual ~SocketInputStream();
+  ~SocketInputStream() override;
 
   // 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;
+  bool Next(const void** data, int* size) override;
+  void BackUp(int count) override;
+  bool Skip(int count) override;  // Not implemented.
+  int64 ByteCount() const override;
 
   // The remaining amount of valid data available to be read.
   int UnreadByteCount() const;
@@ -159,12 +159,12 @@ class GCM_EXPORT SocketOutputStream
 
   // |socket| should already be connected.
   explicit SocketOutputStream(net::StreamSocket* socket);
-  virtual ~SocketOutputStream();
+  ~SocketOutputStream() override;
 
   // ZeroCopyOutputStream implementation.
-  virtual bool Next(void** data, int* size) override;
-  virtual void BackUp(int count) override;
-  virtual int64 ByteCount() const override;
+  bool Next(void** data, int* size) override;
+  void BackUp(int count) override;
+  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 af9e48f..e3ad8ed 100644
--- a/google_apis/gcm/engine/checkin_request.h
+++ b/google_apis/gcm/engine/checkin_request.h
@@ -64,12 +64,12 @@ class GCM_EXPORT CheckinRequest : public net::URLFetcherDelegate {
                  const CheckinRequestCallback& callback,
                  net::URLRequestContextGetter* request_context_getter,
                  GCMStatsRecorder* recorder);
-  virtual ~CheckinRequest();
+  ~CheckinRequest() override;
 
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  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 21eeedbe..b28e8f6 100644
--- a/google_apis/gcm/engine/connection_factory_impl.h
+++ b/google_apis/gcm/engine/connection_factory_impl.h
@@ -42,23 +42,23 @@ class GCM_EXPORT ConnectionFactoryImpl :
       const scoped_refptr<net::HttpNetworkSession>& http_network_session,
       net::NetLog* net_log,
       GCMStatsRecorder* recorder);
-  virtual ~ConnectionFactoryImpl();
+  ~ConnectionFactoryImpl() override;
 
   // ConnectionFactory implementation.
-  virtual void Initialize(
+  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;
+  ConnectionHandler* GetConnectionHandler() const override;
+  void Connect() override;
+  bool IsEndpointReachable() const override;
+  std::string GetConnectionStateString() const override;
+  base::TimeTicks NextRetryAttempt() const override;
+  void SignalConnectionReset(ConnectionResetReason reason) override;
+  void SetConnectionListener(ConnectionListener* listener) override;
 
   // NetworkChangeObserver implementation.
-  virtual void OnNetworkChanged(
+  void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   // Returns the server to which the factory is currently connected, or if
diff --git a/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
index 415602ed..af04fb7 100644
--- a/google_apis/gcm/engine/connection_factory_impl_unittest.cc
+++ b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
@@ -83,9 +83,9 @@ void WriteContinuation() {
 class TestBackoffEntry : public net::BackoffEntry {
  public:
   explicit TestBackoffEntry(base::SimpleTestTickClock* tick_clock);
-  virtual ~TestBackoffEntry();
+  ~TestBackoffEntry() override;
 
-  virtual base::TimeTicks ImplGetTimeNow() const override;
+  base::TimeTicks ImplGetTimeNow() const override;
 
  private:
   base::SimpleTestTickClock* tick_clock_;
@@ -107,22 +107,22 @@ base::TimeTicks TestBackoffEntry::ImplGetTimeNow() const {
 class TestConnectionFactoryImpl : public ConnectionFactoryImpl {
  public:
   TestConnectionFactoryImpl(const base::Closure& finished_callback);
-  virtual ~TestConnectionFactoryImpl();
+  ~TestConnectionFactoryImpl() override;
 
   void InitializeFactory();
 
   // Overridden stubs.
-  virtual void ConnectImpl() override;
-  virtual void InitHandler() override;
-  virtual scoped_ptr<net::BackoffEntry> CreateBackoffEntry(
+  void ConnectImpl() override;
+  void InitHandler() override;
+  scoped_ptr<net::BackoffEntry> CreateBackoffEntry(
       const net::BackoffEntry::Policy* const policy) override;
-  virtual scoped_ptr<ConnectionHandler> CreateConnectionHandler(
+  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;
+  base::TimeTicks NowTicks() override;
 
   // Helpers for verifying connection attempts are made. Connection results
   // must be consumed.
@@ -266,9 +266,9 @@ class ConnectionFactoryImplTest
   void WaitForConnections();
 
   // ConnectionFactory::ConnectionListener
-  virtual void OnConnected(const GURL& current_server,
-                           const net::IPEndPoint& ip_endpoint) override;
-  virtual void OnDisconnected() override;
+  void OnConnected(const GURL& current_server,
+                   const net::IPEndPoint& ip_endpoint) override;
+  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 296bf6d..fc965fb 100644
--- a/google_apis/gcm/engine/connection_handler_impl.h
+++ b/google_apis/gcm/engine/connection_handler_impl.h
@@ -30,15 +30,14 @@ class GCM_EXPORT ConnectionHandlerImpl : public ConnectionHandler {
       const ProtoReceivedCallback& read_callback,
       const ProtoSentCallback& write_callback,
       const ConnectionChangedCallback& connection_callback);
-  virtual ~ConnectionHandlerImpl();
+  ~ConnectionHandlerImpl() override;
 
   // ConnectionHandler implementation.
-  virtual void Init(const mcs_proto::LoginRequest& login_request,
-                    net::StreamSocket* socket) override;
-  virtual void Reset() override;
-  virtual bool CanSendMessage() const override;
-  virtual void SendMessage(const google::protobuf::MessageLite& message)
-      override;
+  void Init(const mcs_proto::LoginRequest& login_request,
+            net::StreamSocket* socket) override;
+  void Reset() override;
+  bool CanSendMessage() const override;
+  void SendMessage(const google::protobuf::MessageLite& message) 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 dfba154..9826270 100644
--- a/google_apis/gcm/engine/fake_connection_factory.h
+++ b/google_apis/gcm/engine/fake_connection_factory.h
@@ -17,20 +17,20 @@ class FakeConnectionHandler;
 class FakeConnectionFactory : public ConnectionFactory {
  public:
   FakeConnectionFactory();
-  virtual ~FakeConnectionFactory();
+  ~FakeConnectionFactory() override;
 
   // ConnectionFactory implementation.
-  virtual void Initialize(
+  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;
+  ConnectionHandler* GetConnectionHandler() const override;
+  void Connect() override;
+  bool IsEndpointReachable() const override;
+  std::string GetConnectionStateString() const override;
+  base::TimeTicks NextRetryAttempt() const override;
+  void SignalConnectionReset(ConnectionResetReason reason) override;
+  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 e176e3a..4e43d12 100644
--- a/google_apis/gcm/engine/fake_connection_handler.h
+++ b/google_apis/gcm/engine/fake_connection_handler.h
@@ -19,15 +19,14 @@ class FakeConnectionHandler : public ConnectionHandler {
   FakeConnectionHandler(
       const ConnectionHandler::ProtoReceivedCallback& read_callback,
       const ConnectionHandler::ProtoSentCallback& write_callback);
-  virtual ~FakeConnectionHandler();
+  ~FakeConnectionHandler() override;
 
   // ConnectionHandler implementation.
-  virtual void Init(const mcs_proto::LoginRequest& login_request,
-                    net::StreamSocket* socket) override;
-  virtual void Reset() override;
-  virtual bool CanSendMessage() const override;
-  virtual void SendMessage(const google::protobuf::MessageLite& message)
-      override;
+  void Init(const mcs_proto::LoginRequest& login_request,
+            net::StreamSocket* socket) override;
+  void Reset() override;
+  bool CanSendMessage() const override;
+  void SendMessage(const google::protobuf::MessageLite& message) 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 b597d6f..283b920 100644
--- a/google_apis/gcm/engine/gcm_store_impl.h
+++ b/google_apis/gcm/engine/gcm_store_impl.h
@@ -28,70 +28,68 @@ class GCM_EXPORT GCMStoreImpl : public GCMStore {
   GCMStoreImpl(const base::FilePath& path,
                scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
                scoped_ptr<Encryptor> encryptor);
-  virtual ~GCMStoreImpl();
+  ~GCMStoreImpl() override;
 
   // Load the directory and pass the initial state back to caller.
-  virtual void Load(const LoadCallback& callback) override;
+  void Load(const LoadCallback& callback) override;
 
   // Closes the GCM store.
-  virtual void Close() override;
+  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;
+  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;
+  void SetDeviceCredentials(uint64 device_android_id,
+                            uint64 device_security_token,
+                            const UpdateCallback& callback) override;
 
   // Registration info.
-  virtual void AddRegistration(const std::string& app_id,
-                               const linked_ptr<RegistrationInfo>& registration,
-                               const UpdateCallback& callback) override;
-  virtual void RemoveRegistration(const std::string& app_id,
-                                  const UpdateCallback& callback) override;
+  void AddRegistration(const std::string& app_id,
+                       const linked_ptr<RegistrationInfo>& registration,
+                       const UpdateCallback& callback) override;
+  void RemoveRegistration(const std::string& app_id,
+                          const UpdateCallback& callback) override;
 
   // Unacknowledged incoming message handling.
-  virtual void AddIncomingMessage(const std::string& persistent_id,
-                                  const UpdateCallback& callback) override;
-  virtual void RemoveIncomingMessage(const std::string& persistent_id,
-                                     const UpdateCallback& callback) override;
-  virtual void RemoveIncomingMessages(const PersistentIdList& persistent_ids,
-                                      const UpdateCallback& callback) override;
+  void AddIncomingMessage(const std::string& persistent_id,
+                          const UpdateCallback& callback) override;
+  void RemoveIncomingMessage(const std::string& persistent_id,
+                             const UpdateCallback& callback) override;
+  void RemoveIncomingMessages(const PersistentIdList& persistent_ids,
+                              const UpdateCallback& callback) override;
 
   // Unacknowledged outgoing messages handling.
-  virtual bool AddOutgoingMessage(const std::string& persistent_id,
-                                  const MCSMessage& message,
-                                  const UpdateCallback& callback) override;
-  virtual void OverwriteOutgoingMessage(const std::string& persistent_id,
-                                        const MCSMessage& message,
-                                        const UpdateCallback& callback)
-      override;
-  virtual void RemoveOutgoingMessage(const std::string& persistent_id,
-                                     const UpdateCallback& callback) override;
-  virtual void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
-                                      const UpdateCallback& callback) override;
+  bool AddOutgoingMessage(const std::string& persistent_id,
+                          const MCSMessage& message,
+                          const UpdateCallback& callback) override;
+  void OverwriteOutgoingMessage(const std::string& persistent_id,
+                                const MCSMessage& message,
+                                const UpdateCallback& callback) override;
+  void RemoveOutgoingMessage(const std::string& persistent_id,
+                             const UpdateCallback& callback) override;
+  void RemoveOutgoingMessages(const PersistentIdList& persistent_ids,
+                              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;
+  void SetLastCheckinInfo(const base::Time& time,
+                          const std::set<std::string>& accounts,
+                          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;
+  void SetGServicesSettings(const std::map<std::string, std::string>& settings,
+                            const std::string& settings_digest,
+                            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;
-  virtual void RemoveAccountMapping(const std::string& account_id,
-                                    const UpdateCallback& callback) override;
+  void AddAccountMapping(const AccountMapping& account_mapping,
+                         const UpdateCallback& callback) override;
+  void RemoveAccountMapping(const std::string& account_id,
+                            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 348531b..b72fa69 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 {
+  std::string GetNextPersistentId() override {
     return base::UintToString(++next_id_);
   }
 
diff --git a/google_apis/gcm/engine/registration_request.h b/google_apis/gcm/engine/registration_request.h
index 736f4b4..1f707b9 100644
--- a/google_apis/gcm/engine/registration_request.h
+++ b/google_apis/gcm/engine/registration_request.h
@@ -89,12 +89,12 @@ class GCM_EXPORT RegistrationRequest : public net::URLFetcherDelegate {
       int max_retry_count,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       GCMStatsRecorder* recorder);
-  virtual ~RegistrationRequest();
+  ~RegistrationRequest() override;
 
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  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 39887ab..c5c0eb5 100644
--- a/google_apis/gcm/engine/unregistration_request.h
+++ b/google_apis/gcm/engine/unregistration_request.h
@@ -80,13 +80,13 @@ class GCM_EXPORT UnregistrationRequest : public net::URLFetcherDelegate {
       const UnregistrationCallback& callback,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       GCMStatsRecorder* recorder);
-  virtual ~UnregistrationRequest();
+  ~UnregistrationRequest() override;
 
   // Starts an unregistration request.
   void Start();
 
   // URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  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 9e8646e..d4503dd 100644
--- a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
+++ b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h
@@ -13,54 +13,51 @@ namespace gcm {
 class FakeGCMStatsRecorder : public GCMStatsRecorder {
  public:
   FakeGCMStatsRecorder();
-  virtual ~FakeGCMStatsRecorder();
+  ~FakeGCMStatsRecorder() 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;
-  virtual void RecordConnectionResetSignaled(
+  void RecordCheckinInitiated(uint64 android_id) override;
+  void RecordCheckinDelayedDueToBackoff(int64 delay_msec) override;
+  void RecordCheckinSuccess() override;
+  void RecordCheckinFailure(std::string status, bool will_retry) override;
+  void RecordConnectionInitiated(const std::string& host) override;
+  void RecordConnectionDelayedDueToBackoff(int64 delay_msec) override;
+  void RecordConnectionSuccess() override;
+  void RecordConnectionFailure(int network_error) override;
+  void RecordConnectionResetSignaled(
       ConnectionFactory::ConnectionResetReason reason) override;
-  virtual void RecordRegistrationSent(const std::string& app_id,
-                                      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;
-  virtual void RecordRegistrationRetryRequested(
+  void RecordRegistrationSent(const std::string& app_id,
+                              const std::string& sender_ids) override;
+  void RecordRegistrationResponse(const std::string& app_id,
+                                  const std::vector<std::string>& sender_ids,
+                                  RegistrationRequest::Status status) override;
+  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;
-  virtual void RecordUnregistrationResponse(
+  void RecordUnregistrationSent(const std::string& app_id) override;
+  void RecordUnregistrationResponse(
       const std::string& app_id,
       UnregistrationRequest::Status status) override;
-  virtual void RecordUnregistrationRetryDelayed(const std::string& app_id,
-                                                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;
-  virtual void RecordDataSentToWire(const std::string& app_id,
-                                    const std::string& receiver_id,
-                                    const std::string& message_id,
-                                    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;
-  virtual void RecordIncomingSendError(const std::string& app_id,
-                                       const std::string& receiver_id,
-                                       const std::string& message_id) override;
+  void RecordUnregistrationRetryDelayed(const std::string& app_id,
+                                        int64 delay_msec) override;
+  void RecordDataMessageReceived(const std::string& app_id,
+                                 const std::string& from,
+                                 int message_byte_size,
+                                 bool to_registered_app,
+                                 ReceivedMessageType message_type) override;
+  void RecordDataSentToWire(const std::string& app_id,
+                            const std::string& receiver_id,
+                            const std::string& message_id,
+                            int queued) override;
+  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;
+  void RecordIncomingSendError(const std::string& app_id,
+                               const std::string& receiver_id,
+                               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 7c83afc..cbee95f 100644
--- a/google_apis/gcm/tools/mcs_probe.cc
+++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -139,7 +139,7 @@ class MyTestURLRequestContext : public net::TestURLRequestContext {
     Init();
   }
 
-  virtual ~MyTestURLRequestContext() {}
+  ~MyTestURLRequestContext() override {}
 };
 
 class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
@@ -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 {
+  net::TestURLRequestContext* GetURLRequestContext() override {
     // Construct |context_| lazily so it gets constructed on the right
     // thread (the IO thread).
     if (!context_)
@@ -157,7 +157,7 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
   }
 
  private:
-  virtual ~MyTestURLRequestContextGetter() {}
+  ~MyTestURLRequestContextGetter() override {}
 
   scoped_ptr<MyTestURLRequestContext> context_;
 };
@@ -166,20 +166,20 @@ class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
 class MyTestCertVerifier : public net::CertVerifier {
  public:
   MyTestCertVerifier() {}
-  virtual ~MyTestCertVerifier() {}
-
-  virtual int Verify(net::X509Certificate* cert,
-                     const std::string& hostname,
-                     int flags,
-                     net::CRLSet* crl_set,
-                     net::CertVerifyResult* verify_result,
-                     const net::CompletionCallback& callback,
-                     RequestHandle* out_req,
-                     const net::BoundNetLog& net_log) override {
+  ~MyTestCertVerifier() override {}
+
+  int Verify(net::X509Certificate* cert,
+             const std::string& hostname,
+             int flags,
+             net::CRLSet* crl_set,
+             net::CertVerifyResult* verify_result,
+             const net::CompletionCallback& callback,
+             RequestHandle* out_req,
+             const net::BoundNetLog& net_log) override {
     return net::OK;
   }
 
-  virtual void CancelRequest(RequestHandle req) override {
+  void CancelRequest(RequestHandle req) override {
     // Do nothing.
   }
 };