replace OVERRIDE and FINAL with override and final in android_webview/

BUG=417463

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

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

63 files changed, 370 insertions, 370 deletions

diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h
index b099e21..d6c1b37 100644
--- a/android_webview/browser/aw_browser_context.h
+++ b/android_webview/browser/aw_browser_context.h
@@ -92,28 +92,28 @@ class AwBrowserContext : public content::BrowserContext,
   void CreateUserPrefServiceIfNecessary();
 
   // content::BrowserContext implementation.
-  virtual base::FilePath GetPath() const OVERRIDE;
-  virtual bool IsOffTheRecord() const OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+  virtual base::FilePath GetPath() const override;
+  virtual bool IsOffTheRecord() const override;
+  virtual net::URLRequestContextGetter* GetRequestContext() override;
   virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
-  virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
+      int renderer_child_id) override;
+  virtual net::URLRequestContextGetter* GetMediaRequestContext() override;
   virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
+      int renderer_child_id) override;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
-          const base::FilePath& partition_path, bool in_memory) OVERRIDE;
-  virtual content::ResourceContext* GetResourceContext() OVERRIDE;
+          const base::FilePath& partition_path, bool in_memory) override;
+  virtual content::ResourceContext* GetResourceContext() override;
   virtual content::DownloadManagerDelegate*
-      GetDownloadManagerDelegate() OVERRIDE;
-  virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE;
-  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
-  virtual content::PushMessagingService* GetPushMessagingService() OVERRIDE;
-  virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE;
+      GetDownloadManagerDelegate() override;
+  virtual content::BrowserPluginGuestManager* GetGuestManager() override;
+  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
+  virtual content::PushMessagingService* GetPushMessagingService() override;
+  virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
 
   // visitedlink::VisitedLinkDelegate implementation.
   virtual void RebuildTable(
-      const scoped_refptr<URLEnumerator>& enumerator) OVERRIDE;
+      const scoped_refptr<URLEnumerator>& enumerator) override;
 
  private:
   static bool data_reduction_proxy_enabled_;
diff --git a/android_webview/browser/aw_browser_main_parts.h b/android_webview/browser/aw_browser_main_parts.h
index 8beec92..62a3505 100644
--- a/android_webview/browser/aw_browser_main_parts.h
+++ b/android_webview/browser/aw_browser_main_parts.h
@@ -23,10 +23,10 @@ class AwBrowserMainParts : public content::BrowserMainParts {
   virtual ~AwBrowserMainParts();
 
   // Overriding methods from content::BrowserMainParts.
-  virtual void PreEarlyInitialization() OVERRIDE;
-  virtual int PreCreateThreads() OVERRIDE;
-  virtual void PreMainMessageLoopRun() OVERRIDE;
-  virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
+  virtual void PreEarlyInitialization() override;
+  virtual int PreCreateThreads() override;
+  virtual void PreMainMessageLoopRun() override;
+  virtual bool MainMessageLoopRun(int* result_code) override;
 
  private:
   // Android specific UI MessageLoop.
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 268d4e63..35c2ce0 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -54,9 +54,9 @@ public:
   // BrowserMessageFilter methods.
   virtual void OverrideThreadForMessage(
       const IPC::Message& message,
-      BrowserThread::ID* thread) OVERRIDE;
+      BrowserThread::ID* thread) override;
   virtual bool OnMessageReceived(
-      const IPC::Message& message) OVERRIDE;
+      const IPC::Message& message) override;
 
   void OnShouldOverrideUrlLoading(int routing_id,
                                   const base::string16& url,
@@ -125,14 +125,14 @@ class AwAccessTokenStore : public content::AccessTokenStore {
 
   // content::AccessTokenStore implementation
   virtual void LoadAccessTokens(
-      const LoadAccessTokensCallbackType& request) OVERRIDE {
+      const LoadAccessTokensCallbackType& request) override {
     AccessTokenStore::AccessTokenSet access_token_set;
     // AccessTokenSet and net::URLRequestContextGetter not used on Android,
     // but Run needs to be called to finish the geolocation setup.
     request.Run(access_token_set, NULL);
   }
   virtual void SaveAccessToken(const GURL& server_url,
-                               const base::string16& access_token) OVERRIDE { }
+                               const base::string16& access_token) override { }
 
  private:
   virtual ~AwAccessTokenStore() { }
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index 738d8d5..dd6c214 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -32,65 +32,65 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
                               const void* cert_data,
                               size_t cert_size,
                               int render_process_id,
-                              int render_frame_id) OVERRIDE;
+                              int render_frame_id) override;
   virtual content::BrowserMainParts* CreateBrowserMainParts(
-      const content::MainFunctionParams& parameters) OVERRIDE;
+      const content::MainFunctionParams& parameters) override;
   virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
   virtual void RenderProcessWillLaunch(
-      content::RenderProcessHost* host) OVERRIDE;
+      content::RenderProcessHost* host) override;
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::BrowserContext* browser_context,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       content::BrowserContext* browser_context,
       const base::FilePath& partition_path,
       bool in_memory,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
   virtual std::string GetCanonicalEncodingNameByAliasName(
-      const std::string& alias_name) OVERRIDE;
+      const std::string& alias_name) override;
   virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
-                                              int child_process_id) OVERRIDE;
-  virtual std::string GetApplicationLocale() OVERRIDE;
-  virtual std::string GetAcceptLangs(content::BrowserContext* context) OVERRIDE;
-  virtual const gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
+                                              int child_process_id) override;
+  virtual std::string GetApplicationLocale() override;
+  virtual std::string GetAcceptLangs(content::BrowserContext* context) override;
+  virtual const gfx::ImageSkia* GetDefaultFavicon() override;
   virtual bool AllowAppCache(const GURL& manifest_url,
                              const GURL& first_party,
-                             content::ResourceContext* context) OVERRIDE;
+                             content::ResourceContext* context) override;
   virtual bool AllowGetCookie(const GURL& url,
                               const GURL& first_party,
                               const net::CookieList& cookie_list,
                               content::ResourceContext* context,
                               int render_process_id,
-                              int render_frame_id) OVERRIDE;
+                              int render_frame_id) override;
   virtual bool AllowSetCookie(const GURL& url,
                               const GURL& first_party,
                               const std::string& cookie_line,
                               content::ResourceContext* context,
                               int render_process_id,
                               int render_frame_id,
-                              net::CookieOptions* options) OVERRIDE;
+                              net::CookieOptions* options) override;
   virtual bool AllowWorkerDatabase(
       const GURL& url,
       const base::string16& name,
       const base::string16& display_name,
       unsigned long estimated_size,
       content::ResourceContext* context,
-      const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
+      const std::vector<std::pair<int, int> >& render_frames) override;
   virtual void AllowWorkerFileSystem(
       const GURL& url,
       content::ResourceContext* context,
       const std::vector<std::pair<int, int> >& render_frames,
-      base::Callback<void(bool)> callback) OVERRIDE;
+      base::Callback<void(bool)> callback) override;
   virtual bool AllowWorkerIndexedDB(
       const GURL& url,
       const base::string16& name,
       content::ResourceContext* context,
-      const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
+      const std::vector<std::pair<int, int> >& render_frames) override;
   virtual content::QuotaPermissionContext*
-      CreateQuotaPermissionContext() OVERRIDE;
+      CreateQuotaPermissionContext() override;
   virtual void AllowCertificateError(
       int render_process_id,
       int render_frame_id,
@@ -102,45 +102,45 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       bool strict_enforcement,
       bool expired_previous_decision,
       const base::Callback<void(bool)>& callback,
-      content::CertificateRequestResultType* result) OVERRIDE;
+      content::CertificateRequestResultType* result) override;
   virtual void SelectClientCertificate(
       int render_process_id,
       int render_frame_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;
   virtual blink::WebNotificationPermission
       CheckDesktopNotificationPermission(
           const GURL& source_url,
           content::ResourceContext* context,
-          int render_process_id) OVERRIDE;
+          int render_process_id) override;
   virtual void ShowDesktopNotification(
       const content::ShowDesktopNotificationHostMsgParams& params,
       content::RenderFrameHost* render_frame_host,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
-      base::Closure* cancel_callback) OVERRIDE;
+      base::Closure* cancel_callback) override;
   virtual void RequestGeolocationPermission(
       content::WebContents* web_contents,
       int bridge_id,
       const GURL& requesting_frame,
       bool user_gesture,
-      const base::Callback<void(bool)>& result_callback) OVERRIDE;
+      const base::Callback<void(bool)>& result_callback) override;
   virtual void CancelGeolocationPermissionRequest(
       content::WebContents* web_contents,
       int bridge_id,
-      const GURL& requesting_frame) OVERRIDE;
+      const GURL& requesting_frame) override;
   virtual void RequestMidiSysExPermission(
       content::WebContents* web_contents,
       int bridge_id,
       const GURL& requesting_frame,
       bool user_gesture,
       base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback) OVERRIDE;
+      base::Closure* cancel_callback) override;
   virtual void RequestProtectedMediaIdentifierPermission(
     content::WebContents* web_contents,
     const GURL& origin,
     base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) OVERRIDE;
+    base::Closure* cancel_callback) override;
   virtual bool CanCreateWindow(const GURL& opener_url,
                                const GURL& opener_top_level_frame_url,
                                const GURL& source_origin,
@@ -154,32 +154,32 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
                                content::ResourceContext* context,
                                int render_process_id,
                                int opener_id,
-                               bool* no_javascript_access) OVERRIDE;
-  virtual void ResourceDispatcherHostCreated() OVERRIDE;
-  virtual net::NetLog* GetNetLog() OVERRIDE;
-  virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
-  virtual bool IsFastShutdownPossible() OVERRIDE;
-  virtual void ClearCache(content::RenderViewHost* rvh) OVERRIDE;
-  virtual void ClearCookies(content::RenderViewHost* rvh) OVERRIDE;
-  virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE;
-  virtual std::string GetDefaultDownloadName() OVERRIDE;
+                               bool* no_javascript_access) override;
+  virtual void ResourceDispatcherHostCreated() override;
+  virtual net::NetLog* GetNetLog() override;
+  virtual content::AccessTokenStore* CreateAccessTokenStore() override;
+  virtual bool IsFastShutdownPossible() override;
+  virtual void ClearCache(content::RenderViewHost* rvh) override;
+  virtual void ClearCookies(content::RenderViewHost* rvh) override;
+  virtual base::FilePath GetDefaultDownloadDirectory() override;
+  virtual std::string GetDefaultDownloadName() override;
   virtual void DidCreatePpapiPlugin(
-      content::BrowserPpapiHost* browser_host) OVERRIDE;
+      content::BrowserPpapiHost* browser_host) override;
   virtual bool AllowPepperSocketAPI(
       content::BrowserContext* browser_context,
       const GURL& url,
       bool private_api,
-      const content::SocketPermissionRequest* params) OVERRIDE;
+      const content::SocketPermissionRequest* params) override;
   virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh,
                                    const GURL& url,
