Standardize usage of virtual/override/final in extensions/

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

BUG=417463
TBR=yoz@chromium.org

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

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

18 files changed, 87 insertions, 88 deletions

diff --git a/extensions/common/manifest_handlers/background_info.h b/extensions/common/manifest_handlers/background_info.h
index cc96a1a..87c2f12 100644
--- a/extensions/common/manifest_handlers/background_info.h
+++ b/extensions/common/manifest_handlers/background_info.h
@@ -18,7 +18,7 @@ namespace extensions {
 class BackgroundInfo : public Extension::ManifestData {
  public:
   BackgroundInfo();
-  virtual ~BackgroundInfo();
+  ~BackgroundInfo() override;
 
   static GURL GetBackgroundURL(const Extension* extension);
   static const std::vector<std::string>& GetBackgroundScripts(
@@ -81,16 +81,16 @@ class BackgroundInfo : public Extension::ManifestData {
 class BackgroundManifestHandler : public ManifestHandler {
  public:
   BackgroundManifestHandler();
-  virtual ~BackgroundManifestHandler();
+  ~BackgroundManifestHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool Validate(const Extension* extension,
-                        std::string* error,
-                        std::vector<InstallWarning>* warnings) const override;
-  virtual bool AlwaysParseForType(Manifest::Type type) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool Validate(const Extension* extension,
+                std::string* error,
+                std::vector<InstallWarning>* warnings) const override;
+  bool AlwaysParseForType(Manifest::Type type) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundManifestHandler);
 };
diff --git a/extensions/common/manifest_handlers/csp_info.h b/extensions/common/manifest_handlers/csp_info.h
index 1819a48..e1a8537 100644
--- a/extensions/common/manifest_handlers/csp_info.h
+++ b/extensions/common/manifest_handlers/csp_info.h
@@ -15,7 +15,7 @@ namespace extensions {
 // A structure to hold the Content-Security-Policy information.
 struct CSPInfo : public Extension::ManifestData {
   explicit CSPInfo(const std::string& security_policy);
-  virtual ~CSPInfo();
+  ~CSPInfo() override;
 
   // The Content-Security-Policy for an extension.  Extensions can use
   // Content-Security-Policies to mitigate cross-site scripting and other
@@ -36,13 +36,13 @@ struct CSPInfo : public Extension::ManifestData {
 class CSPHandler : public ManifestHandler {
  public:
   explicit CSPHandler(bool is_platform_app);
-  virtual ~CSPHandler();
+  ~CSPHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool AlwaysParseForType(Manifest::Type type) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool AlwaysParseForType(Manifest::Type type) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   bool is_platform_app_;
 
diff --git a/extensions/common/manifest_handlers/externally_connectable.h b/extensions/common/manifest_handlers/externally_connectable.h
index 4d6b2e78..67756d5 100644
--- a/extensions/common/manifest_handlers/externally_connectable.h
+++ b/extensions/common/manifest_handlers/externally_connectable.h
@@ -36,12 +36,12 @@ extern const char kErrorWildcardHostsNotAllowed[];
 class ExternallyConnectableHandler : public ManifestHandler {
  public:
   ExternallyConnectableHandler();
-  virtual ~ExternallyConnectableHandler();
+  ~ExternallyConnectableHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(ExternallyConnectableHandler);
 };
@@ -61,7 +61,7 @@ struct ExternallyConnectableInfo : public Extension::ManifestData {
       std::vector<InstallWarning>* install_warnings,
       base::string16* error);
 
-  virtual ~ExternallyConnectableInfo();
+  ~ExternallyConnectableInfo() override;
 
   // The URL patterns that are allowed to connect/sendMessage.
   const URLPatternSet matches;
diff --git a/extensions/common/manifest_handlers/file_handler_info.h b/extensions/common/manifest_handlers/file_handler_info.h
index 37b3be2..02012fe 100644
--- a/extensions/common/manifest_handlers/file_handler_info.h
+++ b/extensions/common/manifest_handlers/file_handler_info.h
@@ -32,7 +32,7 @@ typedef std::vector<FileHandlerInfo> FileHandlersInfo;
 
 struct FileHandlers : public Extension::ManifestData {
   FileHandlers();
-  virtual ~FileHandlers();
+  ~FileHandlers() override;
 
   FileHandlersInfo file_handlers;
 
@@ -43,12 +43,12 @@ struct FileHandlers : public Extension::ManifestData {
 class FileHandlersParser : public ManifestHandler {
  public:
   FileHandlersParser();
-  virtual ~FileHandlersParser();
+  ~FileHandlersParser() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(FileHandlersParser);
 };
diff --git a/extensions/common/manifest_handlers/icons_handler.h b/extensions/common/manifest_handlers/icons_handler.h
index 7fc0c30..5c9186d 100644
--- a/extensions/common/manifest_handlers/icons_handler.h
+++ b/extensions/common/manifest_handlers/icons_handler.h
@@ -37,15 +37,15 @@ struct IconsInfo : public Extension::ManifestData {
 class IconsHandler : public ManifestHandler {
  public:
   IconsHandler();
-  virtual ~IconsHandler();
+  ~IconsHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool Validate(const Extension* extension,
-                        std::string* error,
-                        std::vector<InstallWarning>* warnings) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool Validate(const Extension* extension,
+                std::string* error,
+                std::vector<InstallWarning>* warnings) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 };
 
 }  // namespace extensions
diff --git a/extensions/common/manifest_handlers/incognito_info.h b/extensions/common/manifest_handlers/incognito_info.h
index 2b81b4d..0b7a870 100644
--- a/extensions/common/manifest_handlers/incognito_info.h
+++ b/extensions/common/manifest_handlers/incognito_info.h
@@ -13,7 +13,7 @@ namespace extensions {
 
 struct IncognitoInfo : public Extension::ManifestData {
   explicit IncognitoInfo(bool split_mode);
-  virtual ~IncognitoInfo();
+  ~IncognitoInfo() override;
 
   // If true, a separate process will be used for the extension in incognito
   // mode.
@@ -27,13 +27,13 @@ struct IncognitoInfo : public Extension::ManifestData {
 class IncognitoHandler : public ManifestHandler {
  public:
   IncognitoHandler();
-  virtual ~IncognitoHandler();
+  ~IncognitoHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool AlwaysParseForType(Manifest::Type type) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool AlwaysParseForType(Manifest::Type type) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(IncognitoHandler);
 };
diff --git a/extensions/common/manifest_handlers/kiosk_mode_info.h b/extensions/common/manifest_handlers/kiosk_mode_info.h
index c0e2325..cf02b0d 100644
--- a/extensions/common/manifest_handlers/kiosk_mode_info.h
+++ b/extensions/common/manifest_handlers/kiosk_mode_info.h
@@ -23,7 +23,7 @@ struct KioskModeInfo : public Extension::ManifestData {
   };
 
   explicit KioskModeInfo(KioskStatus kiosk_status);
-  virtual ~KioskModeInfo();
+  ~KioskModeInfo() override;
 
   KioskStatus kiosk_status;
 
@@ -38,12 +38,12 @@ struct KioskModeInfo : public Extension::ManifestData {
 class KioskModeHandler : public ManifestHandler {
  public:
   KioskModeHandler();
-  virtual ~KioskModeHandler();
+  ~KioskModeHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   std::vector<std::string> supported_keys_;
 
diff --git a/extensions/common/manifest_handlers/launcher_page_info.h b/extensions/common/manifest_handlers/launcher_page_info.h
index e9f2e9d..96fe1b4 100644
--- a/extensions/common/manifest_handlers/launcher_page_info.h
+++ b/extensions/common/manifest_handlers/launcher_page_info.h
@@ -23,19 +23,19 @@ struct LauncherPageInfo : public Extension::ManifestData {
 class LauncherPageHandler : public ManifestHandler {
  public:
   LauncherPageHandler();
-  virtual ~LauncherPageHandler();
+  ~LauncherPageHandler() override;
 
   // Gets the LauncherPageInfo for a given |extension|.
   static LauncherPageInfo* GetInfo(const Extension* extension);
 
   // ManifestHandler overrides:
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool Validate(const Extension* extension,
-                        std::string* error,
-                        std::vector<InstallWarning>* warnings) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool Validate(const Extension* extension,
+                std::string* error,
+                std::vector<InstallWarning>* warnings) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherPageHandler);
 };
diff --git a/extensions/common/manifest_handlers/nacl_modules_handler.h b/extensions/common/manifest_handlers/nacl_modules_handler.h
index 0eff364..4830bfa 100644
--- a/extensions/common/manifest_handlers/nacl_modules_handler.h
+++ b/extensions/common/manifest_handlers/nacl_modules_handler.h
@@ -28,12 +28,12 @@ struct NaClModuleInfo {
 class NaClModulesHandler : public ManifestHandler {
  public:
   NaClModulesHandler();
-  virtual ~NaClModulesHandler();
+  ~NaClModulesHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 };
 
 }  // namespace extensions
diff --git a/extensions/common/manifest_handlers/oauth2_manifest_handler.h b/extensions/common/manifest_handlers/oauth2_manifest_handler.h
index 8939e88..36aff05 100644
--- a/extensions/common/manifest_handlers/oauth2_manifest_handler.h
+++ b/extensions/common/manifest_handlers/oauth2_manifest_handler.h
@@ -17,7 +17,7 @@ namespace extensions {
 // OAuth2 info included in the extension.
 struct OAuth2Info : public Extension::ManifestData {
   OAuth2Info();
-  virtual ~OAuth2Info();
+  ~OAuth2Info() override;
 
   std::string client_id;
   std::vector<std::string> scopes;
@@ -32,13 +32,12 @@ struct OAuth2Info : public Extension::ManifestData {
 class OAuth2ManifestHandler : public ManifestHandler {
  public:
   OAuth2ManifestHandler();
-  virtual ~OAuth2ManifestHandler();
+  ~OAuth2ManifestHandler() override;
 
-  virtual bool Parse(Extension* extension,
-                     base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2ManifestHandler);
 };
diff --git a/extensions/common/manifest_handlers/offline_enabled_info.h b/extensions/common/manifest_handlers/offline_enabled_info.h
index 6a1500f..e1ba4072 100644
--- a/extensions/common/manifest_handlers/offline_enabled_info.h
+++ b/extensions/common/manifest_handlers/offline_enabled_info.h
@@ -16,7 +16,7 @@ namespace extensions {
 
 struct OfflineEnabledInfo : public Extension::ManifestData {
   explicit OfflineEnabledInfo(bool offline_enabled);
-  virtual ~OfflineEnabledInfo();
+  ~OfflineEnabledInfo() override;
 
   // Whether the extension or app should be enabled when offline.
   // Defaults to false, except for platform apps which are offline by default.
@@ -29,13 +29,13 @@ struct OfflineEnabledInfo : public Extension::ManifestData {
 class OfflineEnabledHandler : public ManifestHandler {
  public:
   OfflineEnabledHandler();
-  virtual ~OfflineEnabledHandler();
+  ~OfflineEnabledHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool AlwaysParseForType(Manifest::Type type) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool AlwaysParseForType(Manifest::Type type) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(OfflineEnabledHandler);
 };
diff --git a/extensions/common/manifest_handlers/options_page_info.h b/extensions/common/manifest_handlers/options_page_info.h
index 4211656..b448f6f 100644
--- a/extensions/common/manifest_handlers/options_page_info.h
+++ b/extensions/common/manifest_handlers/options_page_info.h
@@ -25,7 +25,7 @@ class OptionsPageInfo : public Extension::ManifestData {
   OptionsPageInfo(const GURL& options_page,
                   bool chrome_styles,
                   bool open_in_tab);
-  virtual ~OptionsPageInfo();
+  ~OptionsPageInfo() override;
 
   // Returns the URL to the given extension's options page. This method supports
   // both the "options_ui.page" field and the legacy "options_page" field. If
@@ -69,15 +69,15 @@ class OptionsPageInfo : public Extension::ManifestData {
 class OptionsPageManifestHandler : public ManifestHandler {
  public:
   OptionsPageManifestHandler();
-  virtual ~OptionsPageManifestHandler();
+  ~OptionsPageManifestHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool Validate(const Extension* extension,
-                        std::string* error,
-                        std::vector<InstallWarning>* warnings) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool Validate(const Extension* extension,
+                std::string* error,
+                std::vector<InstallWarning>* warnings) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(OptionsPageManifestHandler);
 };
diff --git a/extensions/common/manifest_handlers/permissions_parser.cc b/extensions/common/manifest_handlers/permissions_parser.cc
index 4e12112..0b08ef9 100644
--- a/extensions/common/manifest_handlers/permissions_parser.cc
+++ b/extensions/common/manifest_handlers/permissions_parser.cc
@@ -33,7 +33,7 @@ namespace errors = manifest_errors;
 
 struct ManifestPermissions : public Extension::ManifestData {
   ManifestPermissions(scoped_refptr<const PermissionSet> permissions);
-  virtual ~ManifestPermissions();
+  ~ManifestPermissions() override;
 
   scoped_refptr<const PermissionSet> permissions;
 };
diff --git a/extensions/common/manifest_handlers/requirements_info.h b/extensions/common/manifest_handlers/requirements_info.h
index 18d4df0..ebcb39f 100644
--- a/extensions/common/manifest_handlers/requirements_info.h
+++ b/extensions/common/manifest_handlers/requirements_info.h
@@ -17,7 +17,7 @@ namespace extensions {
 // Declared requirements for the extension.
 struct RequirementsInfo : public Extension::ManifestData {
   explicit RequirementsInfo(const Manifest* manifest);
-  virtual ~RequirementsInfo();
+  ~RequirementsInfo() override;
 
   bool webgl;
   bool npapi;
@@ -30,16 +30,16 @@ struct RequirementsInfo : public Extension::ManifestData {
 class RequirementsHandler : public ManifestHandler {
  public:
   RequirementsHandler();
-  virtual ~RequirementsHandler();
+  ~RequirementsHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
-  virtual bool AlwaysParseForType(Manifest::Type type) const override;
+  bool AlwaysParseForType(Manifest::Type type) const override;
 
-  virtual const std::vector<std::string> PrerequisiteKeys() const override;
+  const std::vector<std::string> PrerequisiteKeys() const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(RequirementsHandler);
 };
diff --git a/extensions/common/manifest_handlers/sandboxed_page_info.h b/extensions/common/manifest_handlers/sandboxed_page_info.h
index 83e3fa9..3dd0ae7 100644
--- a/extensions/common/manifest_handlers/sandboxed_page_info.h
+++ b/extensions/common/manifest_handlers/sandboxed_page_info.h
@@ -16,7 +16,7 @@ namespace extensions {
 struct SandboxedPageInfo : public Extension::ManifestData {
  public:
   SandboxedPageInfo();
-  virtual ~SandboxedPageInfo();
+  ~SandboxedPageInfo() override;
 
   // Returns the extension's Content Security Policy for the sandboxed pages.
   static const std::string& GetContentSecurityPolicy(
@@ -42,12 +42,12 @@ struct SandboxedPageInfo : public Extension::ManifestData {
 class SandboxedPageHandler : public ManifestHandler {
  public:
   SandboxedPageHandler();
-  virtual ~SandboxedPageHandler();
+  ~SandboxedPageHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 };
 
 }  // namespace extensions
diff --git a/extensions/common/manifest_handlers/shared_module_info.h b/extensions/common/manifest_handlers/shared_module_info.h
index 5f67821d..14403cf 100644
--- a/extensions/common/manifest_handlers/shared_module_info.h
+++ b/extensions/common/manifest_handlers/shared_module_info.h
@@ -17,7 +17,7 @@ namespace extensions {
 class SharedModuleInfo : public Extension::ManifestData {
  public:
   SharedModuleInfo();
-  virtual ~SharedModuleInfo();
+  ~SharedModuleInfo() override;
 
   bool Parse(const Extension* extension, base::string16* error);
 
@@ -58,15 +58,15 @@ class SharedModuleInfo : public Extension::ManifestData {
 class SharedModuleHandler : public ManifestHandler {
  public:
   SharedModuleHandler();
-  virtual ~SharedModuleHandler();
+  ~SharedModuleHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
-  virtual bool Validate(const Extension* extension,
-                        std::string* error,
-                        std::vector<InstallWarning>* warnings) const override;
+  bool Parse(Extension* extension, base::string16* error) override;
+  bool Validate(const Extension* extension,
+                std::string* error,
+                std::vector<InstallWarning>* warnings) const override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 };
 
 }  // namespace extensions
diff --git a/extensions/common/manifest_handlers/web_accessible_resources_info.h b/extensions/common/manifest_handlers/web_accessible_resources_info.h
index eea1cd3..6e6143d 100644
--- a/extensions/common/manifest_handlers/web_accessible_resources_info.h
+++ b/extensions/common/manifest_handlers/web_accessible_resources_info.h
@@ -18,7 +18,7 @@ namespace extensions {
 struct WebAccessibleResourcesInfo : public Extension::ManifestData {
   // Define out of line constructor/destructor to please Clang.
   WebAccessibleResourcesInfo();
-  virtual ~WebAccessibleResourcesInfo();
+  ~WebAccessibleResourcesInfo() override;
 
   // Returns true if the specified resource is web accessible.
   static bool IsResourceWebAccessible(const Extension* extension,
@@ -35,12 +35,12 @@ struct WebAccessibleResourcesInfo : public Extension::ManifestData {
 class WebAccessibleResourcesHandler : public ManifestHandler {
  public:
   WebAccessibleResourcesHandler();
-  virtual ~WebAccessibleResourcesHandler();
+  ~WebAccessibleResourcesHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(WebAccessibleResourcesHandler);
 };
diff --git a/extensions/common/manifest_handlers/webview_info.h b/extensions/common/manifest_handlers/webview_info.h
index bbd9655..2cd501e 100644
--- a/extensions/common/manifest_handlers/webview_info.h
+++ b/extensions/common/manifest_handlers/webview_info.h
@@ -22,7 +22,7 @@ class WebviewInfo : public Extension::ManifestData {
  public:
   // Define out of line constructor/destructor to please Clang.
   WebviewInfo();
-  virtual ~WebviewInfo();
+  ~WebviewInfo() override;
 
   // Returns true if the specified resource is web accessible.
   static bool IsResourceWebviewAccessible(const Extension* extension,
@@ -39,12 +39,12 @@ class WebviewInfo : public Extension::ManifestData {
 class WebviewHandler : public ManifestHandler {
  public:
   WebviewHandler();
-  virtual ~WebviewHandler();
+  ~WebviewHandler() override;
 
-  virtual bool Parse(Extension* extension, base::string16* error) override;
+  bool Parse(Extension* extension, base::string16* error) override;
 
  private:
-  virtual const std::vector<std::string> Keys() const override;
+  const std::vector<std::string> Keys() const override;
 
   DISALLOW_COPY_AND_ASSIGN(WebviewHandler);
 };