Standardize usage of virtual/override/final in content/browser/

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

BUG=417463
TBR=sky@chromium.org

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

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

12 files changed, 115 insertions, 134 deletions

diff --git a/content/browser/webui/content_web_ui_controller_factory.h b/content/browser/webui/content_web_ui_controller_factory.h
index 2d5ee35..f263811 100644
--- a/content/browser/webui/content_web_ui_controller_factory.h
+++ b/content/browser/webui/content_web_ui_controller_factory.h
@@ -14,21 +14,20 @@ namespace content {
 
 class ContentWebUIControllerFactory : public WebUIControllerFactory {
  public:
-  virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
-                                     const GURL& url) const override;
-  virtual bool UseWebUIForURL(BrowserContext* browser_context,
+  WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
+                             const GURL& url) const override;
+  bool UseWebUIForURL(BrowserContext* browser_context,
+                      const GURL& url) const override;
+  bool UseWebUIBindingsForURL(BrowserContext* browser_context,
                               const GURL& url) const override;
-  virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
-                                      const GURL& url) const override;
-  virtual WebUIController* CreateWebUIControllerForURL(
-      WebUI* web_ui,
-      const GURL& url) const override;
+  WebUIController* CreateWebUIControllerForURL(WebUI* web_ui,
+                                               const GURL& url) const override;
 
   static ContentWebUIControllerFactory* GetInstance();
 
  protected:
   ContentWebUIControllerFactory();
-  virtual ~ContentWebUIControllerFactory();
+  ~ContentWebUIControllerFactory() override;
 
  private:
   friend struct DefaultSingletonTraits<ContentWebUIControllerFactory>;
diff --git a/content/browser/webui/generic_handler.h b/content/browser/webui/generic_handler.h
index 99084a3..dd35255 100644
--- a/content/browser/webui/generic_handler.h
+++ b/content/browser/webui/generic_handler.h
@@ -18,10 +18,10 @@ namespace content {
 class GenericHandler : public WebUIMessageHandler {
  public:
   GenericHandler();
-  virtual ~GenericHandler();
+  ~GenericHandler() override;
 
   // WebUIMessageHandler implementation.
-  virtual void RegisterMessages() override;
+  void RegisterMessages() override;
 
  private:
   void HandleNavigateToUrl(const base::ListValue* args);
diff --git a/content/browser/webui/shared_resources_data_source.h b/content/browser/webui/shared_resources_data_source.h
index 045dd83..87b5121 100644
--- a/content/browser/webui/shared_resources_data_source.h
+++ b/content/browser/webui/shared_resources_data_source.h
@@ -15,18 +15,18 @@ class SharedResourcesDataSource : public content::URLDataSource {
   SharedResourcesDataSource();
 
   // content::URLDataSource implementation.
-  virtual std::string GetSource() const override;
-  virtual void StartDataRequest(
+  std::string GetSource() const override;
+  void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
       const content::URLDataSource::GotDataCallback& callback) override;
-  virtual std::string GetMimeType(const std::string&) const override;
-  virtual std::string GetAccessControlAllowOriginForOrigin(
+  std::string GetMimeType(const std::string&) const override;
+  std::string GetAccessControlAllowOriginForOrigin(
       const std::string& origin) const override;
 
  private:
-  virtual ~SharedResourcesDataSource();
+  ~SharedResourcesDataSource() override;
 
   DISALLOW_COPY_AND_ASSIGN(SharedResourcesDataSource);
 };
diff --git a/content/browser/webui/url_data_manager.h b/content/browser/webui/url_data_manager.h
index e94568d..8a318b7 100644
--- a/content/browser/webui/url_data_manager.h
+++ b/content/browser/webui/url_data_manager.h
@@ -26,7 +26,7 @@ class WebUIDataSource;
 class CONTENT_EXPORT URLDataManager : public base::SupportsUserData::Data {
  public:
   explicit URLDataManager(BrowserContext* browser_context);
-  virtual ~URLDataManager();
+  ~URLDataManager() override;
 
   // Adds a DataSource to the collection of data sources. This *must* be invoked
   // on the UI thread.
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index 8c21673c..9e12864 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -119,14 +119,12 @@ class URLRequestChromeJob : public net::URLRequestJob,
                       bool is_incognito);
 
   // net::URLRequestJob implementation.
-  virtual void Start() override;
-  virtual void Kill() override;
-  virtual bool ReadRawData(net::IOBuffer* buf,
-                           int buf_size,
-                           int* bytes_read) override;
-  virtual bool GetMimeType(std::string* mime_type) const override;
-  virtual int GetResponseCode() const override;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) override;
+  void Start() override;
+  void Kill() override;
+  bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) override;
+  bool GetMimeType(std::string* mime_type) const override;
+  int GetResponseCode() const override;
+  void GetResponseInfo(net::HttpResponseInfo* info) override;
 
   // Used to notify that the requested data's |mime_type| is ready.
   void MimeTypeAvailable(const std::string& mime_type);
@@ -175,7 +173,7 @@ class URLRequestChromeJob : public net::URLRequestJob,
   }
 
  private:
