Replace OVERRIDE and FINAL with override and final in content/browser/loader

BUG=417463

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

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

21 files changed, 190 insertions, 190 deletions

diff --git a/content/browser/loader/async_resource_handler.h b/content/browser/loader/async_resource_handler.h
index ecf3a23..6cf5dea 100644
--- a/content/browser/loader/async_resource_handler.h
+++ b/content/browser/loader/async_resource_handler.h
@@ -33,25 +33,25 @@ class AsyncResourceHandler : public ResourceHandler,
                        ResourceDispatcherHostImpl* rdh);
   virtual ~AsyncResourceHandler();
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // ResourceHandler implementation:
-  virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
+  virtual bool OnUploadProgress(uint64 position, uint64 size) override;
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE;
+                                 bool* defer) override;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE;
+                          int min_size) override;
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE;
-  virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE;
+                                   bool* defer) override;
+  virtual void OnDataDownloaded(int bytes_downloaded) override;
 
  private:
   // IPC message handlers:
diff --git a/content/browser/loader/buffered_resource_handler.h b/content/browser/loader/buffered_resource_handler.h
index 0b6d698..c6805af 100644
--- a/content/browser/loader/buffered_resource_handler.h
+++ b/content/browser/loader/buffered_resource_handler.h
@@ -32,22 +32,22 @@ class BufferedResourceHandler
 
  private:
   // ResourceHandler implementation:
-  virtual void SetController(ResourceController* controller) OVERRIDE;
+  virtual void SetController(ResourceController* controller) override;
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
+                                 bool* defer) override;
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE;
+                          int min_size) override;
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
 
   // ResourceController implementation:
-  virtual void Resume() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
-  virtual void CancelAndIgnore() OVERRIDE;
-  virtual void CancelWithError(int error_code) OVERRIDE;
+  virtual void Resume() override;
+  virtual void Cancel() override;
+  virtual void CancelAndIgnore() override;
+  virtual void CancelWithError(int error_code) override;
 
   bool ProcessResponse(bool* defer);
 
diff --git a/content/browser/loader/certificate_resource_handler.h b/content/browser/loader/certificate_resource_handler.h
index b91e495..b6844b7 100644
--- a/content/browser/loader/certificate_resource_handler.h
+++ b/content/browser/loader/certificate_resource_handler.h
@@ -33,38 +33,38 @@ class CertificateResourceHandler : public ResourceHandler {
   explicit CertificateResourceHandler(net::URLRequest* request);
   virtual ~CertificateResourceHandler();
 
-  virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
+  virtual bool OnUploadProgress(uint64 position, uint64 size) override;
 
   // Not needed, as this event handler ought to be the final resource.
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* resp,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
 
   // Check if this indeed an X509 cert.
   virtual bool OnResponseStarted(ResourceResponse* resp,
-                                 bool* defer) OVERRIDE;
+                                 bool* defer) override;
 
   // Pass-through implementation.
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
 
   // Pass-through implementation.
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE;
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
 
   // Create a new buffer to store received data.
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
+                          int min_size) override;
 
   // A read was completed, maybe allocate a new buffer for further data.
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE;
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
 
   // Done downloading the certificate.
   virtual void OnResponseCompleted(const net::URLRequestStatus& urs,
                                    const std::string& sec_info,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
 
   // N/A to cert downloading.
-  virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE;
+  virtual void OnDataDownloaded(int bytes_downloaded) override;
 
  private:
   typedef std::vector<std::pair<scoped_refptr<net::IOBuffer>,
diff --git a/content/browser/loader/cross_site_resource_handler.h b/content/browser/loader/cross_site_resource_handler.h
index bdd430d..13d532b 100644
--- a/content/browser/loader/cross_site_resource_handler.h
+++ b/content/browser/loader/cross_site_resource_handler.h
@@ -33,14 +33,14 @@ class CrossSiteResourceHandler : public LayeredResourceHandler {
   // ResourceHandler implementation:
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
+                                 bool* defer) override;
   virtual bool OnReadCompleted(int bytes_read,
-                               bool* defer) OVERRIDE;
+                               bool* defer) override;
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
 
   // We can now send the response to the new renderer, which will cause
   // WebContentsImpl to swap in the new renderer and destroy the old one.
diff --git a/content/browser/loader/detachable_resource_handler.h b/content/browser/loader/detachable_resource_handler.h
index 60181ad..ecacae0 100644
--- a/content/browser/loader/detachable_resource_handler.h
+++ b/content/browser/loader/detachable_resource_handler.h
@@ -47,29 +47,29 @@ class DetachableResourceHandler : public ResourceHandler,
   }
 
   // ResourceHandler implementation:
-  virtual void SetController(ResourceController* controller) OVERRIDE;
-  virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
+  virtual void SetController(ResourceController* controller) override;
+  virtual bool OnUploadProgress(uint64 position, uint64 size) override;
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE;
+                                 bool* defer) override;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE;
+                          int min_size) override;
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE;
-  virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE;
+                                   bool* defer) override;
+  virtual void OnDataDownloaded(int bytes_downloaded) override;
 
   // ResourceController implementation:
-  virtual void Resume() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
-  virtual void CancelAndIgnore() OVERRIDE;
-  virtual void CancelWithError(int error_code) OVERRIDE;
+  virtual void Resume() override;
+  virtual void Cancel() override;
+  virtual void CancelAndIgnore() override;
+  virtual void CancelWithError(int error_code) override;
 
  private:
   scoped_ptr<ResourceHandler> next_handler_;
diff --git a/content/browser/loader/layered_resource_handler.h b/content/browser/loader/layered_resource_handler.h
index 3a092c3..9f888df 100644
--- a/content/browser/loader/layered_resource_handler.h
+++ b/content/browser/loader/layered_resource_handler.h
@@ -24,24 +24,24 @@ class CONTENT_EXPORT LayeredResourceHandler : public ResourceHandler {
   virtual ~LayeredResourceHandler();
 
   // ResourceHandler implementation:
-  virtual void SetController(ResourceController* controller) OVERRIDE;
-  virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
+  virtual void SetController(ResourceController* controller) override;
+  virtual bool OnUploadProgress(uint64 position, uint64 size) override;
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE;
+                                 bool* defer) override;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
+                          int min_size) override;
   virtual bool OnReadCompleted(int bytes_read,
-                               bool* defer) OVERRIDE;
+                               bool* defer) override;
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE;
-  virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE;
+                                   bool* defer) override;
+  virtual void OnDataDownloaded(int bytes_downloaded) override;
 
   scoped_ptr<ResourceHandler> next_handler_;
 };
diff --git a/content/browser/loader/power_save_block_resource_throttle.h b/content/browser/loader/power_save_block_resource_throttle.h
index 2a4f9b3..8c1751e 100644
--- a/content/browser/loader/power_save_block_resource_throttle.h
+++ b/content/browser/loader/power_save_block_resource_throttle.h
@@ -22,9 +22,9 @@ class PowerSaveBlockResourceThrottle : public ResourceThrottle {
   virtual ~PowerSaveBlockResourceThrottle();
 
   // ResourceThrottle overrides:
-  virtual void WillStartRequest(bool* defer) OVERRIDE;
-  virtual void WillProcessResponse(bool* defer) OVERRIDE;
-  virtual const char* GetNameForLogging() const OVERRIDE;
+  virtual void WillStartRequest(bool* defer) override;
+  virtual void WillProcessResponse(bool* defer) override;
+  virtual const char* GetNameForLogging() const override;
 
  private:
   void ActivatePowerSaveBlocker();
diff --git a/content/browser/loader/redirect_to_file_resource_handler.h b/content/browser/loader/redirect_to_file_resource_handler.h
index 6fe1e47..ef1bcb9 100644
--- a/content/browser/loader/redirect_to_file_resource_handler.h
+++ b/content/browser/loader/redirect_to_file_resource_handler.h
@@ -57,15 +57,15 @@ class CONTENT_EXPORT RedirectToFileResourceHandler
 
   // LayeredResourceHandler implementation:
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
+                                 bool* defer) override;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE;
+                          int min_size) override;
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
 
  private:
   void DidCreateTemporaryFile(base::File::Error error_code,
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index 9eb73c1..1ef6fd3 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -36,7 +36,7 @@ class ResourceDispatcherHostBrowserTest : public ContentBrowserTest,
   ResourceDispatcherHostBrowserTest() : got_downloads_(false) {}
 
  protected:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     base::FilePath path = GetTestFilePath("", "");
     BrowserThread::PostTask(
         BrowserThread::IO,
@@ -52,7 +52,7 @@ class ResourceDispatcherHostBrowserTest : public ContentBrowserTest,
 
   virtual void OnDownloadCreated(
       DownloadManager* manager,
-      DownloadItem* item) OVERRIDE {
+      DownloadItem* item) override {
     if (!got_downloads_)
       got_downloads_ = !!manager->InProgressCount();
   }
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index d1431a4..6b3305a 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -78,8 +78,8 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   static ResourceDispatcherHostImpl* Get();
 
   // ResourceDispatcherHost implementation:
-  virtual void SetDelegate(ResourceDispatcherHostDelegate* delegate) OVERRIDE;
-  virtual void SetAllowCrossOriginAuthPrompt(bool value) OVERRIDE;
+  virtual void SetDelegate(ResourceDispatcherHostDelegate* delegate) override;
+  virtual void SetAllowCrossOriginAuthPrompt(bool value) override;
   virtual DownloadInterruptReason BeginDownload(
       scoped_ptr<net::URLRequest> request,
       const Referrer& referrer,
@@ -90,11 +90,11 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
       bool prefer_cache,
       scoped_ptr<DownloadSaveInfo> save_info,
       uint32 download_id,
-      const DownloadStartedCallback& started_callback) OVERRIDE;
-  virtual void ClearLoginDelegateForRequest(net::URLRequest* request) OVERRIDE;
-  virtual void BlockRequestsForRoute(int child_id, int route_id) OVERRIDE;
+      const DownloadStartedCallback& started_callback) override;
+  virtual void ClearLoginDelegateForRequest(net::URLRequest* request) override;
+  virtual void BlockRequestsForRoute(int child_id, int route_id) override;
   virtual void ResumeBlockedRequestsForRoute(
-      int child_id, int route_id) OVERRIDE;
+      int child_id, int route_id) override;
 
   // Puts the resource dispatcher host in an inactive state (unable to begin
   // new requests).  Cancels all pending requests.