-                                   content::WebPreferences* web_prefs) OVERRIDE;
+                                   content::WebPreferences* web_prefs) override;
 #if defined(VIDEO_HOLE)
   virtual content::ExternalVideoSurfaceContainer*
       OverrideCreateExternalVideoSurfaceContainer(
-          content::WebContents* web_contents) OVERRIDE;
+          content::WebContents* web_contents) override;
 #endif
   virtual content::DevToolsManagerDelegate*
-      GetDevToolsManagerDelegate() OVERRIDE;
+      GetDevToolsManagerDelegate() override;
 
  private:
   // Android WebView currently has a single global (non-off-the-record) browser
diff --git a/android_webview/browser/aw_dev_tools_manager_delegate.cc b/android_webview/browser/aw_dev_tools_manager_delegate.cc
index 6e9f0ce..8cc3ce8 100644
--- a/android_webview/browser/aw_dev_tools_manager_delegate.cc
+++ b/android_webview/browser/aw_dev_tools_manager_delegate.cc
@@ -30,9 +30,9 @@ class Target : public content::DevToolsTarget {
  public:
   explicit Target(scoped_refptr<DevToolsAgentHost> agent_host);
 
-  virtual std::string GetId() const OVERRIDE { return agent_host_->GetId(); }
-  virtual std::string GetParentId() const OVERRIDE { return std::string(); }
-  virtual std::string GetType() const OVERRIDE {
+  virtual std::string GetId() const override { return agent_host_->GetId(); }
+  virtual std::string GetParentId() const override { return std::string(); }
+  virtual std::string GetType() const override {
     switch (agent_host_->GetType()) {
       case DevToolsAgentHost::TYPE_WEB_CONTENTS:
         return kTargetTypePage;
@@ -43,23 +43,23 @@ class Target : public content::DevToolsTarget {
     }
     return kTargetTypeOther;
   }
-  virtual std::string GetTitle() const OVERRIDE {
+  virtual std::string GetTitle() const override {
     return agent_host_->GetTitle();
   }
-  virtual std::string GetDescription() const OVERRIDE { return description_; }
-  virtual GURL GetURL() const OVERRIDE { return agent_host_->GetURL(); }
-  virtual GURL GetFaviconURL() const OVERRIDE { return GURL(); }
-  virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
+  virtual std::string GetDescription() const override { return description_; }
+  virtual GURL GetURL() const override { return agent_host_->GetURL(); }
+  virtual GURL GetFaviconURL() const override { return GURL(); }
+  virtual base::TimeTicks GetLastActivityTime() const override {
     return last_activity_time_;
   }
-  virtual bool IsAttached() const OVERRIDE {
+  virtual bool IsAttached() const override {
     return agent_host_->IsAttached();
   }
-  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
+  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
     return agent_host_;
   }
-  virtual bool Activate() const OVERRIDE { return agent_host_->Activate(); }
-  virtual bool Close() const OVERRIDE { return agent_host_->Close(); }
+  virtual bool Activate() const override { return agent_host_->Activate(); }
+  virtual bool Close() const override { return agent_host_->Close(); }
 
  private:
   scoped_refptr<DevToolsAgentHost> agent_host_;
diff --git a/android_webview/browser/aw_dev_tools_manager_delegate.h b/android_webview/browser/aw_dev_tools_manager_delegate.h
index 44fc27e..ea72c6f 100644
--- a/android_webview/browser/aw_dev_tools_manager_delegate.h
+++ b/android_webview/browser/aw_dev_tools_manager_delegate.h
@@ -18,17 +18,17 @@ class AwDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
   // content::DevToolsManagerDelegate implementation.
   virtual void Inspect(
       content::BrowserContext* browser_context,
-      content::DevToolsAgentHost* agent_host) OVERRIDE {}
+      content::DevToolsAgentHost* agent_host) override {}
   virtual void DevToolsAgentStateChanged(
       content::DevToolsAgentHost* agent_host,
-      bool attached) OVERRIDE {}
+      bool attached) override {}
   virtual base::DictionaryValue* HandleCommand(
       content::DevToolsAgentHost* agent_host,
-      base::DictionaryValue* command_dict) OVERRIDE;
+      base::DictionaryValue* command_dict) override;
   virtual scoped_ptr<content::DevToolsTarget> CreateNewTarget(
-      const GURL& url) OVERRIDE;
-  virtual void EnumerateTargets(TargetCallback callback) OVERRIDE;
-  virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE;
+      const GURL& url) override;
+  virtual void EnumerateTargets(TargetCallback callback) override;
+  virtual std::string GetPageThumbnailData(const GURL& url) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AwDevToolsManagerDelegate);
diff --git a/android_webview/browser/aw_download_manager_delegate.h b/android_webview/browser/aw_download_manager_delegate.h
index 890308f..6aed565 100644
--- a/android_webview/browser/aw_download_manager_delegate.h
+++ b/android_webview/browser/aw_download_manager_delegate.h
@@ -18,14 +18,14 @@ class AwDownloadManagerDelegate : public content::DownloadManagerDelegate {
   // content::DownloadManagerDelegate implementation.
   virtual bool DetermineDownloadTarget(
       content::DownloadItem* item,
-      const content::DownloadTargetCallback& callback) OVERRIDE;
+      const content::DownloadTargetCallback& callback) override;
   virtual bool ShouldCompleteDownload(
       content::DownloadItem* item,
-      const base::Closure& complete_callback) OVERRIDE;
+      const base::Closure& complete_callback) override;
   virtual bool ShouldOpenDownload(
       content::DownloadItem* item,
-      const content::DownloadOpenDelayedCallback& callback) OVERRIDE;
-  virtual void GetNextId(const content::DownloadIdCallback& callback) OVERRIDE;
+      const content::DownloadOpenDelayedCallback& callback) override;
+  virtual void GetNextId(const content::DownloadIdCallback& callback) override;
 };
 
 }  // namespace android_webview
diff --git a/android_webview/browser/aw_form_database_service.h b/android_webview/browser/aw_form_database_service.h
index d0b7b48..5a58953 100644
--- a/android_webview/browser/aw_form_database_service.h
+++ b/android_webview/browser/aw_form_database_service.h
@@ -42,7 +42,7 @@ class AwFormDatabaseService : public WebDataServiceConsumer {
   // WebDataServiceConsumer implementation.
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle h,
-      const WDTypedResult* result) OVERRIDE;
+      const WDTypedResult* result) override;
 
  private:
   struct PendingQuery {
diff --git a/android_webview/browser/aw_gl_surface.h b/android_webview/browser/aw_gl_surface.h
index 99b8a1d..9e48133 100644
--- a/android_webview/browser/aw_gl_surface.h
+++ b/android_webview/browser/aw_gl_surface.h
@@ -17,13 +17,13 @@ class GL_EXPORT AwGLSurface : public gfx::GLSurface {
   AwGLSurface();
 
   // Implement GLSurface.
-  virtual void Destroy() OVERRIDE;
-  virtual bool IsOffscreen() OVERRIDE;
-  virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
-  virtual bool SwapBuffers() OVERRIDE;
-  virtual gfx::Size GetSize() OVERRIDE;
-  virtual void* GetHandle() OVERRIDE;
-  virtual void* GetDisplay() OVERRIDE;
+  virtual void Destroy() override;
+  virtual bool IsOffscreen() override;
+  virtual unsigned int GetBackingFrameBufferObject() override;
+  virtual bool SwapBuffers() override;
+  virtual gfx::Size GetSize() override;
+  virtual void* GetHandle() override;
+  virtual void* GetDisplay() override;
 
   void SetBackingFrameBufferObject(unsigned int fbo);
   void ResetBackingFrameBufferObject();
diff --git a/android_webview/browser/aw_javascript_dialog_manager.h b/android_webview/browser/aw_javascript_dialog_manager.h
index e43932d..edd6d38 100644
--- a/android_webview/browser/aw_javascript_dialog_manager.h
+++ b/android_webview/browser/aw_javascript_dialog_manager.h
@@ -23,16 +23,16 @@ class AwJavaScriptDialogManager : public content::JavaScriptDialogManager {
       const base::string16& message_text,
       const base::string16& default_prompt_text,
       const DialogClosedCallback& callback,
-      bool* did_suppress_message) OVERRIDE;
+      bool* did_suppress_message) override;
   virtual void RunBeforeUnloadDialog(
       content::WebContents* web_contents,
       const base::string16& message_text,
       bool is_reload,
-      const DialogClosedCallback& callback) OVERRIDE;
+      const DialogClosedCallback& callback) override;
   virtual void CancelActiveAndPendingDialogs(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
   virtual void WebContentsDestroyed(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AwJavaScriptDialogManager);
diff --git a/android_webview/browser/aw_login_delegate.h b/android_webview/browser/aw_login_delegate.h
index 7d13400..bb0fe44 100644
--- a/android_webview/browser/aw_login_delegate.h
+++ b/android_webview/browser/aw_login_delegate.h
@@ -29,7 +29,7 @@ class AwLoginDelegate :
   virtual void Cancel();
 
   // from ResourceDispatcherHostLoginDelegate
-  virtual void OnRequestCancelled() OVERRIDE;
+  virtual void OnRequestCancelled() override;
 
  private:
   virtual ~AwLoginDelegate();
diff --git a/android_webview/browser/aw_pref_store.h b/android_webview/browser/aw_pref_store.h
index 1504d93..dec25b5 100644
--- a/android_webview/browser/aw_pref_store.h
+++ b/android_webview/browser/aw_pref_store.h
@@ -23,25 +23,25 @@ class AwPrefStore : public PersistentPrefStore {
 
   // Overriden from PrefStore.
   virtual bool GetValue(const std::string& key,
-                        const base::Value** result) const OVERRIDE;
-  virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE;
-  virtual bool HasObservers() const OVERRIDE;
-  virtual bool IsInitializationComplete() const OVERRIDE;
+                        const base::Value** result) const override;
+  virtual void AddObserver(PrefStore::Observer* observer) override;
+  virtual void RemoveObserver(PrefStore::Observer* observer) override;
+  virtual bool HasObservers() const override;
+  virtual bool IsInitializationComplete() const override;
 
   // PersistentPrefStore overrides:
   virtual bool GetMutableValue(const std::string& key,
-                               base::Value** result) OVERRIDE;
-  virtual void ReportValueChanged(const std::string& key) OVERRIDE;
-  virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE;
+                               base::Value** result) override;
+  virtual void ReportValueChanged(const std::string& key) override;
+  virtual void SetValue(const std::string& key, base::Value* value) override;
   virtual void SetValueSilently(const std::string& key,
-                                base::Value* value) OVERRIDE;
-  virtual void RemoveValue(const std::string& key) OVERRIDE;
-  virtual bool ReadOnly() const OVERRIDE;
-  virtual PrefReadError GetReadError() const OVERRIDE;
-  virtual PersistentPrefStore::PrefReadError ReadPrefs() OVERRIDE;
-  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
-  virtual void CommitPendingWrite() OVERRIDE {}
+                                base::Value* value) override;
+  virtual void RemoveValue(const std::string& key) override;
+  virtual bool ReadOnly() const override;
+  virtual PrefReadError GetReadError() const override;
+  virtual PersistentPrefStore::PrefReadError ReadPrefs() override;
+  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override;
+  virtual void CommitPendingWrite() override {}
 
  protected:
   virtual ~AwPrefStore();
