replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]*

BUG=417463

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

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

39 files changed, 210 insertions, 210 deletions

diff --git a/chrome/browser/local_discovery/cloud_device_list.h b/chrome/browser/local_discovery/cloud_device_list.h
index afdd2c1..baff562 100644
--- a/chrome/browser/local_discovery/cloud_device_list.h
+++ b/chrome/browser/local_discovery/cloud_device_list.h
@@ -22,12 +22,12 @@ class CloudDeviceList : public GCDApiFlowRequest {
   explicit CloudDeviceList(CloudDeviceListDelegate* delegate);
   virtual ~CloudDeviceList();
 
-  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE;
+  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override;
 
   virtual void OnGCDAPIFlowComplete(
-      const base::DictionaryValue& value) OVERRIDE;
+      const base::DictionaryValue& value) override;
 
-  virtual GURL GetURL() OVERRIDE;
+  virtual GURL GetURL() override;
 
  private:
   bool FillDeviceDetails(const base::DictionaryValue& value,
diff --git a/chrome/browser/local_discovery/cloud_print_printer_list.h b/chrome/browser/local_discovery/cloud_print_printer_list.h
index e5abc64..343fa48 100644
--- a/chrome/browser/local_discovery/cloud_print_printer_list.h
+++ b/chrome/browser/local_discovery/cloud_print_printer_list.h
@@ -19,12 +19,12 @@ class CloudPrintPrinterList : public CloudPrintApiFlowRequest {
   explicit CloudPrintPrinterList(CloudDeviceListDelegate* delegate);
   virtual ~CloudPrintPrinterList();
 
-  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE;
+  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override;
 
   virtual void OnGCDAPIFlowComplete(
-      const base::DictionaryValue& value) OVERRIDE;
+      const base::DictionaryValue& value) override;
 
-  virtual GURL GetURL() OVERRIDE;
+  virtual GURL GetURL() override;
 
  private:
   bool FillPrinterDetails(const base::DictionaryValue& printer_value,
diff --git a/chrome/browser/local_discovery/gcd_api_flow.h b/chrome/browser/local_discovery/gcd_api_flow.h
index e4c7d87..42807fd 100644
--- a/chrome/browser/local_discovery/gcd_api_flow.h
+++ b/chrome/browser/local_discovery/gcd_api_flow.h
@@ -73,8 +73,8 @@ class GCDApiFlowRequest : public GCDApiFlow::Request {
   virtual ~GCDApiFlowRequest();
 
   // GCDApiFlowRequest implementation
-  virtual std::string GetOAuthScope() OVERRIDE;
-  virtual std::vector<std::string> GetExtraRequestHeaders() OVERRIDE;
+  virtual std::string GetOAuthScope() override;
+  virtual std::vector<std::string> GetExtraRequestHeaders() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GCDApiFlowRequest);
@@ -86,8 +86,8 @@ class CloudPrintApiFlowRequest : public GCDApiFlow::Request {
   virtual ~CloudPrintApiFlowRequest();
 
   // GCDApiFlowRequest implementation
-  virtual std::string GetOAuthScope() OVERRIDE;
-  virtual std::vector<std::string> GetExtraRequestHeaders() OVERRIDE;
+  virtual std::string GetOAuthScope() override;
+  virtual std::vector<std::string> GetExtraRequestHeaders() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CloudPrintApiFlowRequest);
diff --git a/chrome/browser/local_discovery/gcd_api_flow_impl.h b/chrome/browser/local_discovery/gcd_api_flow_impl.h
index b636cfd..f206e93 100644
--- a/chrome/browser/local_discovery/gcd_api_flow_impl.h
+++ b/chrome/browser/local_discovery/gcd_api_flow_impl.h
@@ -26,17 +26,17 @@ class GCDApiFlowImpl : public GCDApiFlow,
 
   virtual ~GCDApiFlowImpl();
 
-  virtual void Start(scoped_ptr<Request> request) OVERRIDE;
+  virtual void Start(scoped_ptr<Request> request) override;
 
   // net::URLFetcherDelegate implementation:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // OAuth2TokenService::Consumer implementation:
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
-                                 const base::Time& expiration_time) OVERRIDE;
+                                 const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                                 const GoogleServiceAuthError& error) OVERRIDE;
+                                 const GoogleServiceAuthError& error) override;
 
  private:
   void CreateRequest(const GURL& url);
diff --git a/chrome/browser/local_discovery/gcd_api_flow_unittest.cc b/chrome/browser/local_discovery/gcd_api_flow_unittest.cc
index 02c27a3..a9edd86 100644
--- a/chrome/browser/local_discovery/gcd_api_flow_unittest.cc
+++ b/chrome/browser/local_discovery/gcd_api_flow_unittest.cc
@@ -51,7 +51,7 @@ class GCDApiFlowTest : public testing::Test {
   virtual ~GCDApiFlowTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     token_service_.set_request_context(request_context_.get());
     token_service_.AddAccount(account_id_);
     ui_thread_.Stop();  // HACK: Fake being on the UI thread
diff --git a/chrome/browser/local_discovery/gcd_registration_ticket_request.h b/chrome/browser/local_discovery/gcd_registration_ticket_request.h
index eb313de..3956e4d 100644
--- a/chrome/browser/local_discovery/gcd_registration_ticket_request.h
+++ b/chrome/browser/local_discovery/gcd_registration_ticket_request.h
@@ -25,12 +25,12 @@ class GCDRegistrationTicketRequest : public GCDApiFlowRequest {
 
   // GCDApiFlowImpl::Request implementation.
   virtual void GetUploadData(std::string* upload_type,
-                             std::string* upload_data) OVERRIDE;
-  virtual net::URLFetcher::RequestType GetRequestType() OVERRIDE;
-  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE;
+                             std::string* upload_data) override;
+  virtual net::URLFetcher::RequestType GetRequestType() override;
+  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override;
   virtual void OnGCDAPIFlowComplete(
-      const base::DictionaryValue& value) OVERRIDE;
-  virtual GURL GetURL() OVERRIDE;
+      const base::DictionaryValue& value) override;
+  virtual GURL GetURL() override;
 
  private:
   ResponseCallback callback_;
diff --git a/chrome/browser/local_discovery/privet_confirm_api_flow.h b/chrome/browser/local_discovery/privet_confirm_api_flow.h
index 5da9a61..de1e8d3 100644
--- a/chrome/browser/local_discovery/privet_confirm_api_flow.h
+++ b/chrome/browser/local_discovery/privet_confirm_api_flow.h
@@ -24,12 +24,12 @@ class PrivetConfirmApiCallFlow : public CloudPrintApiFlowRequest {
 
   virtual ~PrivetConfirmApiCallFlow();
 
-  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) OVERRIDE;
+  virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override;
   virtual void OnGCDAPIFlowComplete(
-      const base::DictionaryValue& value) OVERRIDE;
-  virtual net::URLFetcher::RequestType GetRequestType() OVERRIDE;
+      const base::DictionaryValue& value) override;
+  virtual net::URLFetcher::RequestType GetRequestType() override;
 
-  virtual GURL GetURL() OVERRIDE;
+  virtual GURL GetURL() override;
 
  private:
   ResponseCallback callback_;
