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}

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_;

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.

android_webview/browser/aw_content_browser_client.cc

@@ -54,9 +54,9 @@ class AwContentsMessageFilter : public content::BrowserMessageFilter {
   // 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() { }

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

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_;

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);

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

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 {

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();