diff --git a/android_webview/browser/aw_quota_permission_context.h b/android_webview/browser/aw_quota_permission_context.h
index 8d90aa5..a42f00b 100644
--- a/android_webview/browser/aw_quota_permission_context.h
+++ b/android_webview/browser/aw_quota_permission_context.h
@@ -17,7 +17,7 @@ class AwQuotaPermissionContext : public content::QuotaPermissionContext {
   virtual void RequestQuotaPermission(
       const content::StorageQuotaParams& params,
       int render_process_id,
-      const PermissionCallback& callback) OVERRIDE;
+      const PermissionCallback& callback) override;
 
  private:
   virtual ~AwQuotaPermissionContext();
diff --git a/android_webview/browser/aw_request_interceptor.h b/android_webview/browser/aw_request_interceptor.h
index 813abbe..d66f1b6 100644
--- a/android_webview/browser/aw_request_interceptor.h
+++ b/android_webview/browser/aw_request_interceptor.h
@@ -32,7 +32,7 @@ class AwRequestInterceptor : public net::URLRequestInterceptor {
   // net::URLRequestInterceptor override --------------------------------------
   virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
+      net::NetworkDelegate* network_delegate) const override;
 
  private:
   scoped_ptr<AwWebResourceResponse> QueryForAwWebResourceResponse(
diff --git a/android_webview/browser/aw_resource_context.h b/android_webview/browser/aw_resource_context.h
index baf52b9..87396df 100644
--- a/android_webview/browser/aw_resource_context.h
+++ b/android_webview/browser/aw_resource_context.h
@@ -26,8 +26,8 @@ class AwResourceContext : public content::ResourceContext {
   std::string GetExtraHeaders(const GURL& url);
 
   // content::ResourceContext implementation.
-  virtual net::HostResolver* GetHostResolver() OVERRIDE;
-  virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
+  virtual net::HostResolver* GetHostResolver() override;
+  virtual net::URLRequestContext* GetRequestContext() override;
 
  private:
   net::URLRequestContextGetter* getter_;
diff --git a/android_webview/browser/aw_web_resource_response.cc b/android_webview/browser/aw_web_resource_response.cc
index 412d9c2..6e93475 100644
--- a/android_webview/browser/aw_web_resource_response.cc
+++ b/android_webview/browser/aw_web_resource_response.cc
@@ -23,32 +23,32 @@ class StreamReaderJobDelegateImpl
   }
 
   virtual scoped_ptr<InputStream> OpenInputStream(JNIEnv* env,
-                                                  const GURL& url) OVERRIDE {
+                                                  const GURL& url) override {
     return aw_web_resource_response_->GetInputStream(env).Pass();
   }
 
   virtual void OnInputStreamOpenFailed(net::URLRequest* request,
-                                       bool* restart) OVERRIDE {
+                                       bool* restart) override {
     *restart = false;
   }
 
   virtual bool GetMimeType(JNIEnv* env,
                            net::URLRequest* request,
                            android_webview::InputStream* stream,
-                           std::string* mime_type) OVERRIDE {
+                           std::string* mime_type) override {
     return aw_web_resource_response_->GetMimeType(env, mime_type);
   }
 
   virtual bool GetCharset(JNIEnv* env,
                           net::URLRequest* request,
                           android_webview::InputStream* stream,
-                          std::string* charset) OVERRIDE {
+                          std::string* charset) override {
     return aw_web_resource_response_->GetCharset(env, charset);
   }
 
   virtual void AppendResponseHeaders(
       JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
+      net::HttpResponseHeaders* headers) override {
     int status_code;
     std::string reason_phrase;
     if (aw_web_resource_response_->GetStatusInfo(
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index 73dbad8..8f21b16 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -60,7 +60,7 @@ class TracedValue : public base::debug::ConvertableToTraceFormat {
     return scoped_refptr<base::debug::ConvertableToTraceFormat>(
         new TracedValue(value));
   }
-  virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE {
+  virtual void AppendAsTraceFormat(std::string* out) const override {
     std::string tmp;
     base::JSONWriter::Write(value_.get(), &tmp);
     *out += tmp;
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
index 276b2bd..be94b89 100644
--- a/android_webview/browser/browser_view_renderer.h
+++ b/android_webview/browser/browser_view_renderer.h
@@ -118,30 +118,30 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient,
 
   // SynchronousCompositorClient overrides.
   virtual void DidInitializeCompositor(
-      content::SynchronousCompositor* compositor) OVERRIDE;
+      content::SynchronousCompositor* compositor) override;
   virtual void DidDestroyCompositor(content::SynchronousCompositor* compositor)
-      OVERRIDE;
-  virtual void SetContinuousInvalidate(bool invalidate) OVERRIDE;
-  virtual void DidUpdateContent() OVERRIDE;
-  virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() OVERRIDE;
+      override;
+  virtual void SetContinuousInvalidate(bool invalidate) override;
+  virtual void DidUpdateContent() override;
+  virtual gfx::Vector2dF GetTotalRootLayerScrollOffset() override;
   virtual void UpdateRootLayerState(
       const gfx::Vector2dF& total_scroll_offset_dip,
       const gfx::Vector2dF& max_scroll_offset_dip,
       const gfx::SizeF& scrollable_size_dip,
       float page_scale_factor,
       float min_page_scale_factor,
-      float max_page_scale_factor) OVERRIDE;
-  virtual bool IsExternalFlingActive() const OVERRIDE;
+      float max_page_scale_factor) override;
+  virtual bool IsExternalFlingActive() const override;
   virtual void DidOverscroll(gfx::Vector2dF accumulated_overscroll,
                              gfx::Vector2dF latest_overscroll_delta,
-                             gfx::Vector2dF current_fling_velocity) OVERRIDE;
+                             gfx::Vector2dF current_fling_velocity) override;
 
   // GlobalTileManagerClient overrides.
   virtual content::SynchronousCompositorMemoryPolicy GetMemoryPolicy()
-      const OVERRIDE;
+      const override;
   virtual void SetMemoryPolicy(
       content::SynchronousCompositorMemoryPolicy new_policy,
-      bool effective_immediately) OVERRIDE;
+      bool effective_immediately) override;
 
   void UpdateParentDrawConstraints();
 
diff --git a/android_webview/browser/deferred_gpu_command_service.h b/android_webview/browser/deferred_gpu_command_service.h
index c84df5b..bd361b7 100644
--- a/android_webview/browser/deferred_gpu_command_service.h
+++ b/android_webview/browser/deferred_gpu_command_service.h
@@ -36,11 +36,11 @@ class DeferredGpuCommandService
   static void SetInstance();
   static DeferredGpuCommandService* GetInstance();
 
-  virtual void ScheduleTask(const base::Closure& task) OVERRIDE;
-  virtual void ScheduleIdleWork(const base::Closure& task) OVERRIDE;
-  virtual bool UseVirtualizedGLContexts() OVERRIDE;
+  virtual void ScheduleTask(const base::Closure& task) override;
+  virtual void ScheduleIdleWork(const base::Closure& task) override;
+  virtual bool UseVirtualizedGLContexts() override;
   virtual scoped_refptr<gpu::gles2::ShaderTranslatorCache>
-      shader_translator_cache() OVERRIDE;
+      shader_translator_cache() override;
 
   void RunTasks();
   // If |is_idle| is false, this will only run older idle tasks.
@@ -50,8 +50,8 @@ class DeferredGpuCommandService
   // idle tasks during the idle run.
   void PerformAllIdleWork();
 
-  virtual void AddRef() const OVERRIDE;
-  virtual void Release() const OVERRIDE;
+  virtual void AddRef() const override;
+  virtual void Release() const override;
 
  protected:
   virtual ~DeferredGpuCommandService();
diff --git a/android_webview/browser/global_tile_manager_unittest.cc b/android_webview/browser/global_tile_manager_unittest.cc
index 9419fdd..cd7d26e 100644
--- a/android_webview/browser/global_tile_manager_unittest.cc
+++ b/android_webview/browser/global_tile_manager_unittest.cc
@@ -21,12 +21,12 @@ using testing::Test;
 
 class MockGlobalTileManagerClient : public GlobalTileManagerClient {
  public:
-  virtual SynchronousCompositorMemoryPolicy GetMemoryPolicy() const OVERRIDE {
+  virtual SynchronousCompositorMemoryPolicy GetMemoryPolicy() const override {
     return memory_policy_;
   }
 
   virtual void SetMemoryPolicy(SynchronousCompositorMemoryPolicy new_policy,
-                               bool effective_immediately) OVERRIDE {
+                               bool effective_immediately) override {
     memory_policy_ = new_policy;
   }
 
diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/hardware_renderer.h
index 152ec2c..c13082c 100644
--- a/android_webview/browser/hardware_renderer.h
+++ b/android_webview/browser/hardware_renderer.h
@@ -39,30 +39,30 @@ class HardwareRenderer : public cc::LayerTreeHostClient,
   void CommitFrame();
 
   // cc::LayerTreeHostClient overrides.
-  virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
-  virtual void DidBeginMainFrame() OVERRIDE;
-  virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {}
-  virtual void Layout() OVERRIDE {}
+  virtual void WillBeginMainFrame(int frame_id) override {}
+  virtual void DidBeginMainFrame() override;
+  virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
+  virtual void Layout() override {}
   virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
                                    const gfx::Vector2d& outer_delta,
                                    float page_scale,
-                                   float top_controls_delta) OVERRIDE {}
+                                   float top_controls_delta) override {}
   virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
                                    float page_scale,
-                                   float top_controls_delta) OVERRIDE {}
-  virtual void RequestNewOutputSurface(bool fallback) OVERRIDE;
-  virtual void DidInitializeOutputSurface() OVERRIDE {}
-  virtual void WillCommit() OVERRIDE {}
-  virtual void DidCommit() OVERRIDE {}
-  virtual void DidCommitAndDrawFrame() OVERRIDE {}
-  virtual void DidCompleteSwapBuffers() OVERRIDE {}
+                                   float top_controls_delta) override {}
+  virtual void RequestNewOutputSurface(bool fallback) override;
+  virtual void DidInitializeOutputSurface() override {}
+  virtual void WillCommit() override {}
+  virtual void DidCommit() override {}
+  virtual void DidCommitAndDrawFrame() override {}
+  virtual void DidCompleteSwapBuffers() override {}
 
   // cc::LayerTreeHostSingleThreadClient overrides.
