Standardize usage of virtual/override/final in chrome/

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

BUG=417463
TBR=thestig@chromium.org

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

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

12 files changed, 117 insertions, 126 deletions

diff --git a/chrome/service/cloud_print/cloud_print_auth.h b/chrome/service/cloud_print/cloud_print_auth.h
index f78ecfc..4a9f24d 100644
--- a/chrome/service/cloud_print/cloud_print_auth.h
+++ b/chrome/service/cloud_print/cloud_print_auth.h
@@ -56,26 +56,26 @@ class CloudPrintAuth
   void RefreshAccessToken();
 
   // gaia::GaiaOAuthClient::Delegate implementation.
-  virtual void OnGetTokensResponse(const std::string& refresh_token,
-                                   const std::string& access_token,
-                                   int expires_in_seconds) override;
-  virtual void OnRefreshTokenResponse(const std::string& access_token,
-                                      int expires_in_seconds) override;
-  virtual void OnOAuthError() override;
-  virtual void OnNetworkError(int response_code) override;
+  void OnGetTokensResponse(const std::string& refresh_token,
+                           const std::string& access_token,
+                           int expires_in_seconds) override;
+  void OnRefreshTokenResponse(const std::string& access_token,
+                              int expires_in_seconds) override;
+  void OnOAuthError() override;
+  void OnNetworkError(int response_code) override;
 
   // CloudPrintURLFetcher::Delegate implementation.
-  virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
+  CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const net::URLFetcher* source,
       const GURL& url,
       base::DictionaryValue* json_data,
       bool succeeded) override;
-  virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
-  virtual std::string GetAuthHeader() override;
+  CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
+  std::string GetAuthHeader() override;
 
  private:
   friend class base::RefCountedThreadSafe<CloudPrintAuth>;
-  virtual ~CloudPrintAuth();
+  ~CloudPrintAuth() override;
 
   Client* client_;
   gaia::OAuthClientInfo oauth_client_info_;
diff --git a/chrome/service/cloud_print/cloud_print_connector.h b/chrome/service/cloud_print/cloud_print_connector.h
index 52280af..6d05247 100644
--- a/chrome/service/cloud_print/cloud_print_connector.h
+++ b/chrome/service/cloud_print/cloud_print_connector.h
@@ -83,25 +83,25 @@ class CloudPrintConnector
     ~PendingTask() {}
   };
 
-  virtual ~CloudPrintConnector();
+  ~CloudPrintConnector() override;
   // PrintServerWatcherDelegate implementation
-  virtual void OnPrinterAdded() override;
+  void OnPrinterAdded() override;
   // PrinterJobHandler::Delegate implementation
-  virtual void OnPrinterDeleted(const std::string& printer_name) override;
-  virtual void OnAuthError() override;
+  void OnPrinterDeleted(const std::string& printer_name) override;
+  void OnAuthError() override;
 
   // CloudPrintURLFetcher::Delegate implementation.
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawData(
+  CloudPrintURLFetcher::ResponseAction HandleRawData(
       const net::URLFetcher* source,
       const GURL& url,
       const std::string& data) override;
-  virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
+  CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const net::URLFetcher* source,
       const GURL& url,
       base::DictionaryValue* json_data,
       bool succeeded) override;
-  virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
-  virtual std::string GetAuthHeader() override;
+  CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
+  std::string GetAuthHeader() override;
 
   // Begin response handlers
   CloudPrintURLFetcher::ResponseAction HandlePrinterListResponse(
diff --git a/chrome/service/cloud_print/cloud_print_proxy.h b/chrome/service/cloud_print/cloud_print_proxy.h
index 7f839d1..4f7daa0 100644
--- a/chrome/service/cloud_print/cloud_print_proxy.h
+++ b/chrome/service/cloud_print/cloud_print_proxy.h
@@ -34,7 +34,7 @@ class CloudPrintProxy : public CloudPrintProxyFrontend,
     virtual void OnCloudPrintProxyDisabled(bool persist_state) {}
   };
   CloudPrintProxy();
-  virtual ~CloudPrintProxy();
+  ~CloudPrintProxy() override;
 
   // Initializes the object. This should be called every time an object of this
   // class is constructed.
