Virtual destructors should have virtual keyword.

Make sure user-declared virtual destructors always have the virtual keyword.
The Clang style-check plugin will check for this soon.

No functionality change: virtual is only added
to destructors that are already implicitly virtual.

Also fix a couple of in-line destructor definitions.

BUG=83408
TEST=none

Review URL: http://codereview.chromium.org/7064033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86587 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 69 insertions, 69 deletions

diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 1759517..88b6052 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -143,7 +143,7 @@ class CrxInstaller
   }
 
  private:
-  ~CrxInstaller();
+  virtual ~CrxInstaller();
 
   // Converts the source user script to an extension.
   void ConvertUserScriptOnFileThread();
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index 1bab742..a1878cb 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -38,7 +38,7 @@ class ExtensionApiTest : public ExtensionBrowserTest {
   class ResultCatcher : public NotificationObserver {
    public:
     ResultCatcher();
-    ~ResultCatcher();
+    virtual ~ResultCatcher();
 
     // Pumps the UI loop until a notification is received that an API test
     // succeeded or failed. Returns true if the test succeeded, false otherwise.
diff --git a/chrome/browser/extensions/extension_browser_actions_api.h b/chrome/browser/extensions/extension_browser_actions_api.h
index c6b2e24..ad7b706 100644
--- a/chrome/browser/extensions/extension_browser_actions_api.h
+++ b/chrome/browser/extensions/extension_browser_actions_api.h
@@ -37,28 +37,28 @@ class BrowserActionFunction : public SyncExtensionFunction {
 
 // Implement chrome.browserAction.setIcon().
 class BrowserActionSetIconFunction : public BrowserActionFunction {
-  ~BrowserActionSetIconFunction() {}
+  virtual ~BrowserActionSetIconFunction() {}
   virtual bool RunBrowserAction();
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setIcon")
 };
 
 // Implement chrome.browserAction.setTitle().
 class BrowserActionSetTitleFunction : public BrowserActionFunction {
-  ~BrowserActionSetTitleFunction() {}
+  virtual ~BrowserActionSetTitleFunction() {}
   virtual bool RunBrowserAction();
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setTitle")
 };
 
 // Implement chrome.browserActions.setPopup().
 class BrowserActionSetPopupFunction : public BrowserActionFunction {
-  ~BrowserActionSetPopupFunction() {}
+  virtual ~BrowserActionSetPopupFunction() {}
   virtual bool RunBrowserAction();
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setPopup")
 };
 
 // Implement chrome.browserAction.setBadgeText().
 class BrowserActionSetBadgeTextFunction : public BrowserActionFunction {
-  ~BrowserActionSetBadgeTextFunction() {}
+  virtual ~BrowserActionSetBadgeTextFunction() {}
   virtual bool RunBrowserAction();
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setBadgeText")
 };
@@ -66,7 +66,7 @@ class BrowserActionSetBadgeTextFunction : public BrowserActionFunction {
 // Implement chrome.browserAction.setBadgeBackgroundColor().
 class BrowserActionSetBadgeBackgroundColorFunction
     : public BrowserActionFunction {
-  ~BrowserActionSetBadgeBackgroundColorFunction() {}
+  virtual ~BrowserActionSetBadgeBackgroundColorFunction() {}
   virtual bool RunBrowserAction();
   DECLARE_EXTENSION_FUNCTION_NAME("browserAction.setBadgeBackgroundColor")
 };
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index 8939f2d..8e352a1 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -36,7 +36,7 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
                                     public NotificationObserver {
  public:
   explicit ExtensionBrowserEventRouter(Profile* profile);
-  ~ExtensionBrowserEventRouter();
+  virtual ~ExtensionBrowserEventRouter();
 
   // Must be called once. Subsequent calls have no effect.
   void Init();
diff --git a/chrome/browser/extensions/extension_context_menu_api.h b/chrome/browser/extensions/extension_context_menu_api.h
index 5562bc7..a7b1694 100644
--- a/chrome/browser/extensions/extension_context_menu_api.h
+++ b/chrome/browser/extensions/extension_context_menu_api.h
@@ -15,7 +15,7 @@ class ExtensionMenuItem;
 
 class ExtensionContextMenuFunction : public SyncExtensionFunction {
  public:
-  ~ExtensionContextMenuFunction() {}
+  virtual ~ExtensionContextMenuFunction() {}
 
  protected:
   // Helper function to read and parse a list of menu item contexts.
@@ -60,25 +60,25 @@ class ExtensionContextMenuFunction : public SyncExtensionFunction {
 };
 
 class CreateContextMenuFunction : public ExtensionContextMenuFunction {
-  ~CreateContextMenuFunction() {}
+  virtual ~CreateContextMenuFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.create")
 };
 
 class UpdateContextMenuFunction : public ExtensionContextMenuFunction {
-  ~UpdateContextMenuFunction() {}
+  virtual ~UpdateContextMenuFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.update")
 };
 
 class RemoveContextMenuFunction : public ExtensionContextMenuFunction {
-  ~RemoveContextMenuFunction() {}
+  virtual ~RemoveContextMenuFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.remove")
 };
 
 class RemoveAllContextMenusFunction : public ExtensionContextMenuFunction {
-  ~RemoveAllContextMenusFunction() {}
+  virtual ~RemoveAllContextMenusFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("contextMenus.removeAll")
 };
diff --git a/chrome/browser/extensions/extension_debugger_api.h b/chrome/browser/extensions/extension_debugger_api.h
index 0974b1c..5fd9d00 100644
--- a/chrome/browser/extensions/extension_debugger_api.h
+++ b/chrome/browser/extensions/extension_debugger_api.h
@@ -34,7 +34,7 @@ class DebuggerFunction : public AsyncExtensionFunction {
 class AttachDebuggerFunction : public DebuggerFunction {
  public:
   AttachDebuggerFunction();
-  ~AttachDebuggerFunction();
+  virtual ~AttachDebuggerFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.debugger.attach")
 };
@@ -43,7 +43,7 @@ class AttachDebuggerFunction : public DebuggerFunction {
 class DetachDebuggerFunction : public DebuggerFunction {
  public:
   DetachDebuggerFunction();
-  ~DetachDebuggerFunction();
+  virtual ~DetachDebuggerFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.debugger.detach")
 };
@@ -52,7 +52,7 @@ class DetachDebuggerFunction : public DebuggerFunction {
 class SendRequestDebuggerFunction : public DebuggerFunction {
  public:
   SendRequestDebuggerFunction();
-  ~SendRequestDebuggerFunction();
+  virtual ~SendRequestDebuggerFunction();
   virtual bool RunImpl();
 
   void SendResponseBody(DictionaryValue* dictionary);
diff --git a/chrome/browser/extensions/extension_event_router.h b/chrome/browser/extensions/extension_event_router.h
index 3866c3c..4ebae0c 100644
--- a/chrome/browser/extensions/extension_event_router.h
+++ b/chrome/browser/extensions/extension_event_router.h
@@ -29,7 +29,7 @@ class ExtensionEventRouter : public NotificationObserver {
   static bool CanCrossIncognito(Profile* profile, const Extension* extension);
 
   explicit ExtensionEventRouter(Profile* profile);
-  ~ExtensionEventRouter();
+  virtual ~ExtensionEventRouter();
 
   // Add or remove the process/extension pair as a listener for |event_name|.
   // Note that multiple extensions can share a process due to process
diff --git a/chrome/browser/extensions/extension_history_api.h b/chrome/browser/extensions/extension_history_api.h
index d51c3f4..f6ddcdc 100644
--- a/chrome/browser/extensions/extension_history_api.h
+++ b/chrome/browser/extensions/extension_history_api.h
@@ -72,7 +72,7 @@ class HistoryFunction : public AsyncExtensionFunction {
 class HistoryFunctionWithCallback : public HistoryFunction {
  public:
   HistoryFunctionWithCallback();
-  ~HistoryFunctionWithCallback();
+  virtual ~HistoryFunctionWithCallback();
 
   // Return true if the async call was completed, false otherwise.
   virtual bool RunAsyncImpl() = 0;
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index a02d774..4a94235 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -51,7 +51,7 @@ class ExtensionHost : public RenderViewHostDelegate,
 
   ExtensionHost(const Extension* extension, SiteInstance* site_instance,
                 const GURL& url, ViewType::Type host_type);
-  ~ExtensionHost();
+  virtual ~ExtensionHost();
 
 #if defined(TOOLKIT_VIEWS)
   void set_view(ExtensionView* view) { view_.reset(view); }
diff --git a/chrome/browser/extensions/extension_i18n_api.h b/chrome/browser/extensions/extension_i18n_api.h
index 4fcc2c7..31df715 100644
--- a/chrome/browser/extensions/extension_i18n_api.h
+++ b/chrome/browser/extensions/extension_i18n_api.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/extensions/extension_function.h"
 
 class GetAcceptLanguagesFunction : public SyncExtensionFunction {
-  ~GetAcceptLanguagesFunction() {}
+  virtual ~GetAcceptLanguagesFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("i18n.getAcceptLanguages")
 };
diff --git a/chrome/browser/extensions/extension_infobar_module.h b/chrome/browser/extensions/extension_infobar_module.h
index 24523e1..455d334 100644
--- a/chrome/browser/extensions/extension_infobar_module.h
+++ b/chrome/browser/extensions/extension_infobar_module.h
@@ -9,7 +9,7 @@
 #include "chrome/browser/extensions/extension_function.h"
 
 class ShowInfoBarFunction : public SyncExtensionFunction {
-  ~ShowInfoBarFunction() {}
+  virtual ~ShowInfoBarFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.infobars.show")
 };
diff --git a/chrome/browser/extensions/extension_management_api.h b/chrome/browser/extensions/extension_management_api.h
index f7a75e5..04b2c8c 100644
--- a/chrome/browser/extensions/extension_management_api.h
+++ b/chrome/browser/extensions/extension_management_api.h
@@ -19,31 +19,31 @@ class ExtensionManagementFunction : public SyncExtensionFunction {
 };
 
 class GetAllExtensionsFunction : public ExtensionManagementFunction {
-  ~GetAllExtensionsFunction() {}
+  virtual ~GetAllExtensionsFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("management.getAll");
 };
 
 class GetExtensionByIdFunction : public ExtensionManagementFunction {
-  ~GetExtensionByIdFunction() {}
+  virtual ~GetExtensionByIdFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("management.get");
 };
 
 class LaunchAppFunction : public ExtensionManagementFunction {
-  ~LaunchAppFunction() {}
+  virtual ~LaunchAppFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("management.launchApp");
 };
 
 class SetEnabledFunction : public ExtensionManagementFunction {
-  ~SetEnabledFunction() {}
+  virtual ~SetEnabledFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("management.setEnabled");
 };
 
 class UninstallFunction : public ExtensionManagementFunction {
-  ~UninstallFunction() {}
+  virtual ~UninstallFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("management.uninstall");
 };
diff --git a/chrome/browser/extensions/extension_page_actions_module.h b/chrome/browser/extensions/extension_page_actions_module.h
index ee99906..6585382 100644
--- a/chrome/browser/extensions/extension_page_actions_module.h
+++ b/chrome/browser/extensions/extension_page_actions_module.h
@@ -26,70 +26,70 @@ class PageActionFunction : public SyncExtensionFunction {
 
 // Implement chrome.pageActions.enableForTab().
 class EnablePageActionFunction : public PageActionFunction {
-  ~EnablePageActionFunction() {}
+  virtual ~EnablePageActionFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageActions.enableForTab")
 };
 
 // Implement chrome.pageActions.disableForTab().
 class DisablePageActionFunction : public PageActionFunction {
-  ~DisablePageActionFunction() {}
+  virtual ~DisablePageActionFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageActions.disableForTab")
 };
 
 // Implement chrome.pageActions.show().
 class PageActionShowFunction : public PageActionFunction {
-  ~PageActionShowFunction() {}
+  virtual ~PageActionShowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.show")
 };
 
 // Implement chrome.pageActions.hide().
 class PageActionHideFunction : public PageActionFunction {
-  ~PageActionHideFunction() {}
+  virtual ~PageActionHideFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.hide")
 };
 
 // Implement chrome.pageActions.setIcon().
 class PageActionSetIconFunction : public PageActionFunction {
-  ~PageActionSetIconFunction() {}
+  virtual ~PageActionSetIconFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setIcon")
 };
 
 // Implement chrome.pageActions.setTitle().
 class PageActionSetTitleFunction : public PageActionFunction {
-  ~PageActionSetTitleFunction() {}
+  virtual ~PageActionSetTitleFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setTitle")
 };
 
 // Implement chrome.pageActions.setPopup().
 class PageActionSetPopupFunction : public PageActionFunction {
-  ~PageActionSetPopupFunction() {}
+  virtual ~PageActionSetPopupFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setPopup")
 };
 
 // Implement chrome.pageActions.setBadgeBackgroundColor().
 class PageActionSetBadgeBackgroundColorFunction : public PageActionFunction {
-  ~PageActionSetBadgeBackgroundColorFunction() {}
+  virtual ~PageActionSetBadgeBackgroundColorFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setBadgeBackgroundColor")
 };
 
 // Implement chrome.pageActions.setBadgeTextColor().
 class PageActionSetBadgeTextColorFunction : public PageActionFunction {
-  ~PageActionSetBadgeTextColorFunction() {}
+  virtual ~PageActionSetBadgeTextColorFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setBadgeTextColor")
 };
 
 // Implement chrome.pageActions.setBadgeText().
 class PageActionSetBadgeTextFunction : public PageActionFunction {
-  ~PageActionSetBadgeTextFunction() {}
+  virtual ~PageActionSetBadgeTextFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("pageAction.setBadgeText")
 };
diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h
index e775505..f110c6e 100644
--- a/chrome/browser/extensions/extension_tabs_module.h
+++ b/chrome/browser/extensions/extension_tabs_module.h
@@ -51,64 +51,64 @@ bool GetTabById(int tab_id, Profile* profile, bool incognito_enabled,
 
 // Windows
 class GetWindowFunction : public SyncExtensionFunction {
-  ~GetWindowFunction() {}
+  virtual ~GetWindowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("windows.get")
 };
 class GetCurrentWindowFunction : public SyncExtensionFunction {
-  ~GetCurrentWindowFunction() {}
+  virtual ~GetCurrentWindowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("windows.getCurrent")
 };
 class GetLastFocusedWindowFunction : public SyncExtensionFunction {
-  ~GetLastFocusedWindowFunction() {}
+  virtual ~GetLastFocusedWindowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("windows.getLastFocused")
 };
 class GetAllWindowsFunction : public SyncExtensionFunction {
-  ~GetAllWindowsFunction() {}
+  virtual ~GetAllWindowsFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("windows.getAll")
 };
 class CreateWindowFunction : public SyncExtensionFunction {
-  ~CreateWindowFunction() {}
+  virtual ~CreateWindowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("windows.create")
 };
 class UpdateWindowFunction : public SyncExtensionFunction {
-  ~UpdateWindowFunction() {}
+  virtual ~UpdateWindowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("windows.update")
 };
 class RemoveWindowFunction : public SyncExtensionFunction {
-  ~RemoveWindowFunction() {}
+  virtual ~RemoveWindowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("windows.remove")
 };
 
 // Tabs
 class GetTabFunction : public SyncExtensionFunction {
-  ~GetTabFunction() {}
+  virtual ~GetTabFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.get")
 };
 class GetCurrentTabFunction : public SyncExtensionFunction {
-  ~GetCurrentTabFunction() {}
+  virtual ~GetCurrentTabFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.getCurrent")
 };
 class GetSelectedTabFunction : public SyncExtensionFunction {
-  ~GetSelectedTabFunction() {}
+  virtual ~GetSelectedTabFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.getSelected")
 };
 class GetAllTabsInWindowFunction : public SyncExtensionFunction {
-  ~GetAllTabsInWindowFunction() {}
+  virtual ~GetAllTabsInWindowFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.getAllInWindow")
 };
 class CreateTabFunction : public SyncExtensionFunction {
-  ~CreateTabFunction() {}
+  virtual ~CreateTabFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.create")
 };
@@ -117,7 +117,7 @@ class UpdateTabFunction : public AsyncExtensionFunction,
  public:
   UpdateTabFunction();
  private:
-  ~UpdateTabFunction() {}
+  virtual ~UpdateTabFunction() {}
   virtual bool RunImpl();
   virtual bool OnMessageReceived(const IPC::Message& message);
   void OnExecuteCodeFinished(int request_id, bool success,
@@ -126,19 +126,19 @@ class UpdateTabFunction : public AsyncExtensionFunction,
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.update")
 };
 class MoveTabFunction : public SyncExtensionFunction {
-  ~MoveTabFunction() {}
+  virtual ~MoveTabFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.move")
 };
 class RemoveTabFunction : public SyncExtensionFunction {
-  ~RemoveTabFunction() {}
+  virtual ~RemoveTabFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.remove")
 };
 class DetectTabLanguageFunction : public AsyncExtensionFunction,
                                   public NotificationObserver {
  private:
-  ~DetectTabLanguageFunction() {}
+  virtual ~DetectTabLanguageFunction() {}
   virtual bool RunImpl();
 
   virtual void Observe(NotificationType type,
@@ -159,7 +159,7 @@ class CaptureVisibleTabFunction : public AsyncExtensionFunction,
   // The default quality setting used when encoding jpegs.
   static const int kDefaultQuality;
 
-  ~CaptureVisibleTabFunction() {}
+  virtual ~CaptureVisibleTabFunction() {}
   virtual bool RunImpl();
   virtual bool CaptureSnapshotFromBackingStore(BackingStore* backing_store);
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/extensions/extension_test_api.h b/chrome/browser/extensions/extension_test_api.h
index 1a0baa0..b3c113a 100644
--- a/chrome/browser/extensions/extension_test_api.h
+++ b/chrome/browser/extensions/extension_test_api.h
@@ -12,31 +12,31 @@
 template <typename T> struct DefaultSingletonTraits;
 
 class ExtensionTestPassFunction : public SyncExtensionFunction {
-  ~ExtensionTestPassFunction();
+  virtual ~ExtensionTestPassFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("test.notifyPass")
 };
 
 class ExtensionTestFailFunction : public SyncExtensionFunction {
-  ~ExtensionTestFailFunction();
+  virtual ~ExtensionTestFailFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("test.notifyFail")
 };
 
 class ExtensionTestLogFunction : public SyncExtensionFunction {
-  ~ExtensionTestLogFunction();
+  virtual ~ExtensionTestLogFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("test.log")
 };
 
 class ExtensionTestQuotaResetFunction : public SyncExtensionFunction {
-  ~ExtensionTestQuotaResetFunction();
+  virtual ~ExtensionTestQuotaResetFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("test.resetQuota")
 };
 
 class ExtensionTestCreateIncognitoTabFunction : public SyncExtensionFunction {
-  ~ExtensionTestCreateIncognitoTabFunction();
+  virtual ~ExtensionTestCreateIncognitoTabFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("test.createIncognitoTab")
 };
@@ -48,7 +48,7 @@ class ExtensionTestSendMessageFunction : public AsyncExtensionFunction {
   void Reply(const std::string& message);
 
  private:
-  ~ExtensionTestSendMessageFunction();
+  virtual ~ExtensionTestSendMessageFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("test.sendMessage")
 };
@@ -81,7 +81,7 @@ class ExtensionTestGetConfigFunction : public SyncExtensionFunction {
     DISALLOW_COPY_AND_ASSIGN(TestConfigState);
   };
 
-  ~ExtensionTestGetConfigFunction();
+  virtual ~ExtensionTestGetConfigFunction();
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("test.getConfig")
 };
diff --git a/chrome/browser/extensions/extension_test_message_listener.h b/chrome/browser/extensions/extension_test_message_listener.h
index d077472..fa06dc7 100644
--- a/chrome/browser/extensions/extension_test_message_listener.h
+++ b/chrome/browser/extensions/extension_test_message_listener.h
@@ -47,7 +47,7 @@ class ExtensionTestMessageListener : public NotificationObserver {
   // We immediately start listening for |expected_message|.
   ExtensionTestMessageListener(const std::string& expected_message,
                                bool will_reply);
-  ~ExtensionTestMessageListener();
+  virtual ~ExtensionTestMessageListener();
 
   // This returns true immediately if we've already gotten the expected
   // message, or waits until it arrives. Returns false if the wait is
diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h
index 1e1c9d7..3b1642d 100644
--- a/chrome/browser/extensions/extension_toolbar_model.h
+++ b/chrome/browser/extensions/extension_toolbar_model.h
@@ -18,7 +18,7 @@ class PrefService;
 class ExtensionToolbarModel : public NotificationObserver {
  public:
   explicit ExtensionToolbarModel(ExtensionService* service);
-  ~ExtensionToolbarModel();
+  virtual ~ExtensionToolbarModel();
 
   // A class which is informed of changes to the model; represents the view of
   // MVC.
diff --git a/chrome/browser/extensions/extension_tts_api.h b/chrome/browser/extensions/extension_tts_api.h
index ad436a8..88e8ba8 100644
--- a/chrome/browser/extensions/extension_tts_api.h
+++ b/chrome/browser/extensions/extension_tts_api.h
@@ -205,7 +205,7 @@ class ExtensionTtsController {
 
 class ExtensionTtsSpeakFunction : public AsyncExtensionFunction {
  private:
-  ~ExtensionTtsSpeakFunction() {}
+  virtual ~ExtensionTtsSpeakFunction() {}
   virtual bool RunImpl();
   void SpeechFinished();
   Utterance* utterance_;
@@ -214,21 +214,21 @@ class ExtensionTtsSpeakFunction : public AsyncExtensionFunction {
 
 class ExtensionTtsStopSpeakingFunction : public SyncExtensionFunction {
  private:
-  ~ExtensionTtsStopSpeakingFunction() {}
+  virtual ~ExtensionTtsStopSpeakingFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.tts.stop")
 };
 
 class ExtensionTtsIsSpeakingFunction : public SyncExtensionFunction {
  private:
-  ~ExtensionTtsIsSpeakingFunction() {}
+  virtual ~ExtensionTtsIsSpeakingFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.tts.isSpeaking")
 };
 
 class ExtensionTtsSpeakCompletedFunction : public SyncExtensionFunction {
  private:
-  ~ExtensionTtsSpeakCompletedFunction() {}
+  virtual ~ExtensionTtsSpeakCompletedFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.tts.speakCompleted")
 };
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 82fcd09..00536ce 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -54,7 +54,7 @@ class ExtensionsUIHTMLSource : public ChromeURLDataManager::DataSource {
   virtual std::string GetMimeType(const std::string&) const;
 
  private:
-  ~ExtensionsUIHTMLSource() {}
+  virtual ~ExtensionsUIHTMLSource() {}
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsUIHTMLSource);
 };
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index 813af06..ca0d863 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -59,7 +59,7 @@ class ImageLoadingTracker : public NotificationObserver {
   };
 
   explicit ImageLoadingTracker(Observer* observer);
-  ~ImageLoadingTracker();
+  virtual ~ImageLoadingTracker();
 
   // Specify image resource to load. If the loaded image is larger than
   // |max_size| it will be resized to those dimensions. IMPORTANT NOTE: this
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h
index f23d471..da61a36 100644
--- a/chrome/browser/extensions/user_script_listener.h
+++ b/chrome/browser/extensions/user_script_listener.h
@@ -49,7 +49,7 @@ class UserScriptListener
 
   typedef std::list<URLPattern> URLPatterns;
 
-  ~UserScriptListener();
+  virtual ~UserScriptListener();
 
   // Resume any requests that we delayed in order to wait for user scripts.
   void StartDelayedRequests();