-  virtual void DidPostSwapBuffers() OVERRIDE {}
-  virtual void DidAbortSwapBuffers() OVERRIDE {}
+  virtual void DidPostSwapBuffers() override {}
+  virtual void DidAbortSwapBuffers() override {}
 
   // cc::DelegatedFrameResourceCollectionClient overrides.
-  virtual void UnusedResourcesAreAvailable() OVERRIDE;
+  virtual void UnusedResourcesAreAvailable() override;
 
  private:
   void SetFrameData();
diff --git a/android_webview/browser/icon_helper.h b/android_webview/browser/icon_helper.h
index f325450..287be27f 100644
--- a/android_webview/browser/icon_helper.h
+++ b/android_webview/browser/icon_helper.h
@@ -43,10 +43,10 @@ class IconHelper : public content::WebContentsObserver {
 
   // From WebContentsObserver
   virtual void DidUpdateFaviconURL(
-      const std::vector<content::FaviconURL>& candidates) OVERRIDE;
+      const std::vector<content::FaviconURL>& candidates) override;
   virtual void DidStartNavigationToPendingEntry(
       const GURL& url,
-      content::NavigationController::ReloadType reload_type) OVERRIDE;
+      content::NavigationController::ReloadType reload_type) override;
 
   void DownloadFaviconCallback(
       int id,
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.h b/android_webview/browser/net/android_stream_reader_url_request_job.h
index 8b7cafb..f3f230d 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job.h
+++ b/android_webview/browser/net/android_stream_reader_url_request_job.h
@@ -79,17 +79,17 @@ class AndroidStreamReaderURLRequestJob : public net::URLRequestJob {
       scoped_ptr<Delegate> delegate);
 
   // URLRequestJob:
-  virtual void Start() OVERRIDE;
-  virtual void Kill() OVERRIDE;
+  virtual void Start() override;
+  virtual void Kill() override;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
-                           int* bytes_read) OVERRIDE;
+                           int* bytes_read) override;
   virtual void SetExtraRequestHeaders(
-      const net::HttpRequestHeaders& headers) OVERRIDE;
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
-  virtual bool GetCharset(std::string* charset) OVERRIDE;
-  virtual int GetResponseCode() const OVERRIDE;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
+      const net::HttpRequestHeaders& headers) override;
+  virtual bool GetMimeType(std::string* mime_type) const override;
+  virtual bool GetCharset(std::string* charset) override;
+  virtual int GetResponseCode() const override;
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) override;
 
  protected:
   virtual ~AndroidStreamReaderURLRequestJob();
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
index ec67bbf..671cf83 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
@@ -52,15 +52,15 @@ class NotImplInputStream : public InputStream {
  public:
   NotImplInputStream() {}
   virtual ~NotImplInputStream() {}
-  virtual bool BytesAvailable(int* bytes_available) const OVERRIDE {
+  virtual bool BytesAvailable(int* bytes_available) const override {
     NOTIMPLEMENTED();
     return false;
   }
-  virtual bool Skip(int64_t n, int64_t* bytes_skipped) OVERRIDE {
+  virtual bool Skip(int64_t n, int64_t* bytes_skipped) override {
     NOTIMPLEMENTED();
     return false;
   }
-  virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) OVERRIDE {
+  virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) override {
     NOTIMPLEMENTED();
     return false;
   }
@@ -74,32 +74,32 @@ class StreamReaderDelegate :
 
   virtual scoped_ptr<InputStream> OpenInputStream(
       JNIEnv* env,
-      const GURL& url) OVERRIDE {
+      const GURL& url) override {
     return make_scoped_ptr<InputStream>(new NotImplInputStream());
   }
 
   virtual void OnInputStreamOpenFailed(net::URLRequest* request,
-                                       bool* restart) OVERRIDE {
+                                       bool* restart) override {
     *restart = false;
   }
 
   virtual bool GetMimeType(JNIEnv* env,
                            net::URLRequest* request,
                            android_webview::InputStream* stream,
-                           std::string* mime_type) OVERRIDE {
+                           std::string* mime_type) override {
     return false;
   }
 
   virtual bool GetCharset(JNIEnv* env,
                           net::URLRequest* request,
                           android_webview::InputStream* stream,
-                          std::string* charset) OVERRIDE {
+                          std::string* charset) override {
     return false;
   }
 
   virtual void AppendResponseHeaders(
       JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
+      net::HttpResponseHeaders* headers) override {
     // no-op
   }
 };
@@ -110,7 +110,7 @@ class NullStreamReaderDelegate : public StreamReaderDelegate {
 
   virtual scoped_ptr<InputStream> OpenInputStream(
       JNIEnv* env,
-      const GURL& url) OVERRIDE {
+      const GURL& url) override {
     return make_scoped_ptr<InputStream>(NULL);
   }
 };
@@ -121,7 +121,7 @@ class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate {
 
   virtual void AppendResponseHeaders(
       JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE {
+      net::HttpResponseHeaders* headers) override {
     headers->ReplaceStatusLine(kStatusLine);
     std::string headerLine(kCustomHeaderName);
     headerLine.append(": ");
@@ -168,13 +168,13 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
   }
 
   virtual scoped_ptr<InputStreamReader> CreateStreamReader(
-      InputStream* stream) OVERRIDE {
+      InputStream* stream) override {
     return stream_reader_.Pass();
   }
  protected:
   virtual ~TestStreamReaderJob() {}
 
-  virtual base::TaskRunner* GetWorkerThreadRunner() OVERRIDE {
+  virtual base::TaskRunner* GetWorkerThreadRunner() override {
     return message_loop_proxy_.get();
   }
 
diff --git a/android_webview/browser/net/aw_network_delegate.h b/android_webview/browser/net/aw_network_delegate.h
index 8771bbc..4447bd1 100644
--- a/android_webview/browser/net/aw_network_delegate.h
+++ b/android_webview/browser/net/aw_network_delegate.h
@@ -43,48 +43,48 @@ class AwNetworkDelegate : public net::NetworkDelegate {
   // NetworkDelegate implementation.
   virtual int OnBeforeURLRequest(net::URLRequest* request,
                                  const net::CompletionCallback& callback,
-                                 GURL* new_url) OVERRIDE;
+                                 GURL* new_url) override;
   virtual int OnBeforeSendHeaders(net::URLRequest* request,
                                   const net::CompletionCallback& callback,
-                                  net::HttpRequestHeaders* headers) OVERRIDE;
+                                  net::HttpRequestHeaders* headers) override;
   virtual void OnBeforeSendProxyHeaders(
       net::URLRequest* request,
       const net::ProxyInfo& proxy_info,
-      net::HttpRequestHeaders* headers) OVERRIDE;
+      net::HttpRequestHeaders* headers) override;
   virtual void OnSendHeaders(net::URLRequest* request,
-                             const net::HttpRequestHeaders& headers) OVERRIDE;
+                             const net::HttpRequestHeaders& headers) override;
   virtual int OnHeadersReceived(
       net::URLRequest* request,
       const net::CompletionCallback& callback,
       const net::HttpResponseHeaders* original_response_headers,
       scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-      GURL* allowed_unsafe_redirect_url) OVERRIDE;
+      GURL* allowed_unsafe_redirect_url) override;
   virtual void OnBeforeRedirect(net::URLRequest* request,
-                                const GURL& new_location) OVERRIDE;
-  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+                                const GURL& new_location) override;
+  virtual void OnResponseStarted(net::URLRequest* request) override;
   virtual void OnRawBytesRead(const net::URLRequest& request,
-                              int bytes_read) OVERRIDE;
-  virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE;
-  virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE;
+                              int bytes_read) override;
+  virtual void OnCompleted(net::URLRequest* request, bool started) override;
+  virtual void OnURLRequestDestroyed(net::URLRequest* request) override;
   virtual void OnPACScriptError(int line_number,
-                                const base::string16& error) OVERRIDE;
+                                const base::string16& error) override;
   virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
       net::URLRequest* request,
       const net::AuthChallengeInfo& auth_info,
       const AuthCallback& callback,
-      net::AuthCredentials* credentials) OVERRIDE;
+      net::AuthCredentials* credentials) override;
   virtual bool OnCanGetCookies(const net::URLRequest& request,
-                               const net::CookieList& cookie_list) OVERRIDE;
+                               const net::CookieList& cookie_list) override;
   virtual bool OnCanSetCookie(const net::URLRequest& request,
                               const std::string& cookie_line,
-                              net::CookieOptions* options) OVERRIDE;
+                              net::CookieOptions* options) override;
   virtual bool OnCanAccessFile(const net::URLRequest& request,
-                               const base::FilePath& path) const OVERRIDE;
+                               const base::FilePath& path) const override;
   virtual bool OnCanThrottleRequest(
-      const net::URLRequest& request) const OVERRIDE;
+      const net::URLRequest& request) const override;
   virtual int OnBeforeSocketStreamConnect(
       net::SocketStream* stream,
-      const net::CompletionCallback& callback) OVERRIDE;
+      const net::CompletionCallback& callback) override;
 
   // Data reduction proxy parameters object. Must outlive this.
   data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params_;
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index 3154b52..25cfaae 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -41,9 +41,9 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
           config_service);
 
   // net::URLRequestContextGetter implementation.
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+      GetNetworkTaskRunner() const override;
 
   data_reduction_proxy::DataReductionProxyAuthRequestHandler*
       GetDataReductionProxyAuthRequestHandler() const;
diff --git a/android_webview/browser/net/aw_url_request_job_factory.h b/android_webview/browser/net/aw_url_request_job_factory.h
index b4745bd..6cf507b 100644
--- a/android_webview/browser/net/aw_url_request_job_factory.h
+++ b/android_webview/browser/net/aw_url_request_job_factory.h
@@ -32,10 +32,10 @@ class AwURLRequestJobFactory : public net::URLRequestJobFactory {
   virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
       const std::string& scheme,
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
-  virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE;
-  virtual bool IsHandledURL(const GURL& url) const OVERRIDE;
-  virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE;
+      net::NetworkDelegate* network_delegate) const override;
+  virtual bool IsHandledProtocol(const std::string& scheme) const override;
+  virtual bool IsHandledURL(const GURL& url) const override;
+  virtual bool IsSafeRedirectTarget(const GURL& location) const override;
 
  private:
   // By default calls are forwarded to this factory, to avoid having to