@@ -62,18 +62,17 @@ class CloudPrintProxy : public CloudPrintProxyFrontend,
   }
 
   // CloudPrintProxyFrontend implementation. Called on UI thread.
-  virtual void OnAuthenticated(const std::string& robot_oauth_refresh_token,
-                               const std::string& robot_email,
-                               const std::string& user_email) override;
-  virtual void OnAuthenticationFailed() override;
-  virtual void OnPrintSystemUnavailable() override;
-  virtual void OnUnregisterPrinters(
-      const std::string& auth_token,
-      const std::list<std::string>& printer_ids) override;
-  virtual void OnXmppPingUpdated(int ping_timeout) override;
+  void OnAuthenticated(const std::string& robot_oauth_refresh_token,
+                       const std::string& robot_email,
+                       const std::string& user_email) override;
+  void OnAuthenticationFailed() override;
+  void OnPrintSystemUnavailable() override;
+  void OnUnregisterPrinters(const std::string& auth_token,
+                            const std::list<std::string>& printer_ids) override;
+  void OnXmppPingUpdated(int ping_timeout) override;
 
   // CloudPrintWipeout::Client implementation.
-  virtual void OnUnregisterPrintersComplete() override;
+  void OnUnregisterPrintersComplete() override;
 
  protected:
   void ShutdownBackend();
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
index c4e6c6c..f364a13 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
@@ -65,29 +65,28 @@ class CloudPrintProxyBackend::Core
   void DoUnregisterPrinters();
 
   // CloudPrintAuth::Client implementation.
-  virtual void OnAuthenticationComplete(
-      const std::string& access_token,
-      const std::string& robot_oauth_refresh_token,
-      const std::string& robot_email,
-      const std::string& user_email) override;
-  virtual void OnInvalidCredentials() override;
+  void OnAuthenticationComplete(const std::string& access_token,
+                                const std::string& robot_oauth_refresh_token,
+                                const std::string& robot_email,
+                                const std::string& user_email) override;
+  void OnInvalidCredentials() override;
 
   // CloudPrintConnector::Client implementation.
-  virtual void OnAuthFailed() override;
-  virtual void OnXmppPingUpdated(int ping_timeout) override;
+  void OnAuthFailed() override;
+  void OnXmppPingUpdated(int ping_timeout) override;
 
   // notifier::PushClientObserver implementation.
-  virtual void OnNotificationsEnabled() override;
-  virtual void OnNotificationsDisabled(
+  void OnNotificationsEnabled() override;
+  void OnNotificationsDisabled(
       notifier::NotificationsDisabledReason reason) override;
-  virtual void OnIncomingNotification(
+  void OnIncomingNotification(
       const notifier::Notification& notification) override;
-  virtual void OnPingResponse() override;
+  void OnPingResponse() override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
 
-  virtual ~Core() {}
+  ~Core() override {}
 
   void CreateAuthAndConnector();
   void DestroyAuthAndConnector();
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h
index 901d584..91cad82 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.h
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h
@@ -134,12 +134,12 @@ class CloudPrintURLFetcher
                         const std::string& additional_headers);
 
   // net::URLFetcherDelegate implementation.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  protected:
   CloudPrintURLFetcher();
   friend class base::RefCountedThreadSafe<CloudPrintURLFetcher>;
-  virtual ~CloudPrintURLFetcher();
+  ~CloudPrintURLFetcher() override;
 
   // Virtual for testing.
   virtual net::URLRequestContextGetter* GetRequestContextGetter();
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
index 488f5be..a7e00f3 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
@@ -38,7 +38,7 @@ class TrackingTestURLRequestContextGetter
     g_request_context_getter_instances++;
   }
 
