Standardize usage of virtual/override/final in chrome/browser/plugins

The Google C++ style guide states:

  Explicitly annotate overrides of virtual functions or virtual
  destructors with an override or (less frequently) final specifier.
  Older (pre-C++11) code will use the virtual keyword as an inferior
  alternative annotation. For clarity, use exactly one of override,
  final, or virtual when declaring an override.

To better conform to these guidelines, the following constructs have
been rewritten:

- if a base class has a virtual destructor, then:
    virtual ~Foo();                   ->  ~Foo() override;
- virtual void Foo() override;        ->  void Foo() override;
- virtual void Foo() override final;  ->  void Foo() final;

This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.

BUG=417463
R=bauerb@chromium.org

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

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

chrome/browser/plugins/chrome_plugin_service_filter.h

@@ -71,19 +71,17 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
   bool IsPluginRestricted(const base::FilePath& plugin_path);
 
   // PluginServiceFilter implementation:
-  virtual bool IsPluginAvailable(
-      int render_process_id,
-      int render_frame_id,
-      const void* context,
-      const GURL& url,
-      const GURL& policy_url,
-      content::WebPluginInfo* plugin) override;
+  bool IsPluginAvailable(int render_process_id,
+                         int render_frame_id,
+                         const void* context,
+                         const GURL& url,
+                         const GURL& policy_url,
+                         content::WebPluginInfo* plugin) override;
 
   // CanLoadPlugin always grants permission to the browser
   // (render_process_id == 0)
-  virtual bool CanLoadPlugin(
-      int render_process_id,
-      const base::FilePath& path) override;
+  bool CanLoadPlugin(int render_process_id,
+                     const base::FilePath& path) override;
 
  private:
   friend struct DefaultSingletonTraits<ChromePluginServiceFilter>;
@@ -106,12 +104,12 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
   };
 
   ChromePluginServiceFilter();
-  virtual ~ChromePluginServiceFilter();
+  ~ChromePluginServiceFilter() override;
 
   // content::NotificationObserver implementation:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   ProcessDetails* GetOrRegisterProcess(int render_process_id);
   const ProcessDetails* GetProcess(int render_process_id) const;

chrome/browser/plugins/plugin_info_message_filter.h

@@ -78,15 +78,15 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
   PluginInfoMessageFilter(int render_process_id, Profile* profile);
 
   // content::BrowserMessageFilter methods:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void OnDestruct() const override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnDestruct() const override;
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<PluginInfoMessageFilter>;
 