diff --git a/android_webview/browser/parent_output_surface.h b/android_webview/browser/parent_output_surface.h
index c79703b..03cd5dd 100644
--- a/android_webview/browser/parent_output_surface.h
+++ b/android_webview/browser/parent_output_surface.h
@@ -16,8 +16,8 @@ class ParentOutputSurface : NON_EXPORTED_BASE(public cc::OutputSurface) {
   virtual ~ParentOutputSurface();
 
   // OutputSurface overrides.
-  virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE {}
-  virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE;
+  virtual void Reshape(const gfx::Size& size, float scale_factor) override {}
+  virtual void SwapBuffers(cc::CompositorFrame* frame) override;
   using cc::OutputSurface::SetExternalStencilTest;
 
   void SetDrawConstraints(const gfx::Size& surface_size, const gfx::Rect& clip);
diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.h b/android_webview/browser/renderer_host/aw_render_view_host_ext.h
index 635c7fc..8443f5f 100644
--- a/android_webview/browser/renderer_host/aw_render_view_host_ext.h
+++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.h
@@ -79,12 +79,12 @@ class AwRenderViewHostExt : public content::WebContentsObserver,
 
  private:
   // content::WebContentsObserver implementation.
-  virtual void RenderViewCreated(content::RenderViewHost* view_host) OVERRIDE;
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
+  virtual void RenderViewCreated(content::RenderViewHost* view_host) override;
+  virtual void RenderProcessGone(base::TerminationStatus status) override;
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   void OnDocumentHasImagesResponse(int msg_id, bool has_images);
   void OnUpdateHitTestData(const AwHitTestData& hit_test_data);
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 56d06e1..ea91a12 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -66,9 +66,9 @@ class IoThreadClientThrottle : public content::ResourceThrottle {
   virtual ~IoThreadClientThrottle();
 
   // From content::ResourceThrottle
-  virtual void WillStartRequest(bool* defer) OVERRIDE;
-  virtual void WillRedirectRequest(const GURL& new_url, bool* defer) OVERRIDE;
-  virtual const char* GetNameForLogging() const OVERRIDE;
+  virtual void WillStartRequest(bool* defer) override;
+  virtual void WillRedirectRequest(const GURL& new_url, bool* defer) override;
+  virtual const char* GetNameForLogging() const override;
 
   void OnIoThreadClientReady(int new_render_process_id,
                              int new_render_frame_id);
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
index 2d88660..25ec4ff 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
@@ -34,7 +34,7 @@ class AwResourceDispatcherHostDelegate
       content::ResourceContext* resource_context,
       content::AppCacheService* appcache_service,
       content::ResourceType resource_type,
-      ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;
+      ScopedVector<content::ResourceThrottle>* throttles) override;
   virtual void DownloadStarting(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
@@ -43,24 +43,24 @@ class AwResourceDispatcherHostDelegate
       int request_id,
       bool is_content_initiated,
       bool must_download,
-      ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;
+      ScopedVector<content::ResourceThrottle>* throttles) override;
   virtual content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
       net::AuthChallengeInfo* auth_info,
-      net::URLRequest* request) OVERRIDE;
+      net::URLRequest* request) override;
   virtual bool HandleExternalProtocol(const GURL& url,
                                       int child_id,
-                                      int route_id) OVERRIDE;
+                                      int route_id) override;
   virtual void OnResponseStarted(
       net::URLRequest* request,
       content::ResourceContext* resource_context,
       content::ResourceResponse* response,
-      IPC::Sender* sender) OVERRIDE;
+      IPC::Sender* sender) override;
 
   virtual void OnRequestRedirected(
       const GURL& redirect_url,
       net::URLRequest* request,
       content::ResourceContext* resource_context,
-      content::ResourceResponse* response) OVERRIDE;
+      content::ResourceResponse* response) override;
 
   void RemovePendingThrottleOnIoThread(IoThreadClientThrottle* throttle);
 
diff --git a/android_webview/browser/renderer_host/print_manager.h b/android_webview/browser/renderer_host/print_manager.h
index 7cee587..951f6c8 100644
--- a/android_webview/browser/renderer_host/print_manager.h
+++ b/android_webview/browser/renderer_host/print_manager.h
@@ -57,7 +57,7 @@ class PrintManager : public content::WebContentsObserver,
   bool PrintNow();
 
  private:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
   void OnDidGetPrintedPagesCount(int cookie, int number_pages);
   void OnDidGetDocumentCookie(int cookie);
   void OnPrintingFailed(int cookie);
diff --git a/android_webview/common/aw_content_client.h b/android_webview/common/aw_content_client.h
index 697f4e3..55a84e0 100644
--- a/android_webview/common/aw_content_client.h
+++ b/android_webview/common/aw_content_client.h
@@ -16,13 +16,13 @@ std::string GetUserAgent();
 class AwContentClient : public content::ContentClient {
  public:
   // ContentClient implementation.
-  virtual std::string GetProduct() const OVERRIDE;
-  virtual std::string GetUserAgent() const OVERRIDE;
-  virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE;
+  virtual std::string GetProduct() const override;
+  virtual std::string GetUserAgent() const override;
+  virtual base::string16 GetLocalizedString(int message_id) const override;
   virtual base::StringPiece GetDataResource(
       int resource_id,
-      ui::ScaleFactor scale_factor) const OVERRIDE;
-  virtual bool CanSendWhileSwappedOut(const IPC::Message* message) OVERRIDE;
+      ui::ScaleFactor scale_factor) const override;
+  virtual bool CanSendWhileSwappedOut(const IPC::Message* message) override;
 };
 
 }  // namespace android_webview
diff --git a/android_webview/lib/aw_browser_dependency_factory_impl.h b/android_webview/lib/aw_browser_dependency_factory_impl.h
index 127960a..e0cf3b9 100644
--- a/android_webview/lib/aw_browser_dependency_factory_impl.h
+++ b/android_webview/lib/aw_browser_dependency_factory_impl.h
@@ -28,8 +28,8 @@ class AwBrowserDependencyFactoryImpl : public AwBrowserDependencyFactory {
   static void InstallInstance();
 
   // AwBrowserDependencyFactory
-  virtual content::BrowserContext* GetBrowserContext() OVERRIDE;
-  virtual content::WebContents* CreateWebContents() OVERRIDE;
+  virtual content::BrowserContext* GetBrowserContext() override;
+  virtual content::WebContents* CreateWebContents() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AwBrowserDependencyFactoryImpl);
diff --git a/android_webview/lib/main/aw_main_delegate.h b/android_webview/lib/main/aw_main_delegate.h
index c05da81..ebf25fc 100644
--- a/android_webview/lib/main/aw_main_delegate.h
+++ b/android_webview/lib/main/aw_main_delegate.h
@@ -30,27 +30,27 @@ class AwMainDelegate : public content::ContentMainDelegate,
 
  private:
   // content::ContentMainDelegate implementation:
-  virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
-  virtual void PreSandboxStartup() OVERRIDE;
-  virtual void SandboxInitialized(const std::string& process_type) OVERRIDE;
+  virtual bool BasicStartupComplete(int* exit_code) override;
+  virtual void PreSandboxStartup() override;
+  virtual void SandboxInitialized(const std::string& process_type) override;
   virtual int RunProcess(
       const std::string& process_type,
-      const content::MainFunctionParams& main_function_params) OVERRIDE;
-  virtual void ProcessExiting(const std::string& process_type) OVERRIDE;
-  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
+      const content::MainFunctionParams& main_function_params) override;
+  virtual void ProcessExiting(const std::string& process_type) override;
+  virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
   virtual content::ContentRendererClient*
-      CreateContentRendererClient() OVERRIDE;
+      CreateContentRendererClient() override;
 
   // JniDependencyFactory implementation.
   virtual scoped_refptr<AwQuotaManagerBridge> CreateAwQuotaManagerBridge(
-      AwBrowserContext* browser_context) OVERRIDE;
+      AwBrowserContext* browser_context) override;
   virtual content::WebContentsViewDelegate* CreateViewDelegate(
-      content::WebContents* web_contents) OVERRIDE;
-  virtual AwWebPreferencesPopulater* CreateWebPreferencesPopulater() OVERRIDE;
+      content::WebContents* web_contents) override;
+  virtual AwWebPreferencesPopulater* CreateWebPreferencesPopulater() override;
 #if defined(VIDEO_HOLE)
   virtual content::ExternalVideoSurfaceContainer*
       CreateExternalVideoSurfaceContainer(
-          content::WebContents* web_contents) OVERRIDE;
+          content::WebContents* web_contents) override;
 #endif
 
   scoped_ptr<content::BrowserMainRunner> browser_runner_;
diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc
index bc25e36..f09e4f5 100644
--- a/android_webview/native/android_protocol_handler.cc
+++ b/android_webview/native/android_protocol_handler.cc
@@ -62,24 +62,24 @@ class AndroidStreamReaderURLRequestJobDelegateImpl
 
   virtual scoped_ptr<InputStream> OpenInputStream(
       JNIEnv* env,
-      const GURL& url) OVERRIDE;
+      const GURL& url) override;
 
   virtual void OnInputStreamOpenFailed(net::URLRequest* request,
-                                       bool* restart) OVERRIDE;
+                                       bool* restart) override;
 
   virtual bool GetMimeType(JNIEnv* env,
                            net::URLRequest* request,
                            InputStream* stream,
-                           std::string* mime_type) OVERRIDE;
+                           std::string* mime_type) override;
 
   virtual bool GetCharset(JNIEnv* env,
                           net::URLRequest* request,
                           InputStream* stream,
-                          std::string* charset) OVERRIDE;
+                          std::string* charset) override;
 
   virtual void AppendResponseHeaders(
       JNIEnv* env,
-      net::HttpResponseHeaders* headers) OVERRIDE;
+      net::HttpResponseHeaders* headers) override;
 
   virtual ~AndroidStreamReaderURLRequestJobDelegateImpl();
 };
@@ -88,7 +88,7 @@ class AndroidRequestInterceptorBase : public net::URLRequestInterceptor {
  public:
   virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE;
+      net::NetworkDelegate* network_delegate) const override;
 
   virtual bool ShouldHandleRequest(const net::URLRequest* request) const = 0;
 };
@@ -97,9 +97,9 @@ class AssetFileRequestInterceptor : public AndroidRequestInterceptorBase {
  public:
   AssetFileRequestInterceptor();
 
-  virtual ~AssetFileRequestInterceptor() OVERRIDE;
+  virtual ~AssetFileRequestInterceptor() override;
   virtual bool ShouldHandleRequest(
-      const net::URLRequest* request) const OVERRIDE;
+      const net::URLRequest* request) const override;
 
  private:
   // file:///android_asset/