diff --git a/chrome/browser/local_discovery/privet_device_lister_impl.h b/chrome/browser/local_discovery/privet_device_lister_impl.h
index a1888ae..2292718 100644
--- a/chrome/browser/local_discovery/privet_device_lister_impl.h
+++ b/chrome/browser/local_discovery/privet_device_lister_impl.h
@@ -28,15 +28,15 @@ class PrivetDeviceListerImpl : public PrivetDeviceLister,
 
   virtual ~PrivetDeviceListerImpl();
 
-  virtual void Start() OVERRIDE;
-  virtual void DiscoverNewDevices(bool force_update) OVERRIDE;
+  virtual void Start() override;
+  virtual void DiscoverNewDevices(bool force_update) override;
 
  protected:
   virtual void OnDeviceChanged(
       bool added,
-      const ServiceDescription& service_description) OVERRIDE;
-  virtual void OnDeviceRemoved(const std::string& service_name) OVERRIDE;
-  virtual void OnDeviceCacheFlushed() OVERRIDE;
+      const ServiceDescription& service_description) override;
+  virtual void OnDeviceRemoved(const std::string& service_name) override;
+  virtual void OnDeviceCacheFlushed() override;
 
  private:
   PrivetDeviceLister::Delegate* delegate_;
diff --git a/chrome/browser/local_discovery/privet_device_lister_unittest.cc b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
index 4f3b9c9..8027487 100644
--- a/chrome/browser/local_discovery/privet_device_lister_unittest.cc
+++ b/chrome/browser/local_discovery/privet_device_lister_unittest.cc
@@ -79,7 +79,7 @@ class MockServiceResolver : public ServiceResolver {
   virtual ~MockServiceResolver() {
   }
 
-  virtual void StartResolving() OVERRIDE {
+  virtual void StartResolving() override {
     started_resolving_ = true;
     mock_delegate_->ServiceResolverStarted(service_name_, this);
   }
@@ -88,7 +88,7 @@ class MockServiceResolver : public ServiceResolver {
     return started_resolving_;
   }
 
-  virtual std::string GetName() const OVERRIDE {
+  virtual std::string GetName() const override {
     return service_name_;
   }
 
@@ -116,7 +116,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
   // on service type |service_type|.
   virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
-      const ServiceWatcher::UpdatedCallback& callback) OVERRIDE {
+      const ServiceWatcher::UpdatedCallback& callback) override {
     scoped_ptr<MockServiceWatcher> mock_service_watcher(
         new MockServiceWatcher(service_type, callback, mock_delegate_));
     return mock_service_watcher.PassAs<ServiceWatcher>();
@@ -126,7 +126,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
   // for the service called |service_name|.
   virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
-      const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE {
+      const ServiceResolver::ResolveCompleteCallback& callback) override {
     scoped_ptr<MockServiceResolver> mock_service_resolver(
         new MockServiceResolver(service_name, callback, mock_delegate_));
     return mock_service_resolver.PassAs<ServiceResolver>();
@@ -136,7 +136,7 @@ class MockServiceDiscoveryClient : public ServiceDiscoveryClient {
   virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
     const std::string& domain,
     net::AddressFamily address_family,
-    const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE {
+    const LocalDomainResolver::IPAddressCallback& callback) override {
     NOTREACHED();
     return scoped_ptr<LocalDomainResolver>();
   }
@@ -178,7 +178,7 @@ class PrivetDeviceListerTest : public testing::Test {
   virtual ~PrivetDeviceListerTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     example_attrs_.push_back("tXtvers=1");
     example_attrs_.push_back("ty=My Printer");
     example_attrs_.push_back("nOte=This is my Printer");
diff --git a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h
index 880ce01..c151b7a 100644
--- a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h
+++ b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h
@@ -21,7 +21,7 @@ class PrivetHTTPAsynchronousFactoryImpl : public PrivetHTTPAsynchronousFactory {
   virtual scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP(
       const std::string& name,
       const net::HostPortPair& address,
-      const ResultCallback& callback) OVERRIDE;
+      const ResultCallback& callback) override;
 
  private:
   class ResolutionImpl : public PrivetHTTPResolution {
@@ -33,8 +33,8 @@ class PrivetHTTPAsynchronousFactoryImpl : public PrivetHTTPAsynchronousFactory {
                    net::URLRequestContextGetter* request_context);
     virtual ~ResolutionImpl();
 
-    virtual void Start() OVERRIDE;
-    virtual const std::string& GetName() OVERRIDE;
+    virtual void Start() override;
+    virtual const std::string& GetName() override;
 
    private:
     void ResolveComplete(bool success,
diff --git a/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h b/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h
index cd25d680..4d54648 100644
--- a/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h
+++ b/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h
@@ -19,7 +19,7 @@ class PrivetHTTPAsynchronousFactoryMac : public PrivetHTTPAsynchronousFactory {
   virtual scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP(
       const std::string& name,
       const net::HostPortPair& address,
-      const ResultCallback& callback) OVERRIDE;
+      const ResultCallback& callback) override;
 
  private:
   class ResolutionMac : public PrivetHTTPResolution {
@@ -30,8 +30,8 @@ class PrivetHTTPAsynchronousFactoryMac : public PrivetHTTPAsynchronousFactory {
                   const ResultCallback& callback);
     virtual ~ResolutionMac();
 
-    virtual void Start() OVERRIDE;
-    virtual const std::string& GetName() OVERRIDE;
+    virtual void Start() override;
+    virtual const std::string& GetName() override;
 
    private:
     net::URLRequestContextGetter* request_context_;
diff --git a/chrome/browser/local_discovery/privet_http_impl.h b/chrome/browser/local_discovery/privet_http_impl.h
index 0d934f5..cfcef7b 100644
--- a/chrome/browser/local_discovery/privet_http_impl.h
+++ b/chrome/browser/local_discovery/privet_http_impl.h
@@ -31,15 +31,15 @@ class PrivetInfoOperationImpl : public PrivetJSONOperation,
                           const PrivetJSONOperation::ResultCallback& callback);
   virtual ~PrivetInfoOperationImpl();
 
-  virtual void Start() OVERRIDE;
+  virtual void Start() override;
 
-  virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE;
+  virtual PrivetHTTPClient* GetHTTPClient() override;
 
   virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) OVERRIDE;
+                       PrivetURLFetcher::ErrorType error) override;
   virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                             const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE;
+                            bool has_error) override;
 
  private:
   PrivetHTTPClient* privet_client_;
@@ -57,22 +57,22 @@ class PrivetRegisterOperationImpl
                               PrivetRegisterOperation::Delegate* delegate);
   virtual ~PrivetRegisterOperationImpl();
 
-  virtual void Start() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
-  virtual void CompleteRegistration() OVERRIDE;
+  virtual void Start() override;
+  virtual void Cancel() override;
+  virtual void CompleteRegistration() override;
 
   virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) OVERRIDE;
+                       PrivetURLFetcher::ErrorType error) override;
 
   virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                             const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE;
+                            bool has_error) override;
 
   virtual void OnNeedPrivetToken(
       PrivetURLFetcher* fetcher,
-      const PrivetURLFetcher::TokenCallback& callback) OVERRIDE;
+      const PrivetURLFetcher::TokenCallback& callback) override;
 
-  virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE;
+  virtual PrivetHTTPClient* GetHTTPClient() override;
  private:
   class Cancelation : public PrivetURLFetcher::Delegate {
    public:
@@ -80,11 +80,11 @@ class PrivetRegisterOperationImpl
     virtual ~Cancelation();
 
     virtual void OnError(PrivetURLFetcher* fetcher,
-                         PrivetURLFetcher::ErrorType error) OVERRIDE;
+                         PrivetURLFetcher::ErrorType error) override;
 
     virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                               const base::DictionaryValue& value,