-  virtual net::TestURLRequestContext* GetURLRequestContext() override {
+  net::TestURLRequestContext* GetURLRequestContext() override {
     if (!context_.get()) {
       context_.reset(new net::TestURLRequestContext(true));
       context_->set_throttler_manager(throttler_manager_);
@@ -48,7 +48,7 @@ class TrackingTestURLRequestContextGetter
   }
 
  protected:
-  virtual ~TrackingTestURLRequestContextGetter() {
+  ~TrackingTestURLRequestContextGetter() override {
     g_request_context_getter_instances--;
   }
 
@@ -65,7 +65,7 @@ class TestCloudPrintURLFetcher : public CloudPrintURLFetcher {
       : io_message_loop_proxy_(io_message_loop_proxy) {
   }
 
-  virtual net::URLRequestContextGetter* GetRequestContextGetter() override {
+  net::URLRequestContextGetter* GetRequestContextGetter() override {
     return new TrackingTestURLRequestContextGetter(
         io_message_loop_proxy_.get(), throttler_manager());
   }
@@ -75,7 +75,7 @@ class TestCloudPrintURLFetcher : public CloudPrintURLFetcher {
   }
 
  private:
-  virtual ~TestCloudPrintURLFetcher() {}
+  ~TestCloudPrintURLFetcher() override {}
 
   scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
 
@@ -93,7 +93,7 @@ class CloudPrintURLFetcherTest : public testing::Test,
   virtual void CreateFetcher(const GURL& url, int max_retries);
 
   // CloudPrintURLFetcher::Delegate
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawResponse(
+  CloudPrintURLFetcher::ResponseAction HandleRawResponse(
       const net::URLFetcher* source,
       const GURL& url,
       const net::URLRequestStatus& status,
@@ -101,14 +101,12 @@ class CloudPrintURLFetcherTest : public testing::Test,
       const net::ResponseCookies& cookies,
       const std::string& data) override;
 
-  virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override {
+  CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override {
     ADD_FAILURE();
     return CloudPrintURLFetcher::STOP_PROCESSING;
   }
 
-  virtual std::string GetAuthHeader() override {
-    return std::string();
-  }
+  std::string GetAuthHeader() override { return std::string(); }
 
   scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy() {
     return io_message_loop_proxy_;
@@ -146,7 +144,7 @@ class CloudPrintURLFetcherBasicTest : public CloudPrintURLFetcherTest {
   CloudPrintURLFetcherBasicTest()
       : handle_raw_response_(false), handle_raw_data_(false) { }
   // CloudPrintURLFetcher::Delegate
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawResponse(
+  CloudPrintURLFetcher::ResponseAction HandleRawResponse(
       const net::URLFetcher* source,
       const GURL& url,
       const net::URLRequestStatus& status,
@@ -154,12 +152,12 @@ class CloudPrintURLFetcherBasicTest : public CloudPrintURLFetcherTest {
       const net::ResponseCookies& cookies,
       const std::string& data) override;
 
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawData(
+  CloudPrintURLFetcher::ResponseAction HandleRawData(
       const net::URLFetcher* source,
       const GURL& url,
       const std::string& data) override;
 
-  virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
+  CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const net::URLFetcher* source,
       const GURL& url,
       base::DictionaryValue* json_data,
@@ -183,7 +181,7 @@ class CloudPrintURLFetcherOverloadTest : public CloudPrintURLFetcherTest {
   }
 
   // CloudPrintURLFetcher::Delegate
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawData(
+  CloudPrintURLFetcher::ResponseAction HandleRawData(
       const net::URLFetcher* source,
       const GURL& url,
       const std::string& data) override;
@@ -199,12 +197,12 @@ class CloudPrintURLFetcherRetryBackoffTest : public CloudPrintURLFetcherTest {
   }
 
   // CloudPrintURLFetcher::Delegate
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawData(
+  CloudPrintURLFetcher::ResponseAction HandleRawData(
       const net::URLFetcher* source,
       const GURL& url,
       const std::string& data) override;
 
-  virtual void OnRequestGiveUp() override;
+  void OnRequestGiveUp() override;
 
  private:
   int response_count_;
diff --git a/chrome/service/cloud_print/cloud_print_wipeout.h b/chrome/service/cloud_print/cloud_print_wipeout.h
index 62d52d5..92053bf 100644
--- a/chrome/service/cloud_print/cloud_print_wipeout.h
+++ b/chrome/service/cloud_print/cloud_print_wipeout.h
@@ -25,20 +25,20 @@ class CloudPrintWipeout : public CloudPrintURLFetcherDelegate {
   };
 
   CloudPrintWipeout(Client* client, const GURL& cloud_print_server_url);
-  virtual ~CloudPrintWipeout();
+  ~CloudPrintWipeout() override;
 
   void UnregisterPrinters(const std::string& auth_token,
                           const std::list<std::string>& printer_ids);
 
   // CloudPrintURLFetcher::Delegate implementation.
-  virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
+  CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const net::URLFetcher* source,
       const GURL& url,
       base::DictionaryValue* json_data,
       bool succeeded) override;
-  virtual void OnRequestGiveUp() override;
-  virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
-  virtual std::string GetAuthHeader() override;
+  void OnRequestGiveUp() override;
+  CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
+  std::string GetAuthHeader() override;
 
  private:
   void UnregisterNextPrinter();
diff --git a/chrome/service/cloud_print/job_status_updater.h b/chrome/service/cloud_print/job_status_updater.h
index 01863f9..169f0e7 100644
--- a/chrome/service/cloud_print/job_status_updater.h
+++ b/chrome/service/cloud_print/job_status_updater.h
@@ -45,13 +45,13 @@ class JobStatusUpdater : public base::RefCountedThreadSafe<JobStatusUpdater>,
   void Stop();
 
   // CloudPrintURLFetcher::Delegate implementation.
-  virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
+  CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const net::URLFetcher* source,
       const GURL& url,
       base::DictionaryValue* json_data,
       bool succeeded) override;
-  virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
-  virtual std::string GetAuthHeader() override;
+  CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
+  std::string GetAuthHeader() override;
 
   base::Time start_time() const {
     return start_time_;
@@ -59,7 +59,7 @@ class JobStatusUpdater : public base::RefCountedThreadSafe<JobStatusUpdater>,
 
  private:
   friend class base::RefCountedThreadSafe<JobStatusUpdater>;
-  virtual ~JobStatusUpdater();
+  ~JobStatusUpdater() override;
 
   base::Time start_time_;
   std::string printer_name_;
diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
index 19d6ddf..132a252 100644
--- a/chrome/service/cloud_print/print_system_cups.cc
+++ b/chrome/service/cloud_print/print_system_cups.cc
@@ -76,26 +76,25 @@ class PrintSystemCUPS : public PrintSystem {
   explicit PrintSystemCUPS(const base::DictionaryValue* print_system_settings);
 
   // PrintSystem implementation.
-  virtual PrintSystemResult Init() override;
-  virtual PrintSystem::PrintSystemResult EnumeratePrinters(
+  PrintSystemResult Init() override;
+  PrintSystem::PrintSystemResult EnumeratePrinters(
       printing::PrinterList* printer_list) override;
-  virtual void GetPrinterCapsAndDefaults(
+  void GetPrinterCapsAndDefaults(
       const std::string& printer_name,
       const PrinterCapsAndDefaultsCallback& callback) override;
-  virtual bool IsValidPrinter(const std::string& printer_name) override;
-  virtual bool ValidatePrintTicket(
-      const std::string& printer_name,
-      const std::string& print_ticket_data,
-      const std::string& print_ticket_mime_type) override;
-  virtual bool GetJobDetails(const std::string& printer_name,
-                             PlatformJobId job_id,
-                             PrintJobDetails *job_details) override;
-  virtual PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() override;
-  virtual PrintSystem::PrinterWatcher* CreatePrinterWatcher(
+  bool IsValidPrinter(const std::string& printer_name) override;
+  bool ValidatePrintTicket(const std::string& printer_name,
+                           const std::string& print_ticket_data,
+                           const std::string& print_ticket_mime_type) override;
+  bool GetJobDetails(const std::string& printer_name,
+                     PlatformJobId job_id,
+                     PrintJobDetails* job_details) override;
+  PrintSystem::PrintServerWatcher* CreatePrintServerWatcher() override;
+  PrintSystem::PrinterWatcher* CreatePrinterWatcher(
       const std::string& printer_name) override;
-  virtual PrintSystem::JobSpooler* CreateJobSpooler() override;
-  virtual bool UseCddAndCjt() override;
-  virtual std::string GetSupportedMimeTypes() override;
+  PrintSystem::JobSpooler* CreateJobSpooler() override;
+  bool UseCddAndCjt() override;
+  std::string GetSupportedMimeTypes() override;
 
   // Helper functions.
   PlatformJobId SpoolPrintJob(const std::string& print_ticket,
@@ -126,7 +125,7 @@ class PrintSystemCUPS : public PrintSystem {
   }
 
  private:
-  virtual ~PrintSystemCUPS() {}
+  ~PrintSystemCUPS() override {}
 
   // Following functions are wrappers around corresponding CUPS functions.
   // <functions>2()  are called when print server is specified, and plain
@@ -180,7 +179,7 @@ class PrintServerWatcherCUPS
   }
 
   // PrintSystem::PrintServerWatcher implementation.
-  virtual bool StartWatching(
+  bool StartWatching(
       PrintSystem::PrintServerWatcher::Delegate* delegate) override {
     delegate_ = delegate;
     printers_hash_ = GetPrintersHash();
@@ -191,7 +190,7 @@ class PrintServerWatcherCUPS
     return true;
   }
 
-  virtual bool StopWatching() override {
+  bool StopWatching() override {
     delegate_ = NULL;
     return true;
   }
@@ -212,9 +211,7 @@ class PrintServerWatcherCUPS
   }
 
  protected:
-  virtual ~PrintServerWatcherCUPS() {
-    StopWatching();
-  }
+  ~PrintServerWatcherCUPS() override { StopWatching(); }
 
  private:
   std::string GetPrintersHash() {
@@ -253,8 +250,7 @@ class PrinterWatcherCUPS
   }
 
   // PrintSystem::PrinterWatcher implementation.
-  virtual bool StartWatching(
-      PrintSystem::PrinterWatcher::Delegate* delegate) override{
+  bool StartWatching(PrintSystem::PrinterWatcher::Delegate* delegate) override {
     scoped_refptr<printing::PrintBackend> print_backend(
         printing::PrintBackend::CreateInstance(NULL));
     crash_keys::ScopedPrinterInfo crash_key(
@@ -277,12 +273,12 @@ class PrinterWatcherCUPS
     return true;
   }
 
-  virtual bool StopWatching() override{
+  bool StopWatching() override {
     delegate_ = NULL;
     return true;
   }
 
-  virtual bool GetCurrentPrinterInfo(
+  bool GetCurrentPrinterInfo(
       printing::PrinterBasicInfo* printer_info) override {
     DCHECK(printer_info);
     return print_system_->GetPrinterInfo(printer_name_, printer_info);
@@ -328,9 +324,7 @@ class PrinterWatcherCUPS
   }
 
  protected:
-  virtual ~PrinterWatcherCUPS() {
-    StopWatching();
-  }
+  ~PrinterWatcherCUPS() override { StopWatching(); }
 
  private:
   std::string GetSettingsHash() {
@@ -373,14 +367,14 @@ class JobSpoolerCUPS : public PrintSystem::JobSpooler {
   }
 
   // PrintSystem::JobSpooler implementation.
-  virtual bool Spool(const std::string& print_ticket,
-                     const std::string& print_ticket_mime_type,
-                     const base::FilePath& print_data_file_path,
-                     const std::string& print_data_mime_type,
-                     const std::string& printer_name,
-                     const std::string& job_title,
-                     const std::vector<std::string>& tags,
-                     JobSpooler::Delegate* delegate) override{
+  bool Spool(const std::string& print_ticket,
+             const std::string& print_ticket_mime_type,
+             const base::FilePath& print_data_file_path,
+             const std::string& print_data_mime_type,
+             const std::string& printer_name,
+             const std::string& job_title,
+             const std::vector<std::string>& tags,
+             JobSpooler::Delegate* delegate) override {
     DCHECK(delegate);
     bool dry_run = false;
     int job_id = print_system_->SpoolPrintJob(
@@ -401,7 +395,7 @@ class JobSpoolerCUPS : public PrintSystem::JobSpooler {
   }
 
  protected:
-  virtual ~JobSpoolerCUPS() {}
+  ~JobSpoolerCUPS() override {}
 
  private:
   scoped_refptr<PrintSystemCUPS> print_system_;
diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h
index 46d29fd..b5731d8 100644
--- a/chrome/service/cloud_print/printer_job_handler.h
+++ b/chrome/service/cloud_print/printer_job_handler.h
@@ -115,39 +115,39 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>,
   // Begin Delegate implementations
 
   // CloudPrintURLFetcher::Delegate implementation.
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawResponse(
+  CloudPrintURLFetcher::ResponseAction HandleRawResponse(
       const net::URLFetcher* source,
       const GURL& url,
       const net::URLRequestStatus& status,
       int response_code,
       const net::ResponseCookies& cookies,
       const std::string& data) override;
-  virtual CloudPrintURLFetcher::ResponseAction HandleRawData(
+  CloudPrintURLFetcher::ResponseAction HandleRawData(
       const net::URLFetcher* source,
       const GURL& url,
       const std::string& data) override;
-  virtual CloudPrintURLFetcher::ResponseAction HandleJSONData(
+  CloudPrintURLFetcher::ResponseAction HandleJSONData(
       const net::URLFetcher* source,
       const GURL& url,
       base::DictionaryValue* json_data,
       bool succeeded) override;
-  virtual void OnRequestGiveUp() override;
-  virtual CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
-  virtual std::string GetAuthHeader() override;
+  void OnRequestGiveUp() override;
+  CloudPrintURLFetcher::ResponseAction OnRequestAuthError() override;
+  std::string GetAuthHeader() override;
 
   // JobStatusUpdater::Delegate implementation
-  virtual bool OnJobCompleted(JobStatusUpdater* updater) override;
-  virtual void OnAuthError() override;
+  bool OnJobCompleted(JobStatusUpdater* updater) override;
+  void OnAuthError() override;
 
   // PrinterWatcherDelegate implementation
-  virtual void OnPrinterDeleted() override;
-  virtual void OnPrinterChanged() override;
-  virtual void OnJobChanged() override;
+  void OnPrinterDeleted() override;
+  void OnPrinterChanged() override;
+  void OnJobChanged() override;
 
   // JobSpoolerDelegate implementation.
   // Called on print_thread_.
-  virtual void OnJobSpoolSucceeded(const PlatformJobId& job_id) override;
-  virtual void OnJobSpoolFailed() override;
+  void OnJobSpoolSucceeded(const PlatformJobId& job_id) override;
+  void OnJobSpoolFailed() override;
 
   // End Delegate implementations
 
@@ -176,7 +176,7 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>,
                                         const GURL& url,
                                         const std::string& data);
 
-  virtual ~PrinterJobHandler();
+  ~PrinterJobHandler() override;
 
   // Begin request handlers for each state in the state machine
   CloudPrintURLFetcher::ResponseAction HandlePrinterUpdateResponse(
diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc
index c1f770d..8c4e2b1 100644
--- a/chrome/service/cloud_print/printer_job_handler_unittest.cc
+++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc
@@ -251,11 +251,12 @@ class CloudPrintURLFetcherNoServiceProcess
       context_getter_(new net::TestURLRequestContextGetter(
           base::MessageLoopProxy::current())) {}
  protected:
-  virtual net::URLRequestContextGetter* GetRequestContextGetter() override {
+  net::URLRequestContextGetter* GetRequestContextGetter() override {
     return context_getter_.get();
   }
 
-  virtual ~CloudPrintURLFetcherNoServiceProcess() {}
+  ~CloudPrintURLFetcherNoServiceProcess() override {}
+
  private:
   scoped_refptr<net::URLRequestContextGetter> context_getter_;
 };
@@ -264,11 +265,11 @@ class CloudPrintURLFetcherNoServiceProcess
 class CloudPrintURLFetcherNoServiceProcessFactory
     : public CloudPrintURLFetcherFactory {
  public:
-  virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher() override {
+  CloudPrintURLFetcher* CreateCloudPrintURLFetcher() override {
     return new CloudPrintURLFetcherNoServiceProcess;
   }
 
-  virtual ~CloudPrintURLFetcherNoServiceProcessFactory() {}
+  ~CloudPrintURLFetcherNoServiceProcessFactory() override {}
 };
 
 
diff --git a/chrome/service/cloud_print/printer_job_queue_handler.cc b/chrome/service/cloud_print/printer_job_queue_handler.cc
index 48060c1..ba81ff1 100644
--- a/chrome/service/cloud_print/printer_job_queue_handler.cc
+++ b/chrome/service/cloud_print/printer_job_queue_handler.cc
@@ -14,7 +14,7 @@ namespace cloud_print {
 
 class TimeProviderImpl : public PrinterJobQueueHandler::TimeProvider {
  public:
-    virtual base::Time GetNow() override;
+  base::Time GetNow() override;
 };
 
 base::Time TimeProviderImpl::GetNow() {