@@ -113,7 +113,7 @@ class ContentSchemeRequestInterceptor : public AndroidRequestInterceptorBase {
  public:
   ContentSchemeRequestInterceptor();
   virtual bool ShouldHandleRequest(
-      const net::URLRequest* request) const OVERRIDE;
+      const net::URLRequest* request) const override;
 };
 
 static ScopedJavaLocalRef<jobject> GetResourceContext(JNIEnv* env) {
diff --git a/android_webview/native/aw_autofill_client.h b/android_webview/native/aw_autofill_client.h
index ff66f2e..372c220 100644
--- a/android_webview/native/aw_autofill_client.h
+++ b/android_webview/native/aw_autofill_client.h
@@ -55,19 +55,19 @@ class AwAutofillClient : public autofill::AutofillClient,
   bool GetSaveFormData();
 
   // AutofillClient:
-  virtual autofill::PersonalDataManager* GetPersonalDataManager() OVERRIDE;
+  virtual autofill::PersonalDataManager* GetPersonalDataManager() override;
   virtual scoped_refptr<autofill::AutofillWebDataService> GetDatabase()
-      OVERRIDE;
-  virtual PrefService* GetPrefs() OVERRIDE;
-  virtual void HideRequestAutocompleteDialog() OVERRIDE;
-  virtual void ShowAutofillSettings() OVERRIDE;
+      override;
+  virtual PrefService* GetPrefs() override;
+  virtual void HideRequestAutocompleteDialog() override;
+  virtual void ShowAutofillSettings() override;
   virtual void ConfirmSaveCreditCard(
       const autofill::AutofillMetrics& metric_logger,
-      const base::Closure& save_card_callback) OVERRIDE;
+      const base::Closure& save_card_callback) override;
   virtual void ShowRequestAutocompleteDialog(
       const autofill::FormData& form,
       const GURL& source_url,
-      const ResultCallback& callback) OVERRIDE;
+      const ResultCallback& callback) override;
   virtual void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
@@ -75,17 +75,17 @@ class AwAutofillClient : public autofill::AutofillClient,
       const std::vector<base::string16>& labels,
       const std::vector<base::string16>& icons,
       const std::vector<int>& identifiers,
-      base::WeakPtr<autofill::AutofillPopupDelegate> delegate) OVERRIDE;
+      base::WeakPtr<autofill::AutofillPopupDelegate> delegate) override;
   virtual void UpdateAutofillPopupDataListValues(
       const std::vector<base::string16>& values,
-      const std::vector<base::string16>& labels) OVERRIDE;
-  virtual void HideAutofillPopup() OVERRIDE;
-  virtual bool IsAutocompleteEnabled() OVERRIDE;
+      const std::vector<base::string16>& labels) override;
+  virtual void HideAutofillPopup() override;
+  virtual bool IsAutocompleteEnabled() override;
   virtual void DetectAccountCreationForms(
-      const std::vector<autofill::FormStructure*>& forms) OVERRIDE;
+      const std::vector<autofill::FormStructure*>& forms) override;
   virtual void DidFillOrPreviewField(
       const base::string16& autofilled_value,
-      const base::string16& profile_full_name) OVERRIDE;
+      const base::string16& profile_full_name) override;
 
   void SuggestionSelected(JNIEnv* env, jobject obj, jint position);
 
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index a390375..e49d842 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -136,9 +136,9 @@ class AwContents : public FindHelper::Listener,
                                  jstring origin);
 
   // PermissionRequestHandlerClient implementation.
-  virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE;
+  virtual void OnPermissionRequest(AwPermissionRequest* request) override;
   virtual void OnPermissionRequestCanceled(
-      AwPermissionRequest* request) OVERRIDE;
+      AwPermissionRequest* request) override;
 
   PermissionRequestHandler* GetPermissionRequestHandler() {
     return permission_request_handler_.get();
@@ -152,14 +152,14 @@ class AwContents : public FindHelper::Listener,
   // AwBrowserPermissionRequestDelegate implementation.
   virtual void RequestProtectedMediaIdentifierPermission(
       const GURL& origin,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
   virtual void CancelProtectedMediaIdentifierPermissionRequests(
-      const GURL& origin) OVERRIDE;
+      const GURL& origin) override;
   virtual void RequestGeolocationPermission(
       const GURL& origin,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
   virtual void CancelGeolocationPermissionRequests(
-      const GURL& origin) OVERRIDE;
+      const GURL& origin) override;
 
 
   // Find-in-page API and related methods.
@@ -174,34 +174,34 @@ class AwContents : public FindHelper::Listener,
   // FindHelper::Listener implementation.
   virtual void OnFindResultReceived(int active_ordinal,
                                     int match_count,
-                                    bool finished) OVERRIDE;
+                                    bool finished) override;
   // IconHelper::Listener implementation.
-  virtual bool ShouldDownloadFavicon(const GURL& icon_url) OVERRIDE;
+  virtual bool ShouldDownloadFavicon(const GURL& icon_url) override;
   virtual void OnReceivedIcon(const GURL& icon_url,
-                              const SkBitmap& bitmap) OVERRIDE;
+                              const SkBitmap& bitmap) override;
   virtual void OnReceivedTouchIconUrl(const std::string& url,
-                                      const bool precomposed) OVERRIDE;
+                                      const bool precomposed) override;
 
   // AwRenderViewHostExtClient implementation.
   virtual void OnWebLayoutPageScaleFactorChanged(
-      float page_scale_factor) OVERRIDE;
+      float page_scale_factor) override;
   virtual void OnWebLayoutContentsSizeChanged(
-      const gfx::Size& contents_size) OVERRIDE;
+      const gfx::Size& contents_size) override;
 
   // BrowserViewRendererClient implementation.
-  virtual bool RequestDrawGL(jobject canvas, bool wait_for_completion) OVERRIDE;
-  virtual void PostInvalidate() OVERRIDE;
-  virtual void UpdateParentDrawConstraints() OVERRIDE;
-  virtual void OnNewPicture() OVERRIDE;
-  virtual gfx::Point GetLocationOnScreen() OVERRIDE;
-  virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
-  virtual bool IsFlingActive() const OVERRIDE;
+  virtual bool RequestDrawGL(jobject canvas, bool wait_for_completion) override;
+  virtual void PostInvalidate() override;
+  virtual void UpdateParentDrawConstraints() override;
+  virtual void OnNewPicture() override;
+  virtual gfx::Point GetLocationOnScreen() override;
+  virtual void ScrollContainerViewTo(gfx::Vector2d new_value) override;
+  virtual bool IsFlingActive() const override;
   virtual void UpdateScrollState(gfx::Vector2d max_scroll_offset,
                                  gfx::SizeF contents_size_dip,
                                  float page_scale_factor,
                                  float min_page_scale_factor,
-                                 float max_page_scale_factor) OVERRIDE;
-  virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;
+                                 float max_page_scale_factor) override;
+  virtual void DidOverscroll(gfx::Vector2d overscroll_delta) override;
 
   const BrowserViewRenderer* GetBrowserViewRenderer() const;
 
diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h
index 3c97f33..d50fa62 100644
--- a/android_webview/native/aw_contents_client_bridge.h
+++ b/android_webview/native/aw_contents_client_bridge.h
@@ -37,10 +37,10 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
                                      net::X509Certificate* cert,
                                      const GURL& request_url,
                                      const base::Callback<void(bool)>& callback,
-                                     bool* cancel_request) OVERRIDE;
+                                     bool* cancel_request) override;
   virtual void SelectClientCertificate(
       net::SSLCertRequestInfo* cert_request_info,
-      const SelectCertificateCallback& callback) OVERRIDE;
+      const SelectCertificateCallback& callback) override;
 
   virtual void RunJavaScriptDialog(
       content::JavaScriptMessageType message_type,
@@ -48,13 +48,13 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
       const base::string16& message_text,
       const base::string16& default_prompt_text,
       const content::JavaScriptDialogManager::DialogClosedCallback& callback)
-      OVERRIDE;
+      override;
   virtual void RunBeforeUnloadDialog(
       const GURL& origin_url,
       const base::string16& message_text,
       const content::JavaScriptDialogManager::DialogClosedCallback& callback)
-      OVERRIDE;
-  virtual bool ShouldOverrideUrlLoading(const base::string16& url) OVERRIDE;
+      override;
+  virtual bool ShouldOverrideUrlLoading(const base::string16& url) override;
 
   // Methods called from Java.
   void ProceedSslError(JNIEnv* env, jobject obj, jboolean proceed, jint id);
diff --git a/android_webview/native/aw_contents_io_thread_client_impl.cc b/android_webview/native/aw_contents_io_thread_client_impl.cc
index 8bdbf77..4f7ce44 100644
--- a/android_webview/native/aw_contents_io_thread_client_impl.cc
+++ b/android_webview/native/aw_contents_io_thread_client_impl.cc
@@ -116,9 +116,9 @@ class ClientMapEntryUpdater : public content::WebContentsObserver {
   ClientMapEntryUpdater(JNIEnv* env, WebContents* web_contents,
                         jobject jdelegate);
 
-  virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE;
-  virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
+  virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
+  virtual void WebContentsDestroyed() override;
 
  private:
   JavaObjectWeakGlobalRef jdelegate_;
diff --git a/android_webview/native/aw_contents_io_thread_client_impl.h b/android_webview/native/aw_contents_io_thread_client_impl.h
index 27ce4e5..4c9d555 100644
--- a/android_webview/native/aw_contents_io_thread_client_impl.h
+++ b/android_webview/native/aw_contents_io_thread_client_impl.h
@@ -42,26 +42,26 @@ class AwContentsIoThreadClientImpl : public AwContentsIoThreadClient {
   // Java object.
   AwContentsIoThreadClientImpl(bool pending_associate,
                                const base::android::JavaRef<jobject>& jclient);
-  virtual ~AwContentsIoThreadClientImpl() OVERRIDE;
+  virtual ~AwContentsIoThreadClientImpl() override;
 
   // Implementation of AwContentsIoThreadClient.
-  virtual bool PendingAssociation() const OVERRIDE;
-  virtual CacheMode GetCacheMode() const OVERRIDE;
+  virtual bool PendingAssociation() const override;
+  virtual CacheMode GetCacheMode() const override;
   virtual scoped_ptr<AwWebResourceResponse> ShouldInterceptRequest(
       const GURL& location,
-      const net::URLRequest* request) OVERRIDE;
-  virtual bool ShouldBlockContentUrls() const OVERRIDE;
-  virtual bool ShouldBlockFileUrls() const OVERRIDE;
-  virtual bool ShouldAcceptThirdPartyCookies() const OVERRIDE;
-  virtual bool ShouldBlockNetworkLoads() const OVERRIDE;
+      const net::URLRequest* request) override;
+  virtual bool ShouldBlockContentUrls() const override;
+  virtual bool ShouldBlockFileUrls() const override;
+  virtual bool ShouldAcceptThirdPartyCookies() const override;
+  virtual bool ShouldBlockNetworkLoads() const override;
   virtual void NewDownload(const GURL& url,
                            const std::string& user_agent,
                            const std::string& content_disposition,
                            const std::string& mime_type,
-                           int64 content_length) OVERRIDE;
+                           int64 content_length) override;
   virtual void NewLoginRequest(const std::string& realm,
                                const std::string& account,
-                               const std::string& args) OVERRIDE;
+                               const std::string& args) override;
 
  private:
   bool pending_association_;
diff --git a/android_webview/native/aw_dev_tools_server.cc b/android_webview/native/aw_dev_tools_server.cc
index 3ae81ee..9004583 100644
--- a/android_webview/native/aw_dev_tools_server.cc
+++ b/android_webview/native/aw_dev_tools_server.cc
@@ -39,19 +39,19 @@ class AwDevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
   virtual ~AwDevToolsServerDelegate() {}
 
   // DevToolsHttpProtocolHandler::Delegate overrides.