@@ -291,14 +291,14 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   // ResourceLoaderDelegate implementation:
   virtual ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
       ResourceLoader* loader,
-      net::AuthChallengeInfo* auth_info) OVERRIDE;
+      net::AuthChallengeInfo* auth_info) override;
   virtual bool HandleExternalProtocol(ResourceLoader* loader,
-                                      const GURL& url) OVERRIDE;
-  virtual void DidStartRequest(ResourceLoader* loader) OVERRIDE;
+                                      const GURL& url) override;
+  virtual void DidStartRequest(ResourceLoader* loader) override;
   virtual void DidReceiveRedirect(ResourceLoader* loader,
-                                  const GURL& new_url) OVERRIDE;
-  virtual void DidReceiveResponse(ResourceLoader* loader) OVERRIDE;
-  virtual void DidFinishLoading(ResourceLoader* loader) OVERRIDE;
+                                  const GURL& new_url) override;
+  virtual void DidReceiveResponse(ResourceLoader* loader) override;
+  virtual void DidFinishLoading(ResourceLoader* loader) override;
 
   // An init helper that runs on the IO thread.
   void OnInit();
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index d985014..a78acea 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -223,7 +223,7 @@ class TestFilter : public ResourceMessageFilter {
   int received_after_canceled() const { return received_after_canceled_; }
 
   // ResourceMessageFilter override
-  virtual bool Send(IPC::Message* msg) OVERRIDE {
+  virtual bool Send(IPC::Message* msg) override {
     // No messages should be received when the process has been canceled.
     if (canceled_)
       received_after_canceled_++;
@@ -265,7 +265,7 @@ class ForwardingFilter : public TestFilter {
   }
 
   // TestFilter override
-  virtual bool Send(IPC::Message* msg) OVERRIDE {
+  virtual bool Send(IPC::Message* msg) override {
     return dest_->Send(msg);
   }
 
@@ -286,7 +286,7 @@ class URLRequestTestDelayedNetworkJob : public net::URLRequestTestJob {
       : net::URLRequestTestJob(request, network_delegate) {}
 
   // Only start if not deferred for network start.
-  virtual void Start() OVERRIDE {
+  virtual void Start() override {
     bool defer = false;
     NotifyBeforeNetworkStart(&defer);
     if (defer)
@@ -294,7 +294,7 @@ class URLRequestTestDelayedNetworkJob : public net::URLRequestTestJob {
     net::URLRequestTestJob::Start();
   }
 
-  virtual void ResumeNetworkStart() OVERRIDE {
+  virtual void ResumeNetworkStart() override {
     net::URLRequestTestJob::StartAsync();
   }
 
@@ -333,7 +333,7 @@ class URLRequestTestDelayedStartJob : public net::URLRequestTestJob {
   }
 
   // Do nothing until you're told to.
-  virtual void Start() OVERRIDE {}
+  virtual void Start() override {}
 
   // Finish starting a URL request whose job is an instance of
   // URLRequestTestDelayedStartJob.  It is illegal to call this routine
@@ -414,7 +414,7 @@ class URLRequestTestDelayedCompletionJob : public net::URLRequestTestJob {
   virtual ~URLRequestTestDelayedCompletionJob() {}
 
  private:
-  virtual bool NextReadAsync() OVERRIDE { return true; }
+  virtual bool NextReadAsync() override { return true; }
 };
 
 class URLRequestBigJob : public net::URLRequestSimpleJob {
@@ -427,7 +427,7 @@ class URLRequestBigJob : public net::URLRequestSimpleJob {
   virtual int GetData(std::string* mime_type,
                       std::string* charset,
                       std::string* data,
-                      const net::CompletionCallback& callback) const OVERRIDE {
+                      const net::CompletionCallback& callback) const override {
     *mime_type = "text/plain";
     *charset = "UTF-8";
 
@@ -494,17 +494,17 @@ class TestURLRequestJobFactory : public net::URLRequestJobFactory {
   virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
       const std::string& scheme,
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
+      net::NetworkDelegate* network_delegate) const override;
 
-  virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE {
+  virtual bool IsHandledProtocol(const std::string& scheme) const override {
     return supported_schemes_.count(scheme) > 0;
   }
 
-  virtual bool IsHandledURL(const GURL& url) const OVERRIDE {
+  virtual bool IsHandledURL(const GURL& url) const override {
     return supported_schemes_.count(url.scheme()) > 0;
   }
 
-  virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE {
+  virtual bool IsSafeRedirectTarget(const GURL& location) const override {
     return false;
   }
 
@@ -539,7 +539,7 @@ class TransfersAllNavigationsContentBrowserClient
  public:
   virtual bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context,
                                               const GURL& current_url,
-                                              const GURL& new_url) OVERRIDE {
+                                              const GURL& new_url) override {
     return true;
   }
 };
@@ -572,7 +572,7 @@ class GenericResourceThrottle : public ResourceThrottle {
   }
 
   // ResourceThrottle implementation:
-  virtual void WillStartRequest(bool* defer) OVERRIDE {
+  virtual void WillStartRequest(bool* defer) override {
     ASSERT_EQ(NULL, active_throttle_);
     if (flags_ & DEFER_STARTING_REQUEST) {
       active_throttle_ = this;
@@ -588,7 +588,7 @@ class GenericResourceThrottle : public ResourceThrottle {
     }
   }
 
-  virtual void WillProcessResponse(bool* defer) OVERRIDE {
+  virtual void WillProcessResponse(bool* defer) override {
     ASSERT_EQ(NULL, active_throttle_);
     if (flags_ & DEFER_PROCESSING_RESPONSE) {
       active_throttle_ = this;
@@ -596,7 +596,7 @@ class GenericResourceThrottle : public ResourceThrottle {
     }
   }
 
-  virtual void WillStartUsingNetwork(bool* defer) OVERRIDE {
+  virtual void WillStartUsingNetwork(bool* defer) override {
     ASSERT_EQ(NULL, active_throttle_);
 
     if (flags_ & DEFER_NETWORK_START) {
@@ -605,7 +605,7 @@ class GenericResourceThrottle : public ResourceThrottle {
     }
   }
 
-  virtual const char* GetNameForLogging() const OVERRIDE {
+  virtual const char* GetNameForLogging() const override {
     return "GenericResourceThrottle";
   }
 
@@ -662,7 +662,7 @@ class TestResourceDispatcherHostDelegate
       ResourceContext* resource_context,
       AppCacheService* appcache_service,
       ResourceType resource_type,
-      ScopedVector<ResourceThrottle>* throttles) OVERRIDE {
+      ScopedVector<ResourceThrottle>* throttles) override {
     if (user_data_) {
       const void* key = user_data_.get();
       request->SetUserData(key, user_data_.release());
@@ -729,7 +729,7 @@ class ResourceDispatcherHostTest : public testing::Test,
   }
 
   // IPC::Sender implementation
-  virtual bool Send(IPC::Message* msg) OVERRIDE {
+  virtual bool Send(IPC::Message* msg) override {
     accum_.AddMessage(*msg);
 
     if (send_data_received_acks_ &&
@@ -751,7 +751,7 @@ class ResourceDispatcherHostTest : public testing::Test,
   friend class TestURLRequestJobFactory;
 
   // testing::Test
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChildProcessSecurityPolicyImpl::GetInstance()->Add(0);
     HandleScheme("test");
   }
diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
index e8d3e57..9f24392 100644
--- a/content/browser/loader/resource_loader.h
+++ b/content/browser/loader/resource_loader.h
@@ -58,30 +58,30 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
   // net::URLRequest::Delegate implementation:
   virtual void OnReceivedRedirect(net::URLRequest* request,
                                   const net::RedirectInfo& redirect_info,
-                                  bool* defer) OVERRIDE;
+                                  bool* defer) override;
   virtual void OnAuthRequired(net::URLRequest* request,
-                              net::AuthChallengeInfo* info) OVERRIDE;
+                              net::AuthChallengeInfo* info) override;
   virtual void OnCertificateRequested(net::URLRequest* request,
-                                      net::SSLCertRequestInfo* info) OVERRIDE;
+                                      net::SSLCertRequestInfo* info) override;
   virtual void OnSSLCertificateError(net::URLRequest* request,
                                      const net::SSLInfo& info,
-                                     bool fatal) OVERRIDE;
+                                     bool fatal) override;
   virtual void OnBeforeNetworkStart(net::URLRequest* request,
-                                    bool* defer) OVERRIDE;
-  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+                                    bool* defer) override;
+  virtual void OnResponseStarted(net::URLRequest* request) override;
   virtual void OnReadCompleted(net::URLRequest* request,
-                               int bytes_read) OVERRIDE;
+                               int bytes_read) override;
 
   // SSLErrorHandler::Delegate implementation:
   virtual void CancelSSLRequest(int error,
-                                const net::SSLInfo* ssl_info) OVERRIDE;
-  virtual void ContinueSSLRequest() OVERRIDE;
+                                const net::SSLInfo* ssl_info) override;
+  virtual void ContinueSSLRequest() override;
 
   // ResourceController implementation:
-  virtual void Resume() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
-  virtual void CancelAndIgnore() OVERRIDE;
-  virtual void CancelWithError(int error_code) OVERRIDE;
+  virtual void Resume() override;
+  virtual void Cancel() override;
+  virtual void CancelAndIgnore() override;
+  virtual void CancelWithError(int error_code) override;
 
   void StartRequestInternal();
   void CancelRequestInternal(int error, bool from_renderer);
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 520d56e..2397e4b 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -64,7 +64,7 @@ class ClientCertStoreStub : public net::ClientCertStore {
   // net::ClientCertStore:
   virtual void GetClientCerts(const net::SSLCertRequestInfo& cert_request_info,
                               net::CertificateList* selected_certs,
-                              const base::Closure& callback) OVERRIDE {
+                              const base::Closure& callback) override {
     ++request_count_;
     requested_authorities_ = cert_request_info.cert_authorities;
     *selected_certs = response_;
@@ -127,39 +127,39 @@ class ResourceHandlerStub : public ResourceHandler {
   }
 
   // ResourceHandler implementation:
-  virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE {
+  virtual bool OnUploadProgress(uint64 position, uint64 size) override {
     NOTREACHED();
     return true;
   }
 
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
-                                   bool* defer) OVERRIDE {
+                                   bool* defer) override {
     NOTREACHED();
     return true;
   }
 
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE {
+                                 bool* defer) override {
     EXPECT_FALSE(response_.get());
     response_ = response;
     return true;
   }
 
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE {
+  virtual bool OnWillStart(const GURL& url, bool* defer) override {
     EXPECT_TRUE(start_url_.is_empty());
     start_url_ = url;
     *defer = defer_request_on_will_start_;
     return true;
   }
 
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE {
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override {
     return true;
   }
 
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE {
+                          int min_size) override {
     EXPECT_TRUE(expect_reads_);
     EXPECT_FALSE(received_on_will_read_);
     EXPECT_FALSE(received_eof_);
@@ -171,7 +171,7 @@ class ResourceHandlerStub : public ResourceHandler {
     return true;
   }
 
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE {
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override {
     EXPECT_TRUE(received_on_will_read_);
     EXPECT_TRUE(expect_reads_);
     EXPECT_FALSE(received_response_completed_);
@@ -192,7 +192,7 @@ class ResourceHandlerStub : public ResourceHandler {
 
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE {
+                                   bool* defer) override {
     EXPECT_FALSE(received_response_completed_);
     if (status.is_success() && expect_reads_)
       EXPECT_TRUE(received_eof_);
@@ -201,7 +201,7 @@ class ResourceHandlerStub : public ResourceHandler {
     status_ = status;
   }
 
-  virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE {
+  virtual void OnDataDownloaded(int bytes_downloaded) override {
     EXPECT_FALSE(expect_reads_);
     total_bytes_downloaded_ += bytes_downloaded;
   }
@@ -234,7 +234,7 @@ class SelectCertificateBrowserClient : public TestContentBrowserClient {
       int render_view_id,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
-      const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE {
+      const base::Callback<void(net::X509Certificate*)>& callback) override {
     ++call_count_;
     passed_certs_ = cert_request_info->client_certs;
   }
@@ -257,7 +257,7 @@ class ResourceContextStub : public MockResourceContext {
   explicit ResourceContextStub(net::URLRequestContext* test_request_context)
       : MockResourceContext(test_request_context) {}
 
-  virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE {
+  virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() override {
     return dummy_cert_store_.Pass();
   }
 
@@ -308,7 +308,7 @@ class ResourceLoaderTest : public testing::Test,
     return leaf_handler.PassAs<ResourceHandler>();
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     const int kRenderProcessId = 1;
     const int kRenderViewId = 2;
 
@@ -338,18 +338,18 @@ class ResourceLoaderTest : public testing::Test,
   // ResourceLoaderDelegate:
   virtual ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
       ResourceLoader* loader,
-      net::AuthChallengeInfo* auth_info) OVERRIDE {
+      net::AuthChallengeInfo* auth_info) override {
     return NULL;
   }
   virtual bool HandleExternalProtocol(ResourceLoader* loader,
-                                      const GURL& url) OVERRIDE {
+                                      const GURL& url) override {
     return false;
   }
-  virtual void DidStartRequest(ResourceLoader* loader) OVERRIDE {}
+  virtual void DidStartRequest(ResourceLoader* loader) override {}
   virtual void DidReceiveRedirect(ResourceLoader* loader,
-                                  const GURL& new_url) OVERRIDE {}
-  virtual void DidReceiveResponse(ResourceLoader* loader) OVERRIDE {}
-  virtual void DidFinishLoading(ResourceLoader* loader) OVERRIDE {}
+                                  const GURL& new_url) override {}
+  virtual void DidReceiveResponse(ResourceLoader* loader) override {}
+  virtual void DidFinishLoading(ResourceLoader* loader) override {}
 
   content::TestBrowserThreadBundle thread_bundle_;
 
@@ -501,7 +501,7 @@ class ResourceLoaderRedirectToFileTest : public ResourceLoaderTest {
 
   virtual scoped_ptr<ResourceHandler> WrapResourceHandler(
       scoped_ptr<ResourceHandlerStub> leaf_handler,
-      net::URLRequest* request) OVERRIDE {
+      net::URLRequest* request) override {
     leaf_handler->set_expect_reads(false);
 
     // Make a temporary file.
diff --git a/content/browser/loader/resource_message_filter.h b/content/browser/loader/resource_message_filter.h
index 15ed884..2273f9a 100644
--- a/content/browser/loader/resource_message_filter.h
+++ b/content/browser/loader/resource_message_filter.h
@@ -51,8 +51,8 @@ class CONTENT_EXPORT ResourceMessageFilter : public BrowserMessageFilter {
                         const GetContextsCallback& get_contexts_callback);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelClosing() override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   void GetContexts(const ResourceHostMsg_Request& request,
                    ResourceContext** resource_context,
diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h
index 23279c8..27f8cbc 100644
--- a/content/browser/loader/resource_request_info_impl.h
+++ b/content/browser/loader/resource_request_info_impl.h
@@ -65,26 +65,26 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
   virtual ~ResourceRequestInfoImpl();
 
   // ResourceRequestInfo implementation:
-  virtual ResourceContext* GetContext() const OVERRIDE;
-  virtual int GetChildID() const OVERRIDE;
-  virtual int GetRouteID() const OVERRIDE;
-  virtual int GetOriginPID() const OVERRIDE;
-  virtual int GetRequestID() const OVERRIDE;
-  virtual int GetRenderFrameID() const OVERRIDE;
-  virtual bool IsMainFrame() const OVERRIDE;
-  virtual bool ParentIsMainFrame() const OVERRIDE;
-  virtual int GetParentRenderFrameID() const OVERRIDE;
-  virtual ResourceType GetResourceType() const OVERRIDE;
-  virtual int GetProcessType() const OVERRIDE;
-  virtual blink::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE;
-  virtual blink::WebPageVisibilityState GetVisibilityState() const OVERRIDE;
-  virtual ui::PageTransition GetPageTransition() const OVERRIDE;
-  virtual bool HasUserGesture() const OVERRIDE;
-  virtual bool WasIgnoredByHandler() const OVERRIDE;
+  virtual ResourceContext* GetContext() const override;
+  virtual int GetChildID() const override;
+  virtual int GetRouteID() const override;
+  virtual int GetOriginPID() const override;
+  virtual int GetRequestID() const override;
+  virtual int GetRenderFrameID() const override;
+  virtual bool IsMainFrame() const override;
+  virtual bool ParentIsMainFrame() const override;
+  virtual int GetParentRenderFrameID() const override;
+  virtual ResourceType GetResourceType() const override;
+  virtual int GetProcessType() const override;
+  virtual blink::WebReferrerPolicy GetReferrerPolicy() const override;
+  virtual blink::WebPageVisibilityState GetVisibilityState() const override;
+  virtual ui::PageTransition GetPageTransition() const override;
+  virtual bool HasUserGesture() const override;
+  virtual bool WasIgnoredByHandler() const override;
   virtual bool GetAssociatedRenderFrame(int* render_process_id,
-                                        int* render_frame_id) const OVERRIDE;
-  virtual bool IsAsync() const OVERRIDE;
-  virtual bool IsDownload() const OVERRIDE;
+                                        int* render_frame_id) const override;
+  virtual bool IsAsync() const override;
+  virtual bool IsDownload() const override;
 
 
   CONTENT_EXPORT void AssociateWithRequest(net::URLRequest* request);
diff --git a/content/browser/loader/resource_scheduler.cc b/content/browser/loader/resource_scheduler.cc
index 0dd93f3..ad44d7f 100644
--- a/content/browser/loader/resource_scheduler.cc
+++ b/content/browser/loader/resource_scheduler.cc
@@ -168,7 +168,7 @@ class ResourceScheduler::ScheduledResourceRequest
 
  private:
   // ResourceMessageDelegate interface:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(ScheduledResourceRequest, message)
       IPC_MESSAGE_HANDLER(ResourceHostMsg_DidChangePriority, DidChangePriority)
@@ -178,11 +178,11 @@ class ResourceScheduler::ScheduledResourceRequest
   }
 
   // ResourceThrottle interface:
-  virtual void WillStartRequest(bool* defer) OVERRIDE {
+  virtual void WillStartRequest(bool* defer) override {
     deferred_ = *defer = !ready_;
   }
 
-  virtual const char* GetNameForLogging() const OVERRIDE {
+  virtual const char* GetNameForLogging() const override {
     return "ResourceScheduler";
   }
 
diff --git a/content/browser/loader/resource_scheduler_filter.h b/content/browser/loader/resource_scheduler_filter.h
index 9f4c5f3..f07b443 100644
--- a/content/browser/loader/resource_scheduler_filter.h
+++ b/content/browser/loader/resource_scheduler_filter.h
@@ -19,7 +19,7 @@ class ResourceSchedulerFilter : public BrowserMessageFilter {
   explicit ResourceSchedulerFilter(int child_id);
 
   // BrowserMessageFilter methods:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   virtual ~ResourceSchedulerFilter();
diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc
index a7baed1..1dd99f1 100644
--- a/content/browser/loader/resource_scheduler_unittest.cc
+++ b/content/browser/loader/resource_scheduler_unittest.cc
@@ -65,7 +65,7 @@ class TestRequest : public ResourceController {
     started_ = !deferred;
   }
 
-  virtual void Cancel() OVERRIDE {
+  virtual void Cancel() override {
     // Alert the scheduler that the request can be deleted.
     throttle_.reset(0);
   }
@@ -74,9 +74,9 @@ class TestRequest : public ResourceController {
 
  protected:
   // ResourceController interface:
-  virtual void CancelAndIgnore() OVERRIDE {}
-  virtual void CancelWithError(int error_code) OVERRIDE {}
-  virtual void Resume() OVERRIDE { started_ = true; }
+  virtual void CancelAndIgnore() override {}
+  virtual void CancelWithError(int error_code) override {}
+  virtual void Resume() override { started_ = true; }
 
  private:
   bool started_;
@@ -95,7 +95,7 @@ class CancelingTestRequest : public TestRequest {
   }
 
  private:
-  virtual void Resume() OVERRIDE {
+  virtual void Resume() override {
     TestRequest::Resume();
     request_to_cancel_.reset();
   }
@@ -105,8 +105,8 @@ class CancelingTestRequest : public TestRequest {
 
 class FakeResourceContext : public ResourceContext {
  private:
-  virtual net::HostResolver* GetHostResolver() OVERRIDE { return NULL; }
-  virtual net::URLRequestContext* GetRequestContext() OVERRIDE { return NULL; }
+  virtual net::HostResolver* GetHostResolver() override { return NULL; }
+  virtual net::URLRequestContext* GetRequestContext() override { return NULL; }
 };
 
 class FakeResourceMessageFilter : public ResourceMessageFilter {
diff --git a/content/browser/loader/stream_resource_handler.h b/content/browser/loader/stream_resource_handler.h
index 75a987d..a850d7a 100644
--- a/content/browser/loader/stream_resource_handler.h
+++ b/content/browser/loader/stream_resource_handler.h
@@ -31,39 +31,39 @@ class StreamResourceHandler : public StreamWriteObserver,
                         const GURL& origin);
   virtual ~StreamResourceHandler();
 
-  virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
+  virtual bool OnUploadProgress(uint64 position, uint64 size) override;
 
   // Not needed, as this event handler ought to be the final resource.
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* resp,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
 
   virtual bool OnResponseStarted(ResourceResponse* resp,
-                                 bool* defer) OVERRIDE;
+                                 bool* defer) override;
 
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
 
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE;
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
 
   // Create a new buffer to store received data.
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
+                          int min_size) override;
 
   // A read was completed, forward the data to the Stream.
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE;
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
 
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& sec_info,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
 
-  virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE;
+  virtual void OnDataDownloaded(int bytes_downloaded) override;
 
   Stream* stream() { return stream_.get(); }
 
  private:
-  virtual void OnSpaceAvailable(Stream* stream) OVERRIDE;
-  virtual void OnClose(Stream* stream) OVERRIDE;
+  virtual void OnSpaceAvailable(Stream* stream) override;
+  virtual void OnClose(Stream* stream) override;
 
   scoped_refptr<Stream> stream_;
   scoped_refptr<net::IOBuffer> read_buffer_;
diff --git a/content/browser/loader/sync_resource_handler.h b/content/browser/loader/sync_resource_handler.h
index bc26e4b..8828b80 100644
--- a/content/browser/loader/sync_resource_handler.h
+++ b/content/browser/loader/sync_resource_handler.h
@@ -33,22 +33,22 @@ class SyncResourceHandler : public ResourceHandler {
                       ResourceDispatcherHostImpl* resource_dispatcher_host);
   virtual ~SyncResourceHandler();
 
-  virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
+  virtual bool OnUploadProgress(uint64 position, uint64 size) override;
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE;
+                                 bool* defer) override;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
-                          int min_size) OVERRIDE;
-  virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE;
+                          int min_size) override;
+  virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& security_info,
-                                   bool* defer) OVERRIDE;
-  virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE;
+                                   bool* defer) override;
+  virtual void OnDataDownloaded(int bytes_downloaded) override;
 
  private:
   enum { kReadBufSize = 3840 };
diff --git a/content/browser/loader/throttling_resource_handler.h b/content/browser/loader/throttling_resource_handler.h
index 4e1b814..08e3580 100644
--- a/content/browser/loader/throttling_resource_handler.h
+++ b/content/browser/loader/throttling_resource_handler.h
@@ -34,17 +34,17 @@ class ThrottlingResourceHandler : public LayeredResourceHandler,
   // LayeredResourceHandler overrides:
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* response,
-                                   bool* defer) OVERRIDE;
+                                   bool* defer) override;
   virtual bool OnResponseStarted(ResourceResponse* response,
-                                 bool* defer) OVERRIDE;
-  virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE;
-  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE;
+                                 bool* defer) override;
+  virtual bool OnWillStart(const GURL& url, bool* defer) override;
+  virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
 
   // ResourceController implementation:
-  virtual void Cancel() OVERRIDE;
-  virtual void CancelAndIgnore() OVERRIDE;
-  virtual void CancelWithError(int error_code) OVERRIDE;
-  virtual void Resume() OVERRIDE;
+  virtual void Cancel() override;
+  virtual void CancelAndIgnore() override;
+  virtual void CancelWithError(int error_code) override;
+  virtual void Resume() override;
 
  private:
   void ResumeStart();