-  virtual ~URLRequestChromeJob();
+  ~URLRequestChromeJob() override;
 
   // Helper for Start(), to let us start asynchronously.
   // (This pattern is shared by most net::URLRequestJob implementations.)
@@ -459,9 +457,9 @@ class ChromeProtocolHandler
         is_incognito_(is_incognito),
         appcache_service_(appcache_service),
         blob_storage_context_(blob_storage_context) {}
-  virtual ~ChromeProtocolHandler() {}
+  ~ChromeProtocolHandler() override {}
 
-  virtual net::URLRequestJob* MaybeCreateJob(
+  net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const override {
     DCHECK(request);
@@ -504,7 +502,7 @@ class ChromeProtocolHandler
         GetURLDataManagerForResourceContext(resource_context_), is_incognito_);
   }
 
-  virtual bool IsSafeRedirectTarget(const GURL& location) const override {
+  bool IsSafeRedirectTarget(const GURL& location) const override {
     return false;
   }
 
@@ -729,9 +727,9 @@ class DevToolsJobFactory
   // |is_incognito| should be set for incognito profiles.
   DevToolsJobFactory(content::ResourceContext* resource_context,
                      bool is_incognito);
-  virtual ~DevToolsJobFactory();
+  ~DevToolsJobFactory() override;
 
-  virtual net::URLRequestJob* MaybeCreateJob(
+  net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const override;
 
diff --git a/content/browser/webui/url_data_manager_backend.h b/content/browser/webui/url_data_manager_backend.h
index 4bdfc23..19d6bd2 100644
--- a/content/browser/webui/url_data_manager_backend.h
+++ b/content/browser/webui/url_data_manager_backend.h
@@ -39,7 +39,7 @@ class URLDataManagerBackend : public base::SupportsUserData::Data {
   typedef int RequestID;
 
   URLDataManagerBackend();
-  virtual ~URLDataManagerBackend();
+  ~URLDataManagerBackend() override;
 
   // Invoked to create the protocol handler for chrome://. |is_incognito| should
   // be set for incognito profiles. Called on the UI thread.
diff --git a/content/browser/webui/web_ui_controller_factory_registry.h b/content/browser/webui/web_ui_controller_factory_registry.h
index b435745..b59162f 100644
--- a/content/browser/webui/web_ui_controller_factory_registry.h
+++ b/content/browser/webui/web_ui_controller_factory_registry.h
@@ -19,14 +19,14 @@ class CONTENT_EXPORT WebUIControllerFactoryRegistry
 
   // WebUIControllerFactory implementation. Each method loops through the same
   // method on all the factories.
-  virtual WebUIController* CreateWebUIControllerForURL(
-      WebUI* web_ui, const GURL& url) const override;
-  virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
-                                     const GURL& url) const override;
-  virtual bool UseWebUIForURL(BrowserContext* browser_context,
+  WebUIController* CreateWebUIControllerForURL(WebUI* web_ui,
+                                               const GURL& url) const override;
+  WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
+                             const GURL& url) const override;
+  bool UseWebUIForURL(BrowserContext* browser_context,
+                      const GURL& url) const override;
+  bool UseWebUIBindingsForURL(BrowserContext* browser_context,
                               const GURL& url) const override;
-  virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
-                                      const GURL& url) const override;
 
   // Returns true if the given URL can be loaded by Web UI system. This allows
   // URLs that UseWebUIForURL returns true for, and also URLs that can be loaded
@@ -38,7 +38,7 @@ class CONTENT_EXPORT WebUIControllerFactoryRegistry
   friend struct DefaultSingletonTraits<WebUIControllerFactoryRegistry>;
 
   WebUIControllerFactoryRegistry();
-  virtual ~WebUIControllerFactoryRegistry();
+  ~WebUIControllerFactoryRegistry() override;
 
   DISALLOW_COPY_AND_ASSIGN(WebUIControllerFactoryRegistry);
 };
diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc
index 1ab38d1..6fbe577 100644
--- a/content/browser/webui/web_ui_data_source_impl.cc
+++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -59,17 +59,14 @@ class WebUIDataSourceImpl::InternalDataSource : public URLDataSource {
   InternalDataSource(WebUIDataSourceImpl* parent) : parent_(parent) {
   }
 
-  virtual ~InternalDataSource() {
-  }
+  ~InternalDataSource() override {}
 
   // URLDataSource implementation.
-  virtual std::string GetSource() const override {
-    return parent_->GetSource();
-  }
-  virtual std::string GetMimeType(const std::string& path) const override {
+  std::string GetSource() const override { return parent_->GetSource(); }
+  std::string GetMimeType(const std::string& path) const override {
     return parent_->GetMimeType(path);
   }
-  virtual void StartDataRequest(
+  void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
@@ -77,26 +74,24 @@ class WebUIDataSourceImpl::InternalDataSource : public URLDataSource {
     return parent_->StartDataRequest(path, render_process_id, render_frame_id,
                                      callback);
   }
-  virtual bool ShouldReplaceExistingSource() const override {
+  bool ShouldReplaceExistingSource() const override {
     return parent_->replace_existing_source_;
   }
-  virtual bool AllowCaching() const override {
-    return false;
-  }
-  virtual bool ShouldAddContentSecurityPolicy() const override {
+  bool AllowCaching() const override { return false; }
+  bool ShouldAddContentSecurityPolicy() const override {
     return parent_->add_csp_;
   }
-  virtual std::string GetContentSecurityPolicyObjectSrc() const override {
+  std::string GetContentSecurityPolicyObjectSrc() const override {
     if (parent_->object_src_set_)
       return parent_->object_src_;
     return URLDataSource::GetContentSecurityPolicyObjectSrc();
   }
-  virtual std::string GetContentSecurityPolicyFrameSrc() const override {
+  std::string GetContentSecurityPolicyFrameSrc() const override {
     if (parent_->frame_src_set_)
       return parent_->frame_src_;
     return URLDataSource::GetContentSecurityPolicyFrameSrc();
   }
-  virtual bool ShouldDenyXFrameOptions() const override {
+  bool ShouldDenyXFrameOptions() const override {
     return parent_->deny_xframe_options_;
   }
 
diff --git a/content/browser/webui/web_ui_data_source_impl.h b/content/browser/webui/web_ui_data_source_impl.h
index 8518fd4..d9f4488 100644
--- a/content/browser/webui/web_ui_data_source_impl.h
+++ b/content/browser/webui/web_ui_data_source_impl.h
@@ -27,30 +27,25 @@ class CONTENT_EXPORT WebUIDataSourceImpl
       public NON_EXPORTED_BASE(WebUIDataSource) {
  public:
   // WebUIDataSource implementation:
-  virtual void AddString(const std::string& name,
-                         const base::string16& value) override;
-  virtual void AddString(const std::string& name,
-                         const std::string& value) override;
-  virtual void AddLocalizedString(const std::string& name, int ids) override;
-  virtual void AddLocalizedStrings(
+  void AddString(const std::string& name, const base::string16& value) override;
+  void AddString(const std::string& name, const std::string& value) override;
+  void AddLocalizedString(const std::string& name, int ids) override;
+  void AddLocalizedStrings(
       const base::DictionaryValue& localized_strings) override;
-  virtual void AddBoolean(const std::string& name, bool value) override;
-  virtual void SetJsonPath(const std::string& path) override;
-  virtual void AddResourcePath(const std::string &path,
-                               int resource_id) override;
-  virtual void SetDefaultResource(int resource_id) override;
-  virtual void SetRequestFilter(
+  void AddBoolean(const std::string& name, bool value) override;
+  void SetJsonPath(const std::string& path) override;
+  void AddResourcePath(const std::string& path, int resource_id) override;
+  void SetDefaultResource(int resource_id) override;
+  void SetRequestFilter(
       const WebUIDataSource::HandleRequestCallback& callback) override;
-  virtual void DisableReplaceExistingSource() override;
-  virtual void DisableContentSecurityPolicy() override;
-  virtual void OverrideContentSecurityPolicyObjectSrc(
-      const std::string& data) override;
-  virtual void OverrideContentSecurityPolicyFrameSrc(
-      const std::string& data) override;
-  virtual void DisableDenyXFrameOptions() override;
+  void DisableReplaceExistingSource() override;
+  void DisableContentSecurityPolicy() override;
+  void OverrideContentSecurityPolicyObjectSrc(const std::string& data) override;
+  void OverrideContentSecurityPolicyFrameSrc(const std::string& data) override;
+  void DisableDenyXFrameOptions() override;
 
  protected:
-  virtual ~WebUIDataSourceImpl();
+  ~WebUIDataSourceImpl() override;
 
   // Completes a request by sending our dictionary of localized strings.
   void SendLocalizedStringsAsJSON(
diff --git a/content/browser/webui/web_ui_data_source_unittest.cc b/content/browser/webui/web_ui_data_source_unittest.cc
index 07e271f..60dcb64 100644
--- a/content/browser/webui/web_ui_data_source_unittest.cc
+++ b/content/browser/webui/web_ui_data_source_unittest.cc
@@ -24,16 +24,16 @@ const char kDummytResource[] = "<html>blah</html>";
 class TestClient : public TestContentClient {
  public:
   TestClient() {}
-  virtual ~TestClient() {}
+  ~TestClient() override {}
 
-  virtual base::string16 GetLocalizedString(int message_id) const override {
+  base::string16 GetLocalizedString(int message_id) const override {
     if (message_id == kDummyStringId)
       return base::UTF8ToUTF16(kDummyString);
     return base::string16();
 
   }
 
-  virtual base::RefCountedStaticMemory* GetDataResourceBytes(
+  base::RefCountedStaticMemory* GetDataResourceBytes(
       int resource_id) const override {
     base::RefCountedStaticMemory* bytes = NULL;
     if (resource_id == kDummyDefaultResourceId) {
diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h
index b399fce..c08db29 100644
--- a/content/browser/webui/web_ui_impl.h
+++ b/content/browser/webui/web_ui_impl.h
@@ -23,7 +23,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
                                  public base::SupportsWeakPtr<WebUIImpl> {
  public:
   explicit WebUIImpl(WebContents* contents);
-  virtual ~WebUIImpl();
+  ~WebUIImpl() override;
 
   // Called by WebContentsImpl when the RenderView is first created. This is
   // *not* called for every page load because in some cases
@@ -31,47 +31,45 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
   void RenderViewCreated(RenderViewHost* render_view_host);
 
   // WebUI implementation:
-  virtual WebContents* GetWebContents() const override;
-  virtual WebUIController* GetController() const override;
-  virtual void SetController(WebUIController* controller) override;
-  virtual float GetDeviceScaleFactor() const override;
-  virtual const base::string16& GetOverriddenTitle() const override;
-  virtual void OverrideTitle(const base::string16& title) override;
-  virtual ui::PageTransition GetLinkTransitionType() const override;
-  virtual void SetLinkTransitionType(ui::PageTransition type) override;
-  virtual int GetBindings() const override;
-  virtual void SetBindings(int bindings) override;
-  virtual void OverrideJavaScriptFrame(const std::string& frame_name) override;
-  virtual void AddMessageHandler(WebUIMessageHandler* handler) override;
+  WebContents* GetWebContents() const override;
+  WebUIController* GetController() const override;
+  void SetController(WebUIController* controller) override;
+  float GetDeviceScaleFactor() const override;
+  const base::string16& GetOverriddenTitle() const override;
+  void OverrideTitle(const base::string16& title) override;
+  ui::PageTransition GetLinkTransitionType() const override;
+  void SetLinkTransitionType(ui::PageTransition type) override;
+  int GetBindings() const override;
+  void SetBindings(int bindings) override;
+  void OverrideJavaScriptFrame(const std::string& frame_name) override;
+  void AddMessageHandler(WebUIMessageHandler* handler) override;
   typedef base::Callback<void(const base::ListValue*)> MessageCallback;
-  virtual void RegisterMessageCallback(
-      const std::string& message,
-      const MessageCallback& callback) override;
-  virtual void ProcessWebUIMessage(const GURL& source_url,
-                                   const std::string& message,
-                                   const base::ListValue& args) override;
-  virtual void CallJavascriptFunction(
-      const std::string& function_name) override;
-  virtual void CallJavascriptFunction(const std::string& function_name,
-                                      const base::Value& arg) override;
-  virtual void CallJavascriptFunction(const std::string& function_name,
-                                      const base::Value& arg1,
-                                      const base::Value& arg2) override;
-  virtual void CallJavascriptFunction(const std::string& function_name,
-                                      const base::Value& arg1,
-                                      const base::Value& arg2,
-                                      const base::Value& arg3) override;
-  virtual void CallJavascriptFunction(const std::string& function_name,
-                                      const base::Value& arg1,
-                                      const base::Value& arg2,
-                                      const base::Value& arg3,
-                                      const base::Value& arg4) override;
-  virtual void CallJavascriptFunction(
+  void RegisterMessageCallback(const std::string& message,
+                               const MessageCallback& callback) override;
+  void ProcessWebUIMessage(const GURL& source_url,
+                           const std::string& message,
+                           const base::ListValue& args) override;
+  void CallJavascriptFunction(const std::string& function_name) override;
+  void CallJavascriptFunction(const std::string& function_name,
+                              const base::Value& arg) override;
+  void CallJavascriptFunction(const std::string& function_name,
+                              const base::Value& arg1,
+                              const base::Value& arg2) override;
+  void CallJavascriptFunction(const std::string& function_name,
+                              const base::Value& arg1,
+                              const base::Value& arg2,
+                              const base::Value& arg3) override;
+  void CallJavascriptFunction(const std::string& function_name,
+                              const base::Value& arg1,
+                              const base::Value& arg2,
+                              const base::Value& arg3,
+                              const base::Value& arg4) override;
+  void CallJavascriptFunction(
       const std::string& function_name,
       const std::vector<const base::Value*>& args) override;
 
   // IPC::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   // IPC message handling.
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index c4908ef..83880d9 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -64,12 +64,10 @@ class BrowserTargetImpl : public mojo::InterfaceImpl<BrowserTarget> {
  public:
   explicit BrowserTargetImpl(base::RunLoop* run_loop) : run_loop_(run_loop) {}
 
-  virtual ~BrowserTargetImpl() {}
+  ~BrowserTargetImpl() override {}
 
   // mojo::InterfaceImpl<BrowserTarget> overrides:
-  virtual void PingResponse() override {
-    NOTREACHED();
-  }
+  void PingResponse() override { NOTREACHED(); }
 
  protected:
   base::RunLoop* run_loop_;
@@ -83,15 +81,13 @@ class PingBrowserTargetImpl : public BrowserTargetImpl {
   explicit PingBrowserTargetImpl(base::RunLoop* run_loop)
       : BrowserTargetImpl(run_loop) {}
 
-  virtual ~PingBrowserTargetImpl() {}
+  ~PingBrowserTargetImpl() override {}
 
   // mojo::InterfaceImpl<BrowserTarget> overrides:
-  virtual void OnConnectionEstablished() override {
-    client()->Ping();
-  }
+  void OnConnectionEstablished() override { client()->Ping(); }
 
   // Quit the RunLoop when called.
-  virtual void PingResponse() override {
+  void PingResponse() override {
     got_message = true;
     run_loop_->Quit();
   }
@@ -127,10 +123,10 @@ class PingTestWebUIController : public TestWebUIController {
    PingTestWebUIController(WebUI* web_ui, base::RunLoop* run_loop)
        : TestWebUIController(web_ui, run_loop) {
    }
-   virtual ~PingTestWebUIController() {}
+   ~PingTestWebUIController() override {}
 
   // WebUIController overrides:
-  virtual void RenderViewCreated(RenderViewHost* render_view_host) override {
+   void RenderViewCreated(RenderViewHost* render_view_host) override {
     render_view_host->GetMainFrame()->GetServiceRegistry()->
         AddService<BrowserTarget>(base::Bind(
             &PingTestWebUIController::CreateHandler, base::Unretained(this)));
@@ -152,22 +148,22 @@ class TestWebUIControllerFactory : public WebUIControllerFactory {
 
   void set_run_loop(base::RunLoop* run_loop) { run_loop_ = run_loop; }
 
-  virtual WebUIController* CreateWebUIControllerForURL(
-      WebUI* web_ui, const GURL& url) const override {
+  WebUIController* CreateWebUIControllerForURL(WebUI* web_ui,
+                                               const GURL& url) const override {
     if (url.query() == "ping")
       return new PingTestWebUIController(web_ui, run_loop_);
     return NULL;
   }
-  virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
-      const GURL& url) const override {
+  WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
+                             const GURL& url) const override {
     return reinterpret_cast<WebUI::TypeID>(1);
   }
-  virtual bool UseWebUIForURL(BrowserContext* browser_context,
-                              const GURL& url) const override {
+  bool UseWebUIForURL(BrowserContext* browser_context,
+                      const GURL& url) const override {
     return true;
   }
-  virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
-                                      const GURL& url) const override {
+  bool UseWebUIBindingsForURL(BrowserContext* browser_context,
+                              const GURL& url) const override {
     return true;
   }