-  virtual std::string GetDiscoveryPageHTML() OVERRIDE;
+  virtual std::string GetDiscoveryPageHTML() override;
 
-  virtual bool BundlesFrontendResources() OVERRIDE {
+  virtual bool BundlesFrontendResources() override {
     return false;
   }
 
-  virtual base::FilePath GetDebugFrontendDir() OVERRIDE {
+  virtual base::FilePath GetDebugFrontendDir() override {
     return base::FilePath();
   }
 
   virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
-      std::string* name) OVERRIDE {
+      std::string* name) override {
     return scoped_ptr<net::StreamListenSocket>();
   }
 
@@ -79,7 +79,7 @@ class UnixDomainServerSocketFactory
 
  private:
   // content::DevToolsHttpHandler::ServerSocketFactory.
-  virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE {
+  virtual scoped_ptr<net::ServerSocket> Create() const override {
     return scoped_ptr<net::ServerSocket>(
         new net::UnixDomainServerSocket(
             base::Bind(&content::CanUserConnectToDevTools),
diff --git a/android_webview/native/aw_http_auth_handler.h b/android_webview/native/aw_http_auth_handler.h
index cfc99dd..c063702 100644
--- a/android_webview/native/aw_http_auth_handler.h
+++ b/android_webview/native/aw_http_auth_handler.h
@@ -35,7 +35,7 @@ class AwHttpAuthHandler : public AwHttpAuthHandlerBase {
   virtual ~AwHttpAuthHandler();
 
   // from AwHttpAuthHandler
-  virtual bool HandleOnUIThread(content::WebContents* web_contents) OVERRIDE;
+  virtual bool HandleOnUIThread(content::WebContents* web_contents) override;
 
   void Proceed(JNIEnv* env, jobject obj, jstring username, jstring password);
   void Cancel(JNIEnv* env, jobject obj);
diff --git a/android_webview/native/aw_media_url_interceptor.h b/android_webview/native/aw_media_url_interceptor.h
index b059c02..a6370a9 100644
--- a/android_webview/native/aw_media_url_interceptor.h
+++ b/android_webview/native/aw_media_url_interceptor.h
@@ -18,7 +18,7 @@ class AwMediaUrlInterceptor : public media::MediaUrlInterceptor {
   virtual bool Intercept(const std::string& url,
                          int* fd,
                          int64* offset,
-                         int64* size) const OVERRIDE;
+                         int64* size) const override;
 };
 
 }  // namespace android_webview
diff --git a/android_webview/native/aw_pdf_exporter.h b/android_webview/native/aw_pdf_exporter.h
index d27b092..b3e3203 100644
--- a/android_webview/native/aw_pdf_exporter.h
+++ b/android_webview/native/aw_pdf_exporter.h
@@ -38,8 +38,8 @@ class AwPdfExporter : public PrintManagerDelegate {
                    jobject cancel_signal);
 
   // Implement PrintManagerDelegate methods
-  virtual void DidExportPdf(bool success) OVERRIDE;
-  virtual bool IsCancelled() OVERRIDE;
+  virtual void DidExportPdf(bool success) override;
+  virtual bool IsCancelled() override;
 
  private:
   void CreatePdfSettings(JNIEnv* env, jobject obj);
diff --git a/android_webview/native/aw_settings.h b/android_webview/native/aw_settings.h
index d418f6c..d30b157 100644
--- a/android_webview/native/aw_settings.h
+++ b/android_webview/native/aw_settings.h
@@ -47,8 +47,8 @@ class AwSettings : public content::WebContentsObserver {
 
   // WebContentsObserver overrides:
   virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
+  virtual void WebContentsDestroyed() override;
 
   bool renderer_prefs_initialized_;
 
diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h
index 824c922..f45d312 100644
--- a/android_webview/native/aw_web_contents_delegate.h
+++ b/android_webview/native/aw_web_contents_delegate.h
@@ -20,43 +20,43 @@ class AwWebContentsDelegate
   AwWebContentsDelegate(JNIEnv* env, jobject obj);
   virtual ~AwWebContentsDelegate();
   virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager()
-      OVERRIDE;
+      override;
   virtual void FindReply(content::WebContents* web_contents,
                          int request_id,
                          int number_of_matches,
                          const gfx::Rect& selection_rect,
                          int active_match_ordinal,
-                         bool final_update) OVERRIDE;
+                         bool final_update) override;
   virtual void CanDownload(content::RenderViewHost* source,
                            const GURL& url,
                            const std::string& request_method,
-                           const base::Callback<void(bool)>& callback) OVERRIDE;
+                           const base::Callback<void(bool)>& callback) override;
   virtual void RunFileChooser(
       content::WebContents* web_contents,
-      const content::FileChooserParams& params) OVERRIDE;
+      const content::FileChooserParams& params) override;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
-                              bool* was_blocked) OVERRIDE;
+                              bool* was_blocked) override;
 
   virtual void WebContentsCreated(content::WebContents* source_contents,
                                   int opener_render_frame_id,
                                   const base::string16& frame_name,
                                   const GURL& target_url,
-                                  content::WebContents* new_contents) OVERRIDE;
+                                  content::WebContents* new_contents) override;
 
-  virtual void CloseContents(content::WebContents* source) OVERRIDE;
-  virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
+  virtual void CloseContents(content::WebContents* source) override;
+  virtual void ActivateContents(content::WebContents* contents) override;
   virtual void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE;
+      const content::MediaResponseCallback& callback) override;
   virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
-                                          bool enter_fullscreen) OVERRIDE;
+                                          bool enter_fullscreen) override;
   virtual bool IsFullscreenForTabOrPending(
-      const content::WebContents* web_contents) const OVERRIDE;
+      const content::WebContents* web_contents) const override;
 
  private:
   bool is_fullscreen_;
diff --git a/android_webview/native/aw_web_contents_view_delegate.h b/android_webview/native/aw_web_contents_view_delegate.h
index 30d0e98..95fd0d6a 100644
--- a/android_webview/native/aw_web_contents_view_delegate.h
+++ b/android_webview/native/aw_web_contents_view_delegate.h
@@ -25,10 +25,10 @@ class AwWebContentsViewDelegate : public content::WebContentsViewDelegate {
   virtual ~AwWebContentsViewDelegate();
 
   // content::WebContentsViewDelegate implementation.
-  virtual content::WebDragDestDelegate* GetDragDestDelegate() OVERRIDE;
+  virtual content::WebDragDestDelegate* GetDragDestDelegate() override;
   virtual void ShowContextMenu(
       content::RenderFrameHost* render_frame_host,
-      const content::ContextMenuParams& params) OVERRIDE;
+      const content::ContextMenuParams& params) override;
 
  private:
   AwWebContentsViewDelegate(content::WebContents* web_contents);
diff --git a/android_webview/native/aw_web_preferences_populater_impl.h b/android_webview/native/aw_web_preferences_populater_impl.h
index dbe540a..9831b04 100644
--- a/android_webview/native/aw_web_preferences_populater_impl.h
+++ b/android_webview/native/aw_web_preferences_populater_impl.h
@@ -19,7 +19,7 @@ class AwWebPreferencesPopulaterImpl : public AwWebPreferencesPopulater {
 
   // AwWebPreferencesPopulater
   virtual void PopulateFor(content::WebContents* web_contents,
-                           content::WebPreferences* web_prefs) OVERRIDE;
+                           content::WebPreferences* web_prefs) override;
 };
 
 }  // namespace android_webview