-  virtual ~PluginInfoMessageFilter();
+  ~PluginInfoMessageFilter() override;
 
   void OnGetPluginInfo(int render_frame_id,
                        const GURL& url,

chrome/browser/plugins/plugin_info_message_filter_unittest.cc

@@ -34,17 +34,17 @@ void PluginsLoaded(const base::Closure& callback,
 class FakePluginServiceFilter : public content::PluginServiceFilter {
  public:
   FakePluginServiceFilter() {}
-  virtual ~FakePluginServiceFilter() {}
+  ~FakePluginServiceFilter() override {}
 
-  virtual bool IsPluginAvailable(int render_process_id,
-                                 int render_view_id,
-                                 const void* context,
-                                 const GURL& url,
-                                 const GURL& policy_url,
-                                 content::WebPluginInfo* plugin) override;
+  bool IsPluginAvailable(int render_process_id,
+                         int render_view_id,
+                         const void* context,
+                         const GURL& url,
+                         const GURL& policy_url,
+                         content::WebPluginInfo* plugin) override;
 
-  virtual bool CanLoadPlugin(int render_process_id,
-                             const base::FilePath& path) override;
+  bool CanLoadPlugin(int render_process_id,
+                     const base::FilePath& path) override;
 
   void set_plugin_enabled(const base::FilePath& plugin_path, bool enabled) {
     plugin_state_[plugin_path] = enabled;

chrome/browser/plugins/plugin_infobar_delegates.h

@@ -25,10 +25,10 @@ class WebContents;
 class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  protected:
   explicit PluginInfoBarDelegate(const std::string& identifier);
-  virtual ~PluginInfoBarDelegate();
+  ~PluginInfoBarDelegate() override;
 
   // ConfirmInfoBarDelegate:
-  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
+  bool LinkClicked(WindowOpenDisposition disposition) override;
 
   virtual std::string GetLearnMoreURL() const = 0;
 
@@ -36,8 +36,8 @@ class PluginInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  private:
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const override;
-  virtual base::string16 GetLinkText() const override;
+  int GetIconID() const override;
+  base::string16 GetLinkText() const override;
 
   std::string identifier_;
 
@@ -58,16 +58,16 @@ class UnauthorizedPluginInfoBarDelegate : public PluginInfoBarDelegate {
   UnauthorizedPluginInfoBarDelegate(HostContentSettingsMap* content_settings,
                                     const base::string16& name,
                                     const std::string& identifier);
-  virtual ~UnauthorizedPluginInfoBarDelegate();
+  ~UnauthorizedPluginInfoBarDelegate() override;
 
   // PluginInfoBarDelegate:
-  virtual base::string16 GetMessageText() const override;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
-  virtual bool Accept() override;
-  virtual bool Cancel() override;
-  virtual void InfoBarDismissed() override;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
-  virtual std::string GetLearnMoreURL() const override;
+  base::string16 GetMessageText() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  bool Cancel() override;
+  void InfoBarDismissed() override;
+  bool LinkClicked(WindowOpenDisposition disposition) override;
+  std::string GetLearnMoreURL() const override;
 
   HostContentSettingsMap* content_settings_;
   base::string16 name_;
@@ -90,25 +90,25 @@ class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate,
   OutdatedPluginInfoBarDelegate(PluginInstaller* installer,
                                 scoped_ptr<PluginMetadata> metadata,
                                 const base::string16& message);
-  virtual ~OutdatedPluginInfoBarDelegate();
+  ~OutdatedPluginInfoBarDelegate() override;
 
   // PluginInfoBarDelegate:
-  virtual base::string16 GetMessageText() const override;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
-  virtual bool Accept() override;
-  virtual bool Cancel() override;
-  virtual void InfoBarDismissed() override;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
-  virtual std::string GetLearnMoreURL() const override;
+  base::string16 GetMessageText() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  bool Cancel() override;
+  void InfoBarDismissed() override;
+  bool LinkClicked(WindowOpenDisposition disposition) override;
+  std::string GetLearnMoreURL() const override;
 
   // PluginInstallerObserver:
-  virtual void DownloadStarted() override;
-  virtual void DownloadError(const std::string& message) override;
-  virtual void DownloadCancelled() override;
-  virtual void DownloadFinished() override;
+  void DownloadStarted() override;
+  void DownloadError(const std::string& message) override;
+  void DownloadCancelled() override;
+  void DownloadFinished() override;
 
   // WeakPluginInstallerObserver:
-  virtual void OnlyWeakObserversLeft() override;
+  void OnlyWeakObserversLeft() override;
 
   // Replaces this infobar with one showing |message|. The new infobar will
   // not have any buttons (and not call the callback).
@@ -151,25 +151,25 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate,
                                  const InstallCallback& callback,
                                  bool new_install,
                                  const base::string16& message);
-  virtual ~PluginInstallerInfoBarDelegate();
+  ~PluginInstallerInfoBarDelegate() override;
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const override;
-  virtual base::string16 GetMessageText() const override;
-  virtual int GetButtons() const override;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
-  virtual bool Accept() override;
-  virtual base::string16 GetLinkText() const override;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
+  int GetIconID() const override;
+  base::string16 GetMessageText() const override;
+  int GetButtons() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  base::string16 GetLinkText() const override;
+  bool LinkClicked(WindowOpenDisposition disposition) override;
 
   // PluginInstallerObserver:
-  virtual void DownloadStarted() override;
-  virtual void DownloadError(const std::string& message) override;
-  virtual void DownloadCancelled() override;
-  virtual void DownloadFinished() override;
+  void DownloadStarted() override;
+  void DownloadError(const std::string& message) override;
+  void DownloadCancelled() override;
+  void DownloadFinished() override;
 
   // WeakPluginInstallerObserver:
-  virtual void OnlyWeakObserversLeft() override;
+  void OnlyWeakObserversLeft() override;
 
   // Replaces this infobar with one showing |message|. The new infobar will
   // not have any buttons (and not call the callback).

chrome/browser/plugins/plugin_installer.h

@@ -31,10 +31,10 @@ class PluginInstaller : public content::DownloadItem::Observer {
   };
 
   PluginInstaller();
-  virtual ~PluginInstaller();
+  ~PluginInstaller() override;
 
-  virtual void OnDownloadUpdated(content::DownloadItem* download) override;
-  virtual void OnDownloadDestroyed(content::DownloadItem* download) override;
+  void OnDownloadUpdated(content::DownloadItem* download) override;
+  void OnDownloadDestroyed(content::DownloadItem* download) override;
 
   void AddObserver(PluginInstallerObserver* observer);
   void RemoveObserver(PluginInstallerObserver* observer);

chrome/browser/plugins/plugin_installer_observer.h

@@ -35,7 +35,7 @@ class PluginInstallerObserver {
 class WeakPluginInstallerObserver : public PluginInstallerObserver {
  public:
   explicit WeakPluginInstallerObserver(PluginInstaller* installer);
-  virtual ~WeakPluginInstallerObserver();
+  ~WeakPluginInstallerObserver() override;
 
  private:
   friend class PluginInstaller;

chrome/browser/plugins/plugin_installer_unittest.cc

@@ -68,12 +68,12 @@ class TestPluginInstallerObserver : public PluginInstallerObserver {
   const std::string& download_error() const { return download_error_; }
 
  private:
-  virtual void DownloadStarted() override { download_started_ = true; }
-  virtual void DownloadFinished() override { download_finished_ = true; }
-  virtual void DownloadError(const std::string& message) override {
+  void DownloadStarted() override { download_started_ = true; }
+  void DownloadFinished() override { download_finished_ = true; }
+  void DownloadError(const std::string& message) override {
     download_error_ = message;
   }
-  virtual void DownloadCancelled() override { download_cancelled_ = true; }
+  void DownloadCancelled() override { download_cancelled_ = true; }
 
   bool download_started_;
   bool download_finished_;

chrome/browser/plugins/plugin_observer.cc

@@ -64,15 +64,15 @@ class ConfirmInstallDialogDelegate : public TabModalConfirmDialogDelegate,
                                scoped_ptr<PluginMetadata> plugin_metadata);
 
   // TabModalConfirmDialogDelegate methods:
-  virtual base::string16 GetTitle() override;
-  virtual base::string16 GetDialogMessage() override;
-  virtual base::string16 GetAcceptButtonTitle() override;
-  virtual void OnAccepted() override;
-  virtual void OnCanceled() override;
+  base::string16 GetTitle() override;
+  base::string16 GetDialogMessage() override;
+  base::string16 GetAcceptButtonTitle() override;
+  void OnAccepted() override;
+  void OnCanceled() override;
 
   // WeakPluginInstallerObserver methods:
-  virtual void DownloadStarted() override;
-  virtual void OnlyWeakObserversLeft() override;
+  void DownloadStarted() override;
+  void OnlyWeakObserversLeft() override;
 
  private:
   content::WebContents* web_contents_;
@@ -131,14 +131,14 @@ class ReloadPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  private:
   ReloadPluginInfoBarDelegate(content::NavigationController* controller,
                               const base::string16& message);
-  virtual ~ReloadPluginInfoBarDelegate();
+  ~ReloadPluginInfoBarDelegate() override;
 
   // ConfirmInfobarDelegate:
-  virtual int GetIconID() const override;
-  virtual base::string16 GetMessageText() const override;
-  virtual int GetButtons() const override;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
-  virtual bool Accept() override;
+  int GetIconID() const override;
+  base::string16 GetMessageText() const override;
+  int GetButtons() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
 
   content::NavigationController* controller_;
   base::string16 message_;
@@ -214,19 +214,19 @@ class PluginObserver::PluginPlaceholderHost : public PluginInstallerObserver {
   }
 
   // PluginInstallerObserver methods:
-  virtual void DownloadStarted() override {
+  void DownloadStarted() override {
     observer_->Send(new ChromeViewMsg_StartedDownloadingPlugin(routing_id_));
   }
 
-  virtual void DownloadError(const std::string& msg) override {
+  void DownloadError(const std::string& msg) override {
     observer_->Send(new ChromeViewMsg_ErrorDownloadingPlugin(routing_id_, msg));
   }
 
-  virtual void DownloadCancelled() override {
+  void DownloadCancelled() override {
     observer_->Send(new ChromeViewMsg_CancelledDownloadingPlugin(routing_id_));
   }
 
-  virtual void DownloadFinished() override {
+  void DownloadFinished() override {
     observer_->Send(new ChromeViewMsg_FinishedDownloadingPlugin(routing_id_));
   }
 

chrome/browser/plugins/plugin_observer.h

@@ -34,17 +34,15 @@ class InfoBarDelegate;
 class PluginObserver : public content::WebContentsObserver,
                        public content::WebContentsUserData<PluginObserver> {
  public:
-  virtual ~PluginObserver();
+  ~PluginObserver() override;
 
   // content::WebContentsObserver implementation.
-  virtual void RenderFrameCreated(
-      content::RenderFrameHost* render_frame_host) override;
-  virtual void PluginCrashed(const base::FilePath& plugin_path,
-                             base::ProcessId plugin_pid) override;
-  virtual bool OnMessageReceived(
-      const IPC::Message& message,
-      content::RenderFrameHost* render_frame_host) override;
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
+  void PluginCrashed(const base::FilePath& plugin_path,
+                     base::ProcessId plugin_pid) override;
+  bool OnMessageReceived(const IPC::Message& message,
+                         content::RenderFrameHost* render_frame_host) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   explicit PluginObserver(content::WebContents* web_contents);

chrome/browser/plugins/plugin_prefs.h

@@ -75,7 +75,7 @@ class PluginPrefs : public RefcountedKeyedService {
   void set_profile(Profile* profile) { profile_ = profile; }
 
   // RefCountedProfileKeyedBase method override.
-  virtual void ShutdownOnUIThread() override;
+  void ShutdownOnUIThread() override;
 
  private:
   friend class base::RefCountedThreadSafe<PluginPrefs>;
@@ -100,7 +100,7 @@ class PluginPrefs : public RefcountedKeyedService {
     std::map<base::FilePath, bool> state_;
   };
 
-  virtual ~PluginPrefs();
+  ~PluginPrefs() override;
 
   // Called to update one of the policy_xyz patterns below when a
   // preference changes.

chrome/browser/plugins/plugin_prefs_factory.h

@@ -27,19 +27,19 @@ class PluginPrefsFactory : public RefcountedBrowserContextKeyedServiceFactory {
       content::BrowserContext* profile);
 
   PluginPrefsFactory();
-  virtual ~PluginPrefsFactory();
+  ~PluginPrefsFactory() override;
 
   // RefcountedBrowserContextKeyedServiceFactory methods:
-  virtual scoped_refptr<RefcountedKeyedService> BuildServiceInstanceFor(
+  scoped_refptr<RefcountedKeyedService> BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 
   // BrowserContextKeyedServiceFactory methods:
-  virtual void RegisterProfilePrefs(
+  void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) override;
-  virtual content::BrowserContext* GetBrowserContextToUse(
+  content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
-  virtual bool ServiceIsNULLWhileTesting() const override;
-  virtual bool ServiceIsCreatedWithBrowserContext() const override;
+  bool ServiceIsNULLWhileTesting() const override;
+  bool ServiceIsCreatedWithBrowserContext() const override;
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_FACTORY_H_

chrome/browser/plugins/plugin_status_pref_setter.h

@@ -28,7 +28,7 @@ struct WebPluginInfo;
 class PluginStatusPrefSetter : public content::NotificationObserver {
  public:
   PluginStatusPrefSetter();
-  virtual ~PluginStatusPrefSetter();
+  ~PluginStatusPrefSetter() override;
 
   // Binds the preferences in the profile's PrefService, notifying |observer| if
   // any value changes.
@@ -46,9 +46,9 @@ class PluginStatusPrefSetter : public content::NotificationObserver {
   }
 
   // content::NotificationObserver methods:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
  private:
   void StartUpdate();

chrome/browser/plugins/plugins_resource_service.h

@@ -21,10 +21,10 @@ class PluginsResourceService : public WebResourceService {
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
  private:
-  virtual ~PluginsResourceService();
+  ~PluginsResourceService() override;
 
   // WebResourceService override to process the parsed information.
-  virtual void Unpack(const base::DictionaryValue& parsed_json) override;
+  void Unpack(const base::DictionaryValue& parsed_json) override;
 
   DISALLOW_COPY_AND_ASSIGN(PluginsResourceService);
 };