-                              bool has_error) OVERRIDE;
+                              bool has_error) override;
 
     void Cleanup();
 
@@ -127,18 +127,18 @@ class PrivetJSONOperationImpl : public PrivetJSONOperation,
                           const std::string& query_params,
                           const PrivetJSONOperation::ResultCallback& callback);
   virtual ~PrivetJSONOperationImpl();
-  virtual void Start() OVERRIDE;
+  virtual void Start() override;
 
-  virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE;
+  virtual PrivetHTTPClient* GetHTTPClient() override;
 
   virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) OVERRIDE;
+                       PrivetURLFetcher::ErrorType error) override;
   virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                             const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE;
+                            bool has_error) override;
   virtual void OnNeedPrivetToken(
       PrivetURLFetcher* fetcher,
-      const PrivetURLFetcher::TokenCallback& callback) OVERRIDE;
+      const PrivetURLFetcher::TokenCallback& callback) override;
 
  private:
   PrivetHTTPClient* privet_client_;
@@ -159,26 +159,26 @@ class PrivetDataReadOperationImpl : public PrivetDataReadOperation,
       const PrivetDataReadOperation::ResultCallback& callback);
   virtual ~PrivetDataReadOperationImpl();
 
-  virtual void Start() OVERRIDE;
+  virtual void Start() override;
 
-  virtual void SetDataRange(int range_start, int range_end) OVERRIDE;
+  virtual void SetDataRange(int range_start, int range_end) override;
 
-  virtual void SaveDataToFile() OVERRIDE;
+  virtual void SaveDataToFile() override;
 
-  virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE;
+  virtual PrivetHTTPClient* GetHTTPClient() override;
 
   virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) OVERRIDE;
+                       PrivetURLFetcher::ErrorType error) override;
   virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                             const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE;
+                            bool has_error) override;
   virtual void OnNeedPrivetToken(
       PrivetURLFetcher* fetcher,
-      const PrivetURLFetcher::TokenCallback& callback) OVERRIDE;
+      const PrivetURLFetcher::TokenCallback& callback) override;
   virtual bool OnRawData(PrivetURLFetcher* fetcher,
                          bool is_file,
                          const std::string& data_str,
-                         const base::FilePath& file_path) OVERRIDE;
+                         const base::FilePath& file_path) override;
 
  private:
   PrivetHTTPClient* privet_client_;
@@ -203,36 +203,36 @@ class PrivetLocalPrintOperationImpl
                                 PrivetLocalPrintOperation::Delegate* delegate);
 
   virtual ~PrivetLocalPrintOperationImpl();
-  virtual void Start() OVERRIDE;
+  virtual void Start() override;
 
   virtual void SetData(
-      const scoped_refptr<base::RefCountedBytes>& data) OVERRIDE;
+      const scoped_refptr<base::RefCountedBytes>& data) override;
 
-  virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
+  virtual void SetCapabilities(const std::string& capabilities) override;
 
-  virtual void SetTicket(const std::string& ticket) OVERRIDE;
+  virtual void SetTicket(const std::string& ticket) override;
 
-  virtual void SetUsername(const std::string& user) OVERRIDE;
+  virtual void SetUsername(const std::string& user) override;
 
-  virtual void SetJobname(const std::string& jobname) OVERRIDE;
+  virtual void SetJobname(const std::string& jobname) override;
 
-  virtual void SetOffline(bool offline) OVERRIDE;
+  virtual void SetOffline(bool offline) override;
 
-  virtual void SetPageSize(const gfx::Size& page_size) OVERRIDE;
+  virtual void SetPageSize(const gfx::Size& page_size) override;
 
   virtual void SetPWGRasterConverterForTesting(
-      scoped_ptr<PWGRasterConverter> pwg_raster_converter) OVERRIDE;
+      scoped_ptr<PWGRasterConverter> pwg_raster_converter) override;
 
-  virtual PrivetHTTPClient* GetHTTPClient() OVERRIDE;
+  virtual PrivetHTTPClient* GetHTTPClient() override;
 
   virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) OVERRIDE;
+                       PrivetURLFetcher::ErrorType error) override;
   virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                             const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE;
+                            bool has_error) override;
   virtual void OnNeedPrivetToken(
       PrivetURLFetcher* fetcher,
-      const PrivetURLFetcher::TokenCallback& callback) OVERRIDE;
+      const PrivetURLFetcher::TokenCallback& callback) override;
 
  private:
   typedef base::Callback<void(bool, const base::DictionaryValue* value)>
@@ -295,15 +295,15 @@ class PrivetHTTPClientImpl : public PrivetHTTPClient {
   virtual ~PrivetHTTPClientImpl();
 
   // PrivetHTTPClient implementation.
-  virtual const std::string& GetName() OVERRIDE;
+  virtual const std::string& GetName() override;
   virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation(
-      const PrivetJSONOperation::ResultCallback& callback) OVERRIDE;
+      const PrivetJSONOperation::ResultCallback& callback) override;
   virtual scoped_ptr<PrivetURLFetcher> CreateURLFetcher(
       const GURL& url,
       net::URLFetcher::RequestType request_type,
-      PrivetURLFetcher::Delegate* delegate) OVERRIDE;
+      PrivetURLFetcher::Delegate* delegate) override;
   virtual void RefreshPrivetToken(
-      const PrivetURLFetcher::TokenCallback& token_callback) OVERRIDE;
+      const PrivetURLFetcher::TokenCallback& token_callback) override;
 
  private:
   typedef std::vector<PrivetURLFetcher::TokenCallback> TokenCallbackVector;
@@ -325,16 +325,16 @@ class PrivetV1HTTPClientImpl : public PrivetV1HTTPClient {
   explicit PrivetV1HTTPClientImpl(scoped_ptr<PrivetHTTPClient> info_client);
   virtual ~PrivetV1HTTPClientImpl();
 
-  virtual const std::string& GetName() OVERRIDE;
+  virtual const std::string& GetName() override;
   virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation(
-      const PrivetJSONOperation::ResultCallback& callback) OVERRIDE;
+      const PrivetJSONOperation::ResultCallback& callback) override;
   virtual scoped_ptr<PrivetRegisterOperation> CreateRegisterOperation(
       const std::string& user,
-      PrivetRegisterOperation::Delegate* delegate) OVERRIDE;
+      PrivetRegisterOperation::Delegate* delegate) override;
   virtual scoped_ptr<PrivetJSONOperation> CreateCapabilitiesOperation(
-      const PrivetJSONOperation::ResultCallback& callback) OVERRIDE;
+      const PrivetJSONOperation::ResultCallback& callback) override;
   virtual scoped_ptr<PrivetLocalPrintOperation> CreateLocalPrintOperation(
-      PrivetLocalPrintOperation::Delegate* delegate) OVERRIDE;
+      PrivetLocalPrintOperation::Delegate* delegate) override;
 
  private:
   PrivetHTTPClient* info_client() { return info_client_.get(); }
diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc
index 94c9bc7..1835024 100644
--- a/chrome/browser/local_discovery/privet_http_unittest.cc
+++ b/chrome/browser/local_discovery/privet_http_unittest.cc
@@ -382,7 +382,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate {
   virtual void OnPrivetRegisterClaimToken(
       PrivetRegisterOperation* operation,
       const std::string& token,
-      const GURL& url) OVERRIDE {
+      const GURL& url) override {
     OnPrivetRegisterClaimTokenInternal(token, url);
   }
 
@@ -395,7 +395,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate {
       const std::string& action,
       PrivetRegisterOperation::FailureReason reason,
       int printer_http_code,
-      const base::DictionaryValue* json) OVERRIDE {
+      const base::DictionaryValue* json) override {
     // TODO(noamsml): Save and test for JSON?
     OnPrivetRegisterErrorInternal(action, reason, printer_http_code);
   }
@@ -407,7 +407,7 @@ class MockRegisterDelegate : public PrivetRegisterOperation::Delegate {
 
   virtual void OnPrivetRegisterDone(
       PrivetRegisterOperation* operation,
-      const std::string& device_id) OVERRIDE {
+      const std::string& device_id) override {
     OnPrivetRegisterDoneInternal(device_id);
   }
 
@@ -441,7 +441,7 @@ class PrivetInfoTest : public PrivetHTTPTest {
 
   virtual ~PrivetInfoTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     info_operation_ = privet_client_->CreateInfoOperation(
         info_callback_.callback());
   }
@@ -488,7 +488,7 @@ class PrivetRegisterTest : public PrivetHTTPTest {
   virtual ~PrivetRegisterTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     info_operation_ = privet_client_->CreateInfoOperation(
         info_callback_.callback());
     register_operation_ =
@@ -677,7 +677,7 @@ class PrivetCapabilitiesTest : public PrivetHTTPTest {
 
   virtual ~PrivetCapabilitiesTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     capabilities_operation_ = privet_client_->CreateCapabilitiesOperation(
         capabilities_callback_.callback());
   }
@@ -768,7 +768,7 @@ class FakePWGRasterConverter : public PWGRasterConverter {
   virtual void Start(base::RefCountedMemory* data,
                      const printing::PdfRenderSettings& conversion_settings,
                      const printing::PwgRasterSettings& bitmap_settings,
-                     const ResultCallback& callback) OVERRIDE {
+                     const ResultCallback& callback) override {
     bitmap_settings_ = bitmap_settings;
     std::string data_str(data->front_as<char>(), data->size());
     callback.Run(true, base::FilePath().AppendASCII(data_str + "test.pdf"));
@@ -788,7 +788,7 @@ class PrivetLocalPrintTest : public PrivetHTTPTest {
 
   virtual ~PrivetLocalPrintTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     PrivetURLFetcher::ResetTokenMapForTests();
 
     local_print_operation_ = privet_client_->CreateLocalPrintOperation(
diff --git a/chrome/browser/local_discovery/privet_local_printer_lister.h b/chrome/browser/local_discovery/privet_local_printer_lister.h
index 6633206..037d7d1 100644
--- a/chrome/browser/local_discovery/privet_local_printer_lister.h
+++ b/chrome/browser/local_discovery/privet_local_printer_lister.h
@@ -47,9 +47,9 @@ class PrivetLocalPrinterLister : PrivetDeviceLister::Delegate {
   // PrivetDeviceLister::Delegate implementation.
   virtual void DeviceChanged(bool added,
                              const std::string& name,
-                             const DeviceDescription& description) OVERRIDE;
-  virtual void DeviceRemoved(const std::string& name) OVERRIDE;
-  virtual void DeviceCacheFlushed() OVERRIDE;
+                             const DeviceDescription& description) override;
+  virtual void DeviceRemoved(const std::string& name) override;
+  virtual void DeviceCacheFlushed() override;
 
  private:
   struct DeviceContext;
diff --git a/chrome/browser/local_discovery/privet_notifications.h b/chrome/browser/local_discovery/privet_notifications.h
index 527db0a..646eff3 100644
--- a/chrome/browser/local_discovery/privet_notifications.h
+++ b/chrome/browser/local_discovery/privet_notifications.h
@@ -99,14 +99,14 @@ class PrivetNotificationService
 
   // PrivetDeviceLister::Delegate implementation:
   virtual void DeviceChanged(bool added, const std::string& name,
-                             const DeviceDescription& description) OVERRIDE;
-  virtual void DeviceRemoved(const std::string& name) OVERRIDE;
+                             const DeviceDescription& description) override;
+  virtual void DeviceRemoved(const std::string& name) override;
 
   // PrivetNotificationListener::Delegate implementation:
-  virtual void PrivetNotify(bool has_multiple, bool added) OVERRIDE;
+  virtual void PrivetNotify(bool has_multiple, bool added) override;
 
-  virtual void PrivetRemoveNotification() OVERRIDE;
-  virtual void DeviceCacheFlushed() OVERRIDE;
+  virtual void PrivetRemoveNotification() override;
+  virtual void DeviceCacheFlushed() override;
 
   static bool IsEnabled();
   static bool IsForced();
@@ -132,13 +132,13 @@ class PrivetNotificationDelegate : public NotificationDelegate {
   explicit PrivetNotificationDelegate(content::BrowserContext* profile);
 
   // NotificationDelegate implementation.
-  virtual std::string id() const OVERRIDE;
-  virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual void Display() OVERRIDE;
-  virtual void Error() OVERRIDE;
-  virtual void Close(bool by_user) OVERRIDE;
-  virtual void Click() OVERRIDE;
-  virtual void ButtonClick(int button_index) OVERRIDE;
+  virtual std::string id() const override;
+  virtual content::WebContents* GetWebContents() const override;
+  virtual void Display() override;
+  virtual void Error() override;
+  virtual void Close(bool by_user) override;
+  virtual void Click() override;
+  virtual void ButtonClick(int button_index) override;
 
  private:
   void OpenTab(const GURL& url);
diff --git a/chrome/browser/local_discovery/privet_notifications_factory.h b/chrome/browser/local_discovery/privet_notifications_factory.h
index 636ce69..b6d62d3 100644
--- a/chrome/browser/local_discovery/privet_notifications_factory.h
+++ b/chrome/browser/local_discovery/privet_notifications_factory.h
@@ -24,9 +24,9 @@ class PrivetNotificationServiceFactory
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+      content::BrowserContext* profile) const override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
+  virtual bool ServiceIsNULLWhileTesting() const override;
 };
 
 }  // namespace local_discovery
diff --git a/chrome/browser/local_discovery/privet_notifications_unittest.cc b/chrome/browser/local_discovery/privet_notifications_unittest.cc
index 2cdcf71..a6e8a0d 100644
--- a/chrome/browser/local_discovery/privet_notifications_unittest.cc
+++ b/chrome/browser/local_discovery/privet_notifications_unittest.cc
@@ -51,12 +51,12 @@ class MockPrivetHttpFactory : public PrivetHTTPAsynchronousFactory {
     virtual ~MockResolution() {
     }
 
-    virtual void Start() OVERRIDE {
+    virtual void Start() override {
       callback_.Run(scoped_ptr<PrivetHTTPClient>(new PrivetHTTPClientImpl(
           name_, net::HostPortPair("1.2.3.4", 8080), request_context_.get())));
     }
 
-    virtual const std::string& GetName() OVERRIDE {
+    virtual const std::string& GetName() override {
       return name_;
     }
 
@@ -73,7 +73,7 @@ class MockPrivetHttpFactory : public PrivetHTTPAsynchronousFactory {
   virtual scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP(
       const std::string& name,
       const net::HostPortPair& address,
-      const ResultCallback& callback) OVERRIDE {
+      const ResultCallback& callback) override {
     return scoped_ptr<PrivetHTTPResolution>(
         new MockResolution(name, request_context_.get(), callback));
   }
diff --git a/chrome/browser/local_discovery/privet_traffic_detector.h b/chrome/browser/local_discovery/privet_traffic_detector.h
index 1cbf3fb..32a5b09 100644
--- a/chrome/browser/local_discovery/privet_traffic_detector.h
+++ b/chrome/browser/local_discovery/privet_traffic_detector.h
@@ -41,7 +41,7 @@ class PrivetTrafficDetector
 
     // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   void StartOnIOThread();
   void ScheduleRestart();
diff --git a/chrome/browser/local_discovery/privet_url_fetcher.h b/chrome/browser/local_discovery/privet_url_fetcher.h
index a4c4108..8bae4a7 100644
--- a/chrome/browser/local_discovery/privet_url_fetcher.h
+++ b/chrome/browser/local_discovery/privet_url_fetcher.h
@@ -74,7 +74,7 @@ class PrivetURLFetcher : public net::URLFetcherDelegate {
   virtual ~PrivetURLFetcher();
 
   // net::URLFetcherDelegate methods.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   static void SetTokenForHost(const std::string& host,
                               const std::string& token);
diff --git a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc
index 45d1edd..5d07b8a 100644
--- a/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc
+++ b/chrome/browser/local_discovery/privet_url_fetcher_unittest.cc
@@ -32,7 +32,7 @@ class MockPrivetURLFetcherDelegate : public PrivetURLFetcher::Delegate {
   }
 
   virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) OVERRIDE {
+                       PrivetURLFetcher::ErrorType error) override {
     OnErrorInternal(error);
   }
 
@@ -40,7 +40,7 @@ class MockPrivetURLFetcherDelegate : public PrivetURLFetcher::Delegate {
 
   virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                             const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE {
+                            bool has_error) override {
     saved_value_.reset(value.DeepCopy());
     OnParsedJsonInternal(has_error);
   }
diff --git a/chrome/browser/local_discovery/privetv3_crypto_provider.cc b/chrome/browser/local_discovery/privetv3_crypto_provider.cc
index df27aa6..12bbcc8 100644
--- a/chrome/browser/local_discovery/privetv3_crypto_provider.cc
+++ b/chrome/browser/local_discovery/privetv3_crypto_provider.cc
@@ -23,16 +23,16 @@ class PrivetV3CryptoProviderEmpty : public PrivetV3CryptoProvider {
   virtual ~PrivetV3CryptoProviderEmpty();
 
   // PrivetV3CryptoProvider implementation.
-  virtual HandshakeState GetState() OVERRIDE;
-  virtual std::string GetAuthMethod() OVERRIDE;
-  virtual HandshakeState GetNextStep(int* step, std::string* package) OVERRIDE;
+  virtual HandshakeState GetState() override;
+  virtual std::string GetAuthMethod() override;
+  virtual HandshakeState GetNextStep(int* step, std::string* package) override;
   virtual HandshakeState SetStepResponse(int step,
                                          const std::string& state,
-                                         const std::string& package) OVERRIDE;
-  virtual std::string GetVerificationCode() OVERRIDE;
-  virtual HandshakeState AcceptVerificationCode() OVERRIDE;
+                                         const std::string& package) override;
+  virtual std::string GetVerificationCode() override;
+  virtual HandshakeState AcceptVerificationCode() override;
   virtual bool EncryptData(const std::string& input,
-                           std::string* output) OVERRIDE;
+                           std::string* output) override;
 
  private:
   HandshakeState state_;
diff --git a/chrome/browser/local_discovery/privetv3_session.cc b/chrome/browser/local_discovery/privetv3_session.cc
index d3bbb96d..2a2775f 100644
--- a/chrome/browser/local_discovery/privetv3_session.cc
+++ b/chrome/browser/local_discovery/privetv3_session.cc
@@ -36,12 +36,12 @@ class PrivetV3Session::FetcherDelegate : public PrivetURLFetcher::Delegate {
   // PrivetURLFetcher::Delegate methods.
   virtual void OnNeedPrivetToken(
       PrivetURLFetcher* fetcher,
-      const PrivetURLFetcher::TokenCallback& callback) OVERRIDE;
+      const PrivetURLFetcher::TokenCallback& callback) override;
   virtual void OnError(PrivetURLFetcher* fetcher,
-                       PrivetURLFetcher::ErrorType error) OVERRIDE;
+                       PrivetURLFetcher::ErrorType error) override;
   virtual void OnParsedJson(PrivetURLFetcher* fetcher,
                             const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE;
+                            bool has_error) override;
 
  private:
   friend class PrivetV3Session;
diff --git a/chrome/browser/local_discovery/privetv3_session_unittest.cc b/chrome/browser/local_discovery/privetv3_session_unittest.cc
index fd117a4..1c9f845 100644
--- a/chrome/browser/local_discovery/privetv3_session_unittest.cc
+++ b/chrome/browser/local_discovery/privetv3_session_unittest.cc
@@ -44,7 +44,7 @@ class PrivetV3SessionTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     quit_closure_ = run_loop_.QuitClosure();
     EXPECT_CALL(delegate_, OnSetupConfirmationNeeded(_, _)).Times(0);
     EXPECT_CALL(delegate_, OnSessionStatus(_)).Times(0);
diff --git a/chrome/browser/local_discovery/privetv3_setup_flow.cc b/chrome/browser/local_discovery/privetv3_setup_flow.cc
index 64142d7..9f3554f 100644
--- a/chrome/browser/local_discovery/privetv3_setup_flow.cc
+++ b/chrome/browser/local_discovery/privetv3_setup_flow.cc
@@ -21,12 +21,12 @@ class SetupRequest : public PrivetV3Session::Request {
   explicit SetupRequest(PrivetV3SetupFlow* setup_flow);
   virtual ~SetupRequest();
 
-  virtual std::string GetName() OVERRIDE { return "/privet/v3/setup/start"; }
-  virtual const base::DictionaryValue& GetInput() OVERRIDE;
+  virtual std::string GetName() override { return "/privet/v3/setup/start"; }
+  virtual const base::DictionaryValue& GetInput() override;
 
-  virtual void OnError(PrivetURLFetcher::ErrorType error) OVERRIDE;
+  virtual void OnError(PrivetURLFetcher::ErrorType error) override;
   virtual void OnParsedJson(const base::DictionaryValue& value,
-                            bool has_error) OVERRIDE;
+                            bool has_error) override;
 
   void SetWiFiCridentials(const std::string& ssid, const std::string& password);
 
diff --git a/chrome/browser/local_discovery/privetv3_setup_flow.h b/chrome/browser/local_discovery/privetv3_setup_flow.h
index f53e506..925ee8a 100644
--- a/chrome/browser/local_discovery/privetv3_setup_flow.h
+++ b/chrome/browser/local_discovery/privetv3_setup_flow.h
@@ -75,9 +75,9 @@ class PrivetV3SetupFlow : public PrivetV3Session::Delegate {
   virtual void OnSetupConfirmationNeeded(
       const std::string& confirmation_code,
       extensions::api::gcd_private::ConfirmationType confirmation_type)
-      OVERRIDE;
+      override;
   virtual void OnSessionStatus(
-      extensions::api::gcd_private::Status status) OVERRIDE;
+      extensions::api::gcd_private::Status status) override;
 
   void OnSetupError();
   void OnDeviceRegistered();
diff --git a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
index 538acfc..d25f982 100644
--- a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
+++ b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc
@@ -47,19 +47,19 @@ class MockPrivetHTTPClient : public PrivetHTTPClient {
       PrivetJSONOperation*(const PrivetJSONOperation::ResultCallback&));
 
   virtual void RefreshPrivetToken(
-      const PrivetURLFetcher::TokenCallback& callback) OVERRIDE {
+      const PrivetURLFetcher::TokenCallback& callback) override {
     callback.Run("x-privet-token");
   }
 
   virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation(
-      const PrivetJSONOperation::ResultCallback& callback) OVERRIDE {
+      const PrivetJSONOperation::ResultCallback& callback) override {
     return make_scoped_ptr(CreateInfoOperationPtr(callback));
   }
 
   virtual scoped_ptr<PrivetURLFetcher> CreateURLFetcher(
       const GURL& url,
       net::URLFetcher::RequestType request_type,
-      PrivetURLFetcher::Delegate* delegate) OVERRIDE {
+      PrivetURLFetcher::Delegate* delegate) override {
     return make_scoped_ptr(new PrivetURLFetcher(
         url, request_type, request_context_.get(), delegate));
   }
@@ -75,7 +75,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
    public:
     explicit MockGCDApiFlow(MockDelegate* delegate) : delegate_(delegate) {}
 
-    virtual void Start(scoped_ptr<Request> request) OVERRIDE {
+    virtual void Start(scoped_ptr<Request> request) override {
       ASSERT_FALSE(delegate_->gcd_request_);
       delegate_->gcd_request_ = request.Pass();
       delegate_->ReplyWithToken();
@@ -89,7 +89,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
   MOCK_METHOD1(SwitchToSetupWiFi, void(const ResultCallback&));
   virtual void CreatePrivetV3Client(
       const std::string& service_name,
-      const PrivetClientCallback& callback) OVERRIDE {
+      const PrivetClientCallback& callback) override {
     scoped_ptr<MockPrivetHTTPClient> privet_client(new MockPrivetHTTPClient());
     privet_client_ptr_ = privet_client.get();
     callback.Run(privet_client.PassAs<PrivetHTTPClient>());
@@ -100,7 +100,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate {
   MOCK_METHOD0(OnSetupDone, void());
   MOCK_METHOD0(OnSetupError, void());
 
-  virtual scoped_ptr<GCDApiFlow> CreateApiFlow() OVERRIDE {
+  virtual scoped_ptr<GCDApiFlow> CreateApiFlow() override {
     scoped_ptr<MockGCDApiFlow> mock_gcd(new MockGCDApiFlow(this));
     return mock_gcd.PassAs<GCDApiFlow>();
   }
@@ -130,7 +130,7 @@ class PrivetV3SetupFlowTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     quit_closure_ = run_loop_.QuitClosure();
     EXPECT_CALL(delegate_, GetWiFiCredentials(_)).Times(0);
     EXPECT_CALL(delegate_, SwitchToSetupWiFi(_)).Times(0);
diff --git a/chrome/browser/local_discovery/pwg_raster_converter.cc b/chrome/browser/local_discovery/pwg_raster_converter.cc
index f0edb347..75b6756 100644
--- a/chrome/browser/local_discovery/pwg_raster_converter.cc
+++ b/chrome/browser/local_discovery/pwg_raster_converter.cc
@@ -109,8 +109,8 @@ class PwgUtilityProcessHostClient : public content::UtilityProcessHostClient {
                const PWGRasterConverter::ResultCallback& callback);
 
   // UtilityProcessHostClient implementation.
-  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnProcessCrashed(int exit_code) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   virtual ~PwgUtilityProcessHostClient();
@@ -248,7 +248,7 @@ class PWGRasterConverterImpl : public PWGRasterConverter {
   virtual void Start(base::RefCountedMemory* data,
                      const printing::PdfRenderSettings& conversion_settings,
                      const printing::PwgRasterSettings& bitmap_settings,
-                     const ResultCallback& callback) OVERRIDE;
+                     const ResultCallback& callback) override;
 
  private:
   scoped_refptr<PwgUtilityProcessHostClient> utility_client_;
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.h b/chrome/browser/local_discovery/service_discovery_client_mac.h
index 4532e5e..bc67de4 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mac.h
+++ b/chrome/browser/local_discovery/service_discovery_client_mac.h
@@ -37,14 +37,14 @@ class ServiceDiscoveryClientMac : public ServiceDiscoverySharedClient {
   // ServiceDiscoveryClient implementation.
   virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
-      const ServiceWatcher::UpdatedCallback& callback) OVERRIDE;
+      const ServiceWatcher::UpdatedCallback& callback) override;
   virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
-      const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE;
+      const ServiceResolver::ResolveCompleteCallback& callback) override;
   virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
       const std::string& domain,
       net::AddressFamily address_family,
-      const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE;
+      const LocalDomainResolver::IPAddressCallback& callback) override;
 
   void StartThreadIfNotStarted();
 
@@ -102,11 +102,11 @@ class ServiceWatcherImplMac : public ServiceWatcher {
  private:
   virtual ~ServiceWatcherImplMac();
 
-  virtual void Start() OVERRIDE;
-  virtual void DiscoverNewServices(bool force_update) OVERRIDE;
+  virtual void Start() override;
+  virtual void DiscoverNewServices(bool force_update) override;
   virtual void SetActivelyRefreshServices(
-      bool actively_refresh_services) OVERRIDE;
-  virtual std::string GetServiceType() const OVERRIDE;
+      bool actively_refresh_services) override;
+  virtual std::string GetServiceType() const override;
 
   std::string service_type_;
   ServiceWatcher::UpdatedCallback callback_;
@@ -170,8 +170,8 @@ class ServiceResolverImplMac : public ServiceResolver {
  private:
   virtual ~ServiceResolverImplMac();
 
-  virtual void StartResolving() OVERRIDE;
-  virtual std::string GetName() const OVERRIDE;
+  virtual void StartResolving() override;
+  virtual std::string GetName() const override;
 
   void OnResolveComplete(RequestStatus status,
                          const ServiceDescription& description);
diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.cc b/chrome/browser/local_discovery/service_discovery_client_mdns.cc
index 0016eb4..9834b05 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mdns.cc
+++ b/chrome/browser/local_discovery/service_discovery_client_mdns.cc
@@ -112,7 +112,7 @@ class SocketFactory : public net::MDnsSocketFactory {
 
   // net::MDnsSocketFactory implementation:
   virtual void CreateSockets(
-      ScopedVector<net::DatagramServerSocket>* sockets) OVERRIDE {
+      ScopedVector<net::DatagramServerSocket>* sockets) override {
     for (size_t i = 0; i < interfaces_.size(); ++i) {
       DCHECK(interfaces_[i].second == net::ADDRESS_FAMILY_IPV4 ||
              interfaces_[i].second == net::ADDRESS_FAMILY_IPV6);
@@ -149,11 +149,11 @@ class ProxyBase : public ServiceDiscoveryClientMdns::Proxy, public T {
     DeleteOnMdnsThread(implementation_.release());
   }
 
-  virtual bool IsValid() OVERRIDE {
+  virtual bool IsValid() override {
     return !!implementation();
   }
 
-  virtual void OnMdnsDestroy() OVERRIDE {
+  virtual void OnMdnsDestroy() override {
     DeleteOnMdnsThread(implementation_.release());
   };
 
@@ -187,14 +187,14 @@ class ServiceWatcherProxy : public ProxyBase<ServiceWatcher> {
   }
 
   // ServiceWatcher methods.
-  virtual void Start() OVERRIDE {
+  virtual void Start() override {
     if (implementation()) {
       PostToMdnsThread(base::Bind(&ServiceWatcher::Start,
                                   base::Unretained(implementation())));
     }
   }
 
-  virtual void DiscoverNewServices(bool force_update) OVERRIDE {
+  virtual void DiscoverNewServices(bool force_update) override {
     if (implementation()) {
       PostToMdnsThread(base::Bind(&ServiceWatcher::DiscoverNewServices,
                                   base::Unretained(implementation()),
@@ -203,7 +203,7 @@ class ServiceWatcherProxy : public ProxyBase<ServiceWatcher> {
   }
 
   virtual void SetActivelyRefreshServices(
-      bool actively_refresh_services) OVERRIDE {
+      bool actively_refresh_services) override {
     if (implementation()) {
       PostToMdnsThread(base::Bind(&ServiceWatcher::SetActivelyRefreshServices,
                                   base::Unretained(implementation()),
@@ -211,11 +211,11 @@ class ServiceWatcherProxy : public ProxyBase<ServiceWatcher> {
     }
   }
 
-  virtual std::string GetServiceType() const OVERRIDE {
+  virtual std::string GetServiceType() const override {
     return service_type_;
   }
 
-  virtual void OnNewMdnsReady() OVERRIDE {
+  virtual void OnNewMdnsReady() override {
     ProxyBase<ServiceWatcher>::OnNewMdnsReady();
     if (!implementation())
       callback_.Run(ServiceWatcher::UPDATE_INVALIDATED, "");
@@ -250,14 +250,14 @@ class ServiceResolverProxy : public ProxyBase<ServiceResolver> {
   }
 
   // ServiceResolver methods.
-  virtual void StartResolving() OVERRIDE {
+  virtual void StartResolving() override {
     if (implementation()) {
       PostToMdnsThread(base::Bind(&ServiceResolver::StartResolving,
                                   base::Unretained(implementation())));
     }
   };
 
-  virtual std::string GetName() const OVERRIDE {
+  virtual std::string GetName() const override {
     return service_name_;
   }
 
@@ -294,7 +294,7 @@ class LocalDomainResolverProxy : public ProxyBase<LocalDomainResolver> {
   }
 
   // LocalDomainResolver methods.
-  virtual void Start() OVERRIDE {
+  virtual void Start() override {
     if (implementation()) {
       PostToMdnsThread(base::Bind(&LocalDomainResolver::Start,
                                   base::Unretained(implementation())));
diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.h b/chrome/browser/local_discovery/service_discovery_client_mdns.h
index 4a2b467..3d0ba68 100644
--- a/chrome/browser/local_discovery/service_discovery_client_mdns.h
+++ b/chrome/browser/local_discovery/service_discovery_client_mdns.h
@@ -29,18 +29,18 @@ class ServiceDiscoveryClientMdns
   // ServiceDiscoveryClient implementation.
   virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
-      const ServiceWatcher::UpdatedCallback& callback) OVERRIDE;
+      const ServiceWatcher::UpdatedCallback& callback) override;
   virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
-      const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE;
+      const ServiceResolver::ResolveCompleteCallback& callback) override;
   virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
       const std::string& domain,
       net::AddressFamily address_family,
-      const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE;
+      const LocalDomainResolver::IPAddressCallback& callback) override;
 
   // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
  private:
   virtual ~ServiceDiscoveryClientMdns();
diff --git a/chrome/browser/local_discovery/service_discovery_client_utility.h b/chrome/browser/local_discovery/service_discovery_client_utility.h
index beb3f2e..0b309f7 100644
--- a/chrome/browser/local_discovery/service_discovery_client_utility.h
+++ b/chrome/browser/local_discovery/service_discovery_client_utility.h
@@ -27,18 +27,18 @@ class ServiceDiscoveryClientUtility
   // ServiceDiscoveryClient implementation.
   virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
-      const ServiceWatcher::UpdatedCallback& callback) OVERRIDE;
+      const ServiceWatcher::UpdatedCallback& callback) override;
   virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
-      const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE;
+      const ServiceResolver::ResolveCompleteCallback& callback) override;
   virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
       const std::string& domain,
       net::AddressFamily address_family,
-      const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE;
+      const LocalDomainResolver::IPAddressCallback& callback) override;
 
   // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
  private:
   friend class base::RefCounted<ServiceDiscoveryClientUtility>;
diff --git a/chrome/browser/local_discovery/service_discovery_host_client.cc b/chrome/browser/local_discovery/service_discovery_host_client.cc
index 8b75fc6..78d001c 100644
--- a/chrome/browser/local_discovery/service_discovery_host_client.cc
+++ b/chrome/browser/local_discovery/service_discovery_host_client.cc
@@ -69,28 +69,28 @@ class ServiceDiscoveryHostClient::ServiceWatcherProxy : public ServiceWatcher {
       host_->Send(new LocalDiscoveryMsg_DestroyWatcher(id_));
   }
 
-  virtual void Start() OVERRIDE {
+  virtual void Start() override {
     DVLOG(1) << "ServiceWatcher::Start with id " << id_;
     DCHECK(!started_);
     host_->Send(new LocalDiscoveryMsg_StartWatcher(id_, service_type_));
     started_ = true;
   }
 
-  virtual void DiscoverNewServices(bool force_update) OVERRIDE {
+  virtual void DiscoverNewServices(bool force_update) override {
     DVLOG(1) << "ServiceWatcher::DiscoverNewServices with id " << id_;
     DCHECK(started_);
     host_->Send(new LocalDiscoveryMsg_DiscoverServices(id_, force_update));
   }
 
   virtual void SetActivelyRefreshServices(
-      bool actively_refresh_services) OVERRIDE {
+      bool actively_refresh_services) override {
     DVLOG(1) << "ServiceWatcher::SetActivelyRefreshServices with id " << id_;
     DCHECK(started_);
     host_->Send(new LocalDiscoveryMsg_SetActivelyRefreshServices(
         id_, actively_refresh_services));
   }
 
-  virtual std::string GetServiceType() const OVERRIDE {
+  virtual std::string GetServiceType() const override {
     return service_type_;
   }
 
@@ -120,14 +120,14 @@ class ServiceDiscoveryHostClient::ServiceResolverProxy
       host_->Send(new LocalDiscoveryMsg_DestroyResolver(id_));
   }
 
-  virtual void StartResolving() OVERRIDE {
+  virtual void StartResolving() override {
     DVLOG(1) << "ServiceResolverProxy::StartResolving with id " << id_;
     DCHECK(!started_);
     host_->Send(new LocalDiscoveryMsg_ResolveService(id_, service_name_));
     started_ = true;
   }
 
-  virtual std::string GetName() const OVERRIDE {
+  virtual std::string GetName() const override {
     return service_name_;
   }
 
@@ -159,7 +159,7 @@ class ServiceDiscoveryHostClient::LocalDomainResolverProxy
       host_->Send(new LocalDiscoveryMsg_DestroyLocalDomainResolver(id_));
   }
 
-  virtual void Start() OVERRIDE {
+  virtual void Start() override {
     DVLOG(1) << "LocalDomainResolverProxy::Start with id " << id_;
     DCHECK(!started_);
     host_->Send(new LocalDiscoveryMsg_ResolveLocalDomain(id_, domain_,
diff --git a/chrome/browser/local_discovery/service_discovery_host_client.h b/chrome/browser/local_discovery/service_discovery_host_client.h
index 330418c..ce16e43 100644
--- a/chrome/browser/local_discovery/service_discovery_host_client.h
+++ b/chrome/browser/local_discovery/service_discovery_host_client.h
@@ -48,18 +48,18 @@ class ServiceDiscoveryHostClient
   // ServiceDiscoveryClient implementation.
   virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
-      const ServiceWatcher::UpdatedCallback& callback) OVERRIDE;
+      const ServiceWatcher::UpdatedCallback& callback) override;
   virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
-      const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE;
+      const ServiceResolver::ResolveCompleteCallback& callback) override;
   virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
       const std::string& domain,
       net::AddressFamily address_family,
-      const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE;
+      const LocalDomainResolver::IPAddressCallback& callback) override;
 
   // UtilityProcessHostClient implementation.
-  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnProcessCrashed(int exit_code) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
   virtual ~ServiceDiscoveryHostClient();
diff --git a/chrome/browser/local_discovery/test_service_discovery_client.h b/chrome/browser/local_discovery/test_service_discovery_client.h
index 92a14d9..28836d4 100644
--- a/chrome/browser/local_discovery/test_service_discovery_client.h
+++ b/chrome/browser/local_discovery/test_service_discovery_client.h
@@ -21,14 +21,14 @@ class TestServiceDiscoveryClient : public ServiceDiscoverySharedClient {
 
   virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
       const std::string& service_type,
-      const ServiceWatcher::UpdatedCallback& callback) OVERRIDE;
+      const ServiceWatcher::UpdatedCallback& callback) override;
   virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
       const std::string& service_name,
-      const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE;
+      const ServiceResolver::ResolveCompleteCallback& callback) override;
   virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
       const std::string& domain,
       net::AddressFamily address_family,
-      const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE;
+      const LocalDomainResolver::IPAddressCallback& callback) override;
 
   MOCK_METHOD1(OnSendTo, void(const std::string& data));
 
diff --git a/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h b/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h
index dfcc9a9..5c2dd28 100644
--- a/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h
+++ b/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h
@@ -52,7 +52,7 @@ class BootstrappingDeviceLister : public NetworkListObserver {
       ActiveDeviceList;
 
   virtual void OnNetworkListChanged(
-      const std::vector<NetworkProperties>& ssids) OVERRIDE;
+      const std::vector<NetworkProperties>& ssids) override;
 
   void UpdateChangedSSIDs(bool available,
                           const ActiveDeviceList& changed,
diff --git a/chrome/browser/local_discovery/wifi/credential_getter_win.h b/chrome/browser/local_discovery/wifi/credential_getter_win.h
index ea7d896..4b28aca 100644
--- a/chrome/browser/local_discovery/wifi/credential_getter_win.h
+++ b/chrome/browser/local_discovery/wifi/credential_getter_win.h
@@ -27,9 +27,9 @@ class CredentialGetterWin : public content::UtilityProcessHostClient {
 
  private:
   // UtilityProcessHostClient
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
-  virtual void OnProcessLaunchFailed() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnProcessCrashed(int exit_code) override;
+  virtual void OnProcessLaunchFailed() override;
 
   // IPC message handlers.
   void OnGotCredentials(const std::string& key_data, bool success);
diff --git a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
index 589abe7..80cecb3fd 100644
--- a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
+++ b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
@@ -20,7 +20,7 @@ class MockWifiManager : public WifiManager {
 
   MOCK_METHOD0(Start, void());
 
-  virtual void GetSSIDList(const SSIDListCallback& callback) OVERRIDE;
+  virtual void GetSSIDList(const SSIDListCallback& callback) override;
 
   MOCK_METHOD0(GetSSIDListInternal, void());
 
@@ -31,7 +31,7 @@ class MockWifiManager : public WifiManager {
   virtual void ConfigureAndConnectNetwork(
       const std::string& ssid,
       const WifiCredentials& credentials,
-      const SuccessCallback& callback) OVERRIDE;
+      const SuccessCallback& callback) override;
 
   MOCK_METHOD2(ConfigureAndConnectNetworkInternal,
                void(const std::string& ssid, const std::string& password));
@@ -39,7 +39,7 @@ class MockWifiManager : public WifiManager {
   void CallConfigureAndConnectNetworkCallback(bool success);
 
   virtual void ConnectToNetworkByID(const std::string& internal_id,
-                                    const SuccessCallback& callback) OVERRIDE;
+                                    const SuccessCallback& callback) override;
 
   MOCK_METHOD1(ConnectToNetworkByIDInternal,
                void(const std::string& internal_id));
@@ -48,7 +48,7 @@ class MockWifiManager : public WifiManager {
 
   virtual void RequestNetworkCredentials(
       const std::string& internal_id,
-      const CredentialsCallback& callback) OVERRIDE;
+      const CredentialsCallback& callback) override;
 
   MOCK_METHOD1(RequestNetworkCredentialsInternal,
                void(const std::string& internal_id));
@@ -78,7 +78,7 @@ class MockWifiManagerFactory : public WifiManagerFactory {
   MockWifiManagerFactory();
   virtual ~MockWifiManagerFactory();
 
-  virtual scoped_ptr<WifiManager> CreateWifiManager() OVERRIDE;
+  virtual scoped_ptr<WifiManager> CreateWifiManager() override;
 
   MockWifiManager* GetLastCreatedWifiManager();
 
diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc
index 5660007..8077c3a 100644
--- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc
+++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc
@@ -80,7 +80,7 @@ class WifiManagerNonChromeos::WifiServiceWrapper
  private:
   // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
   virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+      net::NetworkChangeNotifier::ConnectionType type) override;
 
   void GetSSIDListInternal(NetworkPropertiesList* ssid_list);
 
diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
index 008bd19..61b9d6b 100644
--- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
+++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
@@ -25,21 +25,21 @@ class WifiManagerNonChromeos : public WifiManager {
   virtual ~WifiManagerNonChromeos();
 
   // WifiManager implementation.
-  virtual void Start() OVERRIDE;
-  virtual void GetSSIDList(const SSIDListCallback& callback) OVERRIDE;
-  virtual void RequestScan() OVERRIDE;
+  virtual void Start() override;
+  virtual void GetSSIDList(const SSIDListCallback& callback) override;
+  virtual void RequestScan() override;
   virtual void ConfigureAndConnectNetwork(
       const std::string& ssid,
       const WifiCredentials& credentials,
-      const SuccessCallback& callback) OVERRIDE;
+      const SuccessCallback& callback) override;
   virtual void ConnectToNetworkByID(const std::string& internal_id,
-                                    const SuccessCallback& callback) OVERRIDE;
+                                    const SuccessCallback& callback) override;
   virtual void RequestNetworkCredentials(
       const std::string& ssid,
-      const CredentialsCallback& callback) OVERRIDE;
-  virtual void AddNetworkListObserver(NetworkListObserver* observer) OVERRIDE;
+      const CredentialsCallback& callback) override;
+  virtual void AddNetworkListObserver(NetworkListObserver* observer) override;
   virtual void RemoveNetworkListObserver(
-      NetworkListObserver* observer) OVERRIDE;
+      NetworkListObserver* observer) override;
 
  private:
   class WifiServiceWrapper;