diff --git a/android_webview/native/aw_web_resource_response_impl.h b/android_webview/native/aw_web_resource_response_impl.h
index 2cef1c0..a33db6e 100644
--- a/android_webview/native/aw_web_resource_response_impl.h
+++ b/android_webview/native/aw_web_resource_response_impl.h
@@ -25,15 +25,15 @@ class AwWebResourceResponseImpl : public AwWebResourceResponse {
   AwWebResourceResponseImpl(const base::android::JavaRef<jobject>& obj);
   virtual ~AwWebResourceResponseImpl();
 
-  virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const OVERRIDE;
-  virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const OVERRIDE;
-  virtual bool GetCharset(JNIEnv* env, std::string* charset) const OVERRIDE;
+  virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const override;
+  virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const override;
+  virtual bool GetCharset(JNIEnv* env, std::string* charset) const override;
   virtual bool GetStatusInfo(JNIEnv* env,
                              int* status_code,
-                             std::string* reason_phrase) const OVERRIDE;
+                             std::string* reason_phrase) const override;
   virtual bool GetResponseHeaders(
       JNIEnv* env,
-      net::HttpResponseHeaders* headers) const OVERRIDE;
+      net::HttpResponseHeaders* headers) const override;
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
diff --git a/android_webview/native/external_video_surface_container_impl.h b/android_webview/native/external_video_surface_container_impl.h
index 4d34f83..97d2334 100644
--- a/android_webview/native/external_video_surface_container_impl.h
+++ b/android_webview/native/external_video_surface_container_impl.h
@@ -26,11 +26,11 @@ class ExternalVideoSurfaceContainerImpl
   virtual void RequestExternalVideoSurface(
       int player_id,
       const SurfaceCreatedCB& surface_created_cb,
-      const SurfaceDestroyedCB& surface_destroyed_cb) OVERRIDE;
-  virtual void ReleaseExternalVideoSurface(int player_id) OVERRIDE;
-  virtual void OnFrameInfoUpdated() OVERRIDE;
+      const SurfaceDestroyedCB& surface_destroyed_cb) override;
+  virtual void ReleaseExternalVideoSurface(int player_id) override;
+  virtual void OnFrameInfoUpdated() override;
   virtual void OnExternalVideoSurfacePositionChanged(
-      int player_id, const gfx::RectF& rect) OVERRIDE;
+      int player_id, const gfx::RectF& rect) override;
 
   // Methods called from Java.
   void SurfaceCreated(
diff --git a/android_webview/native/input_stream_impl.h b/android_webview/native/input_stream_impl.h
index 164aa5f..4a950e8 100644
--- a/android_webview/native/input_stream_impl.h
+++ b/android_webview/native/input_stream_impl.h
@@ -32,9 +32,9 @@ class InputStreamImpl : public InputStream {
   const jobject jobj() const { return jobject_.obj(); }
 
   // InputStream implementation.
-  virtual bool BytesAvailable(int* bytes_available) const OVERRIDE;
-  virtual bool Skip(int64_t n, int64_t* bytes_skipped) OVERRIDE;
-  virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) OVERRIDE;
+  virtual bool BytesAvailable(int* bytes_available) const override;
+  virtual bool Skip(int64_t n, int64_t* bytes_skipped) override;
+  virtual bool Read(net::IOBuffer* dest, int length, int* bytes_read) override;
  protected:
   // Parameterless constructor exposed for testing.
   InputStreamImpl();
diff --git a/android_webview/native/java_browser_view_renderer_helper.h b/android_webview/native/java_browser_view_renderer_helper.h
index 5ff938d..5eca718 100644
--- a/android_webview/native/java_browser_view_renderer_helper.h
+++ b/android_webview/native/java_browser_view_renderer_helper.h
@@ -27,7 +27,7 @@ class JavaBrowserViewRendererHelper : public BrowserViewRendererJavaHelper {
       jobject java_canvas,
       const gfx::Vector2d& scroll_correction,
       const gfx::Size& auxiliary_bitmap_size,
-      RenderMethod render_source) OVERRIDE;
+      RenderMethod render_source) override;
 
  private:
   bool RenderViaAuxilaryBitmap(JNIEnv* env,
diff --git a/android_webview/native/permission/media_access_permission_request.h b/android_webview/native/permission/media_access_permission_request.h
index 1a4d482..080d7f3 100644
--- a/android_webview/native/permission/media_access_permission_request.h
+++ b/android_webview/native/permission/media_access_permission_request.h
@@ -20,9 +20,9 @@ class MediaAccessPermissionRequest : public AwPermissionRequestDelegate {
   virtual ~MediaAccessPermissionRequest();
 
   // AwPermissionRequestDelegate implementation.
-  virtual const GURL& GetOrigin() OVERRIDE;
-  virtual int64 GetResources() OVERRIDE;
-  virtual void NotifyRequestResult(bool allowed) OVERRIDE;
+  virtual const GURL& GetOrigin() override;
+  virtual int64 GetResources() override;
+  virtual void NotifyRequestResult(bool allowed) override;
 
  private:
   friend class TestMediaAccessPermissionRequest;
diff --git a/android_webview/native/permission/permission_request_handler.h b/android_webview/native/permission/permission_request_handler.h
index 69a9171..2318b57 100644
--- a/android_webview/native/permission/permission_request_handler.h
+++ b/android_webview/native/permission/permission_request_handler.h
@@ -40,7 +40,7 @@ class PermissionRequestHandler : public content::WebContentsObserver {
 
   // WebContentsObserver
   virtual void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& load_details) OVERRIDE;
+      const content::LoadCommittedDetails& load_details) override;
 
  private:
   friend class TestPermissionRequestHandler;
diff --git a/android_webview/native/permission/permission_request_handler_unittest.cc b/android_webview/native/permission/permission_request_handler_unittest.cc
index c709f0b..775e5fb 100644
--- a/android_webview/native/permission/permission_request_handler_unittest.cc
+++ b/android_webview/native/permission/permission_request_handler_unittest.cc
@@ -21,17 +21,17 @@ class TestAwPermissionRequestDelegate : public AwPermissionRequestDelegate {
         callback_(callback) {}
 
   // Get the origin which initiated the permission request.
-  virtual const GURL& GetOrigin() OVERRIDE {
+  virtual const GURL& GetOrigin() override {
     return origin_;
   }
 
   // Get the resources the origin wanted to access.
-  virtual int64 GetResources() OVERRIDE {
+  virtual int64 GetResources() override {
     return resources_;
   }
 
   // Notify the permission request is allowed or not.
-  virtual void NotifyRequestResult(bool allowed) OVERRIDE {
+  virtual void NotifyRequestResult(bool allowed) override {
     callback_.Run(allowed);
   }
 
@@ -57,14 +57,14 @@ class TestPermissionRequestHandlerClient :
   TestPermissionRequestHandlerClient()
       : request_(NULL) {}
 
-  virtual void OnPermissionRequest(AwPermissionRequest* request) OVERRIDE {
+  virtual void OnPermissionRequest(AwPermissionRequest* request) override {
     request_ = request;
     requested_permission_ =
         Permission(request->GetOrigin(), request->GetResources());
   }
 
   virtual void OnPermissionRequestCanceled(
-      AwPermissionRequest* request) OVERRIDE{
+      AwPermissionRequest* request) override{
     canceled_permission_ =
         Permission(request->GetOrigin(), request->GetResources());
   }
@@ -129,7 +129,7 @@ class PermissionRequestHandlerTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     testing::Test::SetUp();
     origin_ = GURL("http://www.google.com");
     resources_ =
diff --git a/android_webview/native/permission/simple_permission_request.h b/android_webview/native/permission/simple_permission_request.h
index 25ba540..c232bdf 100644
--- a/android_webview/native/permission/simple_permission_request.h
+++ b/android_webview/native/permission/simple_permission_request.h
@@ -20,9 +20,9 @@ class SimplePermissionRequest : public AwPermissionRequestDelegate {
   virtual ~SimplePermissionRequest();
 
   // AwPermissionRequestDelegate implementation.
-  virtual const GURL& GetOrigin() OVERRIDE;
-  virtual int64 GetResources() OVERRIDE;
-  virtual void NotifyRequestResult(bool allowed) OVERRIDE;
+  virtual const GURL& GetOrigin() override;
+  virtual int64 GetResources() override;
+  virtual void NotifyRequestResult(bool allowed) override;
 
  private:
   const GURL origin_;
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index 23b3c7a..dbef8d9 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -22,24 +22,24 @@ class AwContentRendererClient : public content::ContentRendererClient {
   virtual ~AwContentRendererClient();
 
   // ContentRendererClient implementation.
-  virtual void RenderThreadStarted() OVERRIDE;
-  virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE;
-  virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE;
-  virtual std::string GetDefaultEncoding() OVERRIDE;
+  virtual void RenderThreadStarted() override;
+  virtual void RenderFrameCreated(content::RenderFrame* render_frame) override;
+  virtual void RenderViewCreated(content::RenderView* render_view) override;
+  virtual std::string GetDefaultEncoding() override;
   virtual bool HasErrorPage(int http_status_code,
-                            std::string* error_domain) OVERRIDE;
+                            std::string* error_domain) override;
   virtual void GetNavigationErrorStrings(
       content::RenderView* render_view,
       blink::WebFrame* frame,
       const blink::WebURLRequest& failed_request,
       const blink::WebURLError& error,
       std::string* error_html,
-      base::string16* error_description) OVERRIDE;
+      base::string16* error_description) override;
   virtual unsigned long long VisitedLinkHash(const char* canonical_url,
-                                             size_t length) OVERRIDE;
-  virtual bool IsLinkVisited(unsigned long long link_hash) OVERRIDE;
+                                             size_t length) override;
+  virtual bool IsLinkVisited(unsigned long long link_hash) override;
   virtual void AddKeySystems(
-      std::vector<content::KeySystemInfo>* key_systems) OVERRIDE;
+      std::vector<content::KeySystemInfo>* key_systems) override;
 
   virtual bool HandleNavigation(content::RenderFrame* render_frame,
                                 content::DocumentState* document_state,
@@ -48,10 +48,10 @@ class AwContentRendererClient : public content::ContentRendererClient {
                                 const blink::WebURLRequest& request,
                                 blink::WebNavigationType type,
                                 blink::WebNavigationPolicy default_policy,
-                                bool is_redirect) OVERRIDE;
+                                bool is_redirect) override;
   virtual bool ShouldOverridePageVisibilityState(
       const content::RenderFrame* render_frame,
-      blink::WebPageVisibilityState* override_state) OVERRIDE;
+      blink::WebPageVisibilityState* override_state) override;
 
  private:
   scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_;
diff --git a/android_webview/renderer/aw_render_frame_ext.h b/android_webview/renderer/aw_render_frame_ext.h
index d2f5f2b..40141bc 100644
--- a/android_webview/renderer/aw_render_frame_ext.h
+++ b/android_webview/renderer/aw_render_frame_ext.h
@@ -20,7 +20,7 @@ class AwRenderFrameExt : public content::RenderFrameObserver {
   virtual ~AwRenderFrameExt();
 
   // RenderFrame::Observer:
-  virtual void DidCommitProvisionalLoad(bool is_new_navigation) OVERRIDE;
+  virtual void DidCommitProvisionalLoad(bool is_new_navigation) override;
   DISALLOW_COPY_AND_ASSIGN(AwRenderFrameExt);
 };
 
diff --git a/android_webview/renderer/aw_render_process_observer.h b/android_webview/renderer/aw_render_process_observer.h
index 2cb4d2f..5c39787 100644
--- a/android_webview/renderer/aw_render_process_observer.h
+++ b/android_webview/renderer/aw_render_process_observer.h
@@ -19,8 +19,8 @@ class AwRenderProcessObserver : public content::RenderProcessObserver {
   virtual ~AwRenderProcessObserver();
 
   // content::RenderProcessObserver implementation.
-  virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void WebKitInitialized() OVERRIDE;
+  virtual bool OnControlMessageReceived(const IPC::Message& message) override;
+  virtual void WebKitInitialized() override;
 
  private:
   void OnClearCache();
diff --git a/android_webview/renderer/aw_render_view_ext.h b/android_webview/renderer/aw_render_view_ext.h
index 089273b..57ce7c7 100644
--- a/android_webview/renderer/aw_render_view_ext.h
+++ b/android_webview/renderer/aw_render_view_ext.h
@@ -33,11 +33,11 @@ class AwRenderViewExt : public content::RenderViewObserver {
   virtual ~AwRenderViewExt();
 
   // RenderView::Observer:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void FocusedNodeChanged(const blink::WebNode& node) OVERRIDE;
-  virtual void DidCommitCompositorFrame() OVERRIDE;
-  virtual void DidUpdateLayout() OVERRIDE;
-  virtual void Navigate(const GURL& url) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void FocusedNodeChanged(const blink::WebNode& node) override;
+  virtual void DidCommitCompositorFrame() override;
+  virtual void DidUpdateLayout() override;
+  virtual void Navigate(const GURL& url) override;
 
   void OnDocumentHasImagesRequest(int id);
 
diff --git a/android_webview/renderer/print_render_frame_observer.h b/android_webview/renderer/print_render_frame_observer.h
index fa31bd2..95248ac 100644
--- a/android_webview/renderer/print_render_frame_observer.h
+++ b/android_webview/renderer/print_render_frame_observer.h
@@ -17,7 +17,7 @@ class PrintRenderFrameObserver : public content::RenderFrameObserver {
   virtual ~PrintRenderFrameObserver();
 
   // RenderFrameObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC handlers
   void OnPrintNodeUnderContextMenu();
diff --git a/android_webview/renderer/print_web_view_helper.h b/android_webview/renderer/print_web_view_helper.h
index 377882d..ee77e65 100644
--- a/android_webview/renderer/print_web_view_helper.h
+++ b/android_webview/renderer/print_web_view_helper.h
@@ -114,11 +114,11 @@ class PrintWebViewHelper
   };
 
   // RenderViewObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
   virtual void PrintPage(blink::WebLocalFrame* frame,
-                         bool user_initiated) OVERRIDE;
-  virtual void DidStartLoading() OVERRIDE;
-  virtual void DidStopLoading() OVERRIDE;
+                         bool user_initiated) override;
+  virtual void DidStartLoading() override;
+  virtual void DidStopLoading() override;
 
   // Message handlers ---------------------------------------------------------
   void OnPrintPages();