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

123 files changed, 191 insertions, 185 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h
index 9d3f8b8..1da8241 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.h
+++ b/chrome/browser/autocomplete/autocomplete_edit.h
@@ -103,7 +103,7 @@ class AutocompleteEditModel : public AutocompleteControllerDelegate {
   AutocompleteEditModel(OmniboxView* view,
                         AutocompleteEditController* controller,
                         Profile* profile);
-  ~AutocompleteEditModel();
+  virtual ~AutocompleteEditModel();
 
   AutocompleteController* autocomplete_controller() const {
     return autocomplete_controller_.get();
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h
index 7152fa2..2f3eda3 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h
@@ -36,7 +36,7 @@ class AutocompletePopupViewGtk : public AutocompletePopupView,
                            AutocompleteEditModel* edit_model,
                            Profile* profile,
                            GtkWidget* location_bar);
-  ~AutocompletePopupViewGtk();
+  virtual ~AutocompletePopupViewGtk();
 
   // Overridden from AutocompletePopupView:
   virtual bool IsOpen() const;
diff --git a/chrome/browser/autocomplete/history_contents_provider.h b/chrome/browser/autocomplete/history_contents_provider.h
index e4279a1..7ceb0b9 100644
--- a/chrome/browser/autocomplete/history_contents_provider.h
+++ b/chrome/browser/autocomplete/history_contents_provider.h
@@ -35,7 +35,7 @@ class HistoryContentsProvider : public HistoryProvider {
   virtual void Stop() OVERRIDE;
 
  private:
-  ~HistoryContentsProvider();
+  virtual ~HistoryContentsProvider();
 
   void QueryComplete(HistoryService::Handle handle,
                      history::QueryResults* results);
diff --git a/chrome/browser/autocomplete/history_quick_provider.h b/chrome/browser/autocomplete/history_quick_provider.h
index 69c7dc8..20cd5df 100644
--- a/chrome/browser/autocomplete/history_quick_provider.h
+++ b/chrome/browser/autocomplete/history_quick_provider.h
@@ -28,7 +28,7 @@ class HistoryQuickProvider : public HistoryProvider {
  public:
   HistoryQuickProvider(ACProviderListener* listener, Profile* profile);
 
-  ~HistoryQuickProvider();
+  virtual ~HistoryQuickProvider();
 
   // AutocompleteProvider. |minimal_changes| is ignored since there
   // is no asynch completion performed.
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index e627cb4..2a62236 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -82,7 +82,7 @@ class SearchProvider : public AutocompleteProvider,
   static const int kKeywordProviderURLFetcherID;
 
  private:
-  ~SearchProvider();
+  virtual ~SearchProvider();
 
   // Manages the providers (TemplateURLs) used by SearchProvider. Two providers
   // may be used:
diff --git a/chrome/browser/background_application_list_model.h b/chrome/browser/background_application_list_model.h
index 7639aeb..ba23aef 100644
--- a/chrome/browser/background_application_list_model.h
+++ b/chrome/browser/background_application_list_model.h
@@ -45,7 +45,7 @@ class BackgroundApplicationListModel : public NotificationObserver {
   // Create a new model associated with profile.
   explicit BackgroundApplicationListModel(Profile* profile);
 
-  ~BackgroundApplicationListModel();
+  virtual ~BackgroundApplicationListModel();
 
   // Associate observer with this model.
   void AddObserver(Observer* observer);
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index 8979f67..945559e 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -41,7 +41,7 @@ class BookmarkFaviconFetcher: public NotificationObserver {
   BookmarkFaviconFetcher(Profile* profile,
                          const FilePath& path,
                          BookmarksExportObserver* observer);
-  ~BookmarkFaviconFetcher();
+  virtual ~BookmarkFaviconFetcher();
 
   // Executes bookmark export process.
   void ExportBookmarks();
diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h
index cf1d4b1..05e1392 100644
--- a/chrome/browser/bookmarks/bookmark_storage.h
+++ b/chrome/browser/bookmarks/bookmark_storage.h
@@ -104,7 +104,7 @@ class BookmarkStorage : public NotificationObserver,
  private:
   friend class base::RefCountedThreadSafe<BookmarkStorage>;
 
-  ~BookmarkStorage();
+  virtual ~BookmarkStorage();
 
   class LoadTask;
 
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index ba50151..3f31a4d 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data_remover.h
@@ -108,7 +108,7 @@ class BrowsingDataRemover : public NotificationObserver,
   // to be deleted by other objects so make destructor private and DeleteTask
   // a friend.
   friend class DeleteTask<BrowsingDataRemover>;
-  ~BrowsingDataRemover();
+  virtual ~BrowsingDataRemover();
 
   // NotificationObserver method. Callback when TemplateURLModel has finished
   // loading. Deletes the entries from the model, and if we're not waiting on
diff --git a/chrome/browser/content_settings/content_settings_policy_provider.h b/chrome/browser/content_settings/content_settings_policy_provider.h
index 3f6b79a..a2efaaa 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider.h
+++ b/chrome/browser/content_settings/content_settings_policy_provider.h
@@ -86,7 +86,7 @@ class PolicyProvider : public BaseProvider,
  public:
   explicit PolicyProvider(Profile* profile,
                           DefaultProviderInterface* default_provider);
-  ~PolicyProvider();
+  virtual ~PolicyProvider();
   static void RegisterUserPrefs(PrefService* prefs);
 
   // BaseProvider Implementation
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index b23c5f0..09b3500 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -167,7 +167,7 @@ class HostContentSettingsMap
   friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
   friend class DeleteTask<HostContentSettingsMap>;
 
-  ~HostContentSettingsMap();
+  virtual ~HostContentSettingsMap();
 
   void UnregisterObservers();
 
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.h b/chrome/browser/debugger/browser_list_tabcontents_provider.h
index 5db5f3d..f7fd61e 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.h
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.h
@@ -11,7 +11,7 @@ class BrowserListTabContentsProvider :
     public DevToolsHttpProtocolHandler::TabContentsProvider {
  public:
   BrowserListTabContentsProvider() {}
-  ~BrowserListTabContentsProvider() {}
+  virtual ~BrowserListTabContentsProvider() {}
 
   virtual DevToolsHttpProtocolHandler::InspectableTabs GetInspectableTabs();
  private:
diff --git a/chrome/browser/debugger/devtools_netlog_observer.h b/chrome/browser/debugger/devtools_netlog_observer.h
index 2d0abf3..75efa8e 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.h
+++ b/chrome/browser/debugger/devtools_netlog_observer.h
@@ -67,7 +67,7 @@ class DevToolsNetLogObserver: public ChromeNetLog::ThreadSafeObserver {
   static DevToolsNetLogObserver* instance_;
 
   explicit DevToolsNetLogObserver(ChromeNetLog* chrome_net_log);
-  ~DevToolsNetLogObserver();
+  virtual ~DevToolsNetLogObserver();
 
   ResourceInfo* GetResourceInfo(uint32 id);
 
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h
index e521b31..55fd8c6 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.h
+++ b/chrome/browser/debugger/inspectable_tab_proxy.h
@@ -65,7 +65,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
     int32 id,
     DebuggerRemoteService* service,
     InspectableTabProxy::IdToClientHostMap* map);
-  ~DevToolsClientHostImpl();
+  virtual ~DevToolsClientHostImpl();
 
   DebuggerRemoteService* debugger_remote_service() {
     return service_;
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index fc41675..79018be 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -278,7 +278,7 @@ class DownloadManager
   friend class DeleteTask<DownloadManager>;
   friend class OtherDownloadManagerObserver;
 
-  ~DownloadManager();
+  virtual ~DownloadManager();
 
   // Called on the download thread to check whether the suggested file path
   // exists.  We don't check if the file exists on the UI thread to avoid UI
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index b58967b..74f5526 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -151,7 +151,7 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage>,
               const FilePath& file_full_path,
               const FilePath& directory_full_path);
 
-  ~SavePackage();
+  virtual ~SavePackage();
 
   // Notes from Init() above applies here as well.
   void InternalInit();
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();
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index 04cec79..1407eb8 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -94,7 +94,7 @@ class FaviconService : public CancelableRequestProvider,
  private:
   friend class base::RefCountedThreadSafe<FaviconService>;
 
-  ~FaviconService();
+  virtual ~FaviconService();
 
   Profile* profile_;
 
diff --git a/chrome/browser/file_select_helper.h b/chrome/browser/file_select_helper.h
index 270c8aa..a013715 100644
--- a/chrome/browser/file_select_helper.h
+++ b/chrome/browser/file_select_helper.h
@@ -29,7 +29,7 @@ class FileSelectHelper
       public NotificationObserver {
  public:
   explicit FileSelectHelper(Profile* profile);
-  ~FileSelectHelper();
+  virtual ~FileSelectHelper();
 
   // Show the file chooser dialog.
   void RunFileChooser(RenderViewHost* render_view_host,
@@ -50,7 +50,7 @@ class FileSelectHelper
     DirectoryListerDispatchDelegate(FileSelectHelper* parent, int id)
         : parent_(parent),
           id_(id) {}
-    ~DirectoryListerDispatchDelegate() {}
+    virtual ~DirectoryListerDispatchDelegate() {}
     virtual void OnListFile(
         const net::DirectoryLister::DirectoryListerData& data) {
       parent_->OnListFile(id_, data);
@@ -123,7 +123,7 @@ class FileSelectHelper
 class FileSelectObserver : public TabContentsObserver {
  public:
   explicit FileSelectObserver(TabContents* tab_contents);
-  ~FileSelectObserver();
+  virtual ~FileSelectObserver();
 
  private:
   // TabContentsObserver overrides.
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index b976c6a..843148c 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -577,7 +577,7 @@ class HistoryService : public CancelableRequestProvider,
   static bool CanAddURL(const GURL& url);
 
  protected:
-  ~HistoryService();
+  virtual ~HistoryService();
 
   // These are not currently used, hopefully we can do something in the future
   // to ensure that the most important things happen first.
diff --git a/chrome/browser/history/history_notifications.h b/chrome/browser/history/history_notifications.h
index a34bf8e..a5e0ea2 100644
--- a/chrome/browser/history/history_notifications.h
+++ b/chrome/browser/history/history_notifications.h
@@ -87,7 +87,7 @@ struct FaviconChangeDetails : public HistoryDetails {
 // Details for HISTORY_KEYWORD_SEARCH_TERM_UPDATED.
 struct KeywordSearchTermDetails : public HistoryDetails {
   KeywordSearchTermDetails();
-  ~KeywordSearchTermDetails();
+  virtual ~KeywordSearchTermDetails();
 
   GURL url;
   TemplateURLID keyword_id;
diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h
index 6a3e553..6d4925b 100644
--- a/chrome/browser/history/history_types.h
+++ b/chrome/browser/history/history_types.h
@@ -345,7 +345,7 @@ class URLResult : public URLRow {
   // Constructor that create a URLResult from the specified URL and title match
   // positions from title_matches.
   URLResult(const GURL& url, const Snippet::MatchPositions& title_matches);
-  ~URLResult();
+  virtual ~URLResult();
 
   base::Time visit_time() const { return visit_time_; }
   void set_visit_time(base::Time visit_time) { visit_time_ = visit_time; }
diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
index 8713325..d2c602d 100644
--- a/chrome/browser/history/in_memory_history_backend.h
+++ b/chrome/browser/history/in_memory_history_backend.h
@@ -39,7 +39,7 @@ struct URLsModifiedDetails;
 class InMemoryHistoryBackend : public NotificationObserver {
  public:
   InMemoryHistoryBackend();
-  ~InMemoryHistoryBackend();
+  virtual ~InMemoryHistoryBackend();
 
   // Initializes the backend from the history database pointed to by the
   // full path in |history_filename|. |history_dir| is the path to the
diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h
index b469d79..a2a5b61 100644
--- a/chrome/browser/history/top_sites_backend.h
+++ b/chrome/browser/history/top_sites_backend.h
@@ -69,7 +69,7 @@ class TopSitesBackend
  private:
   friend class base::RefCountedThreadSafe<TopSitesBackend>;
 
-  ~TopSitesBackend();
+  virtual ~TopSitesBackend();
 
   // Invokes Init on the db_.
   void InitDBOnDBThread(const FilePath& path);
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index a363df6..4829006 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -60,7 +60,7 @@ class IconManager : public IconLoader::Delegate,
                     public CancelableRequestProvider {
  public:
   IconManager();
-  ~IconManager();
+  virtual ~IconManager();
 
   // Synchronous call to examine the internal caches for the icon. Returns the
   // icon if we have already loaded it, NULL if we don't have it and must load
diff --git a/chrome/browser/importer/importer_host.h b/chrome/browser/importer/importer_host.h
index bb3ad0b..90825ba 100644
--- a/chrome/browser/importer/importer_host.h
+++ b/chrome/browser/importer/importer_host.h
@@ -81,7 +81,7 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
   virtual void Cancel();
 
  protected:
-  ~ImporterHost();
+  virtual ~ImporterHost();
 
   // Returns true if importer should import to bookmark bar.
   bool ShouldImportToBookmarkBar(bool first_run);
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h
index 0352dfe..3fdc14a7 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/instant/instant_controller.h
@@ -51,7 +51,7 @@ class InstantController : public InstantLoaderDelegate {
   static const int kAutoCommitFadeInTimeMS = 300;
 
   InstantController(Profile* profile, InstantDelegate* delegate);
-  ~InstantController();
+  virtual ~InstantController();
 
   // Registers instant related preferences.
   static void RegisterUserPrefs(PrefService* prefs);
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index 49dc197..11ba9a9 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.h
@@ -46,7 +46,7 @@ class IntranetRedirectDetector
   // since there aren't useful public functions on this object for consumers to
   // access anyway).
   IntranetRedirectDetector();
-  ~IntranetRedirectDetector();
+  virtual ~IntranetRedirectDetector();
 
   // Returns the current redirect origin.  This will be empty if no redirection
   // is in place.
diff --git a/chrome/browser/mach_broker_mac.h b/chrome/browser/mach_broker_mac.h
index 40906f4..a39e17b 100644
--- a/chrome/browser/mach_broker_mac.h
+++ b/chrome/browser/mach_broker_mac.h
@@ -86,7 +86,7 @@ class MachBroker : public base::ProcessMetrics::PortProvider,
  private:
   // Private constructor.
   MachBroker();
-  ~MachBroker();
+  virtual ~MachBroker();
 
   // True if the listener thread has been started.
   bool listener_thread_started_;
@@ -110,4 +110,3 @@ class MachBroker : public base::ProcessMetrics::PortProvider,
 };
 
 #endif  // CHROME_BROWSER_MACH_BROKER_H_
-
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h
index e6e7c3e..a6fd8b2 100644
--- a/chrome/browser/nacl_host/nacl_process_host.h
+++ b/chrome/browser/nacl_host/nacl_process_host.h
@@ -26,7 +26,7 @@ class ChromeRenderMessageFilter;
 class NaClProcessHost : public BrowserChildProcessHost {
  public:
   explicit NaClProcessHost(const std::wstring& url);
-  ~NaClProcessHost();
+  virtual ~NaClProcessHost();
 
   // Initialize the new NaCl process, returning true on success.
   bool Launch(ChromeRenderMessageFilter* chrome_render_message_filter,
diff --git a/chrome/browser/net/chrome_net_log.h b/chrome/browser/net/chrome_net_log.h
index 0d55b78..909ca0a 100644
--- a/chrome/browser/net/chrome_net_log.h
+++ b/chrome/browser/net/chrome_net_log.h
@@ -104,7 +104,7 @@ class ChromeNetLog : public net::NetLog {
   };
 
   ChromeNetLog();
-  ~ChromeNetLog();
+  virtual ~ChromeNetLog();
 
   // NetLog implementation:
   virtual void AddEntry(EventType type,
diff --git a/chrome/browser/net/load_timing_observer.h b/chrome/browser/net/load_timing_observer.h
index 3cd70f5..c1f8cd4 100644
--- a/chrome/browser/net/load_timing_observer.h
+++ b/chrome/browser/net/load_timing_observer.h
@@ -60,7 +60,7 @@ class LoadTimingObserver : public ChromeNetLog::ThreadSafeObserver {
   };
 
   LoadTimingObserver();
-  ~LoadTimingObserver();
+  virtual ~LoadTimingObserver();
 
   URLRequestRecord* GetURLRequestRecord(uint32 source_id);
 
diff --git a/chrome/browser/net/net_log_logger.h b/chrome/browser/net/net_log_logger.h
index b1440b7..9f3ff75 100644
--- a/chrome/browser/net/net_log_logger.h
+++ b/chrome/browser/net/net_log_logger.h
@@ -23,7 +23,7 @@ class NetLogLogger : public ChromeNetLog::ThreadSafeObserver {
   // Otherwise, writes to |log_path|.  Uses one line per entry, for
   // easy parsing.
   explicit NetLogLogger(const FilePath &log_path);
-  ~NetLogLogger();
+  virtual ~NetLogLogger();
 
   // ThreadSafeObserver implementation:
   virtual void OnAddEntry(net::NetLog::EventType type,
@@ -39,4 +39,3 @@ class NetLogLogger : public ChromeNetLog::ThreadSafeObserver {
 };
 
 #endif  // CHROME_BROWSER_NET_NET_LOG_LOGGER_H_
-
diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index d023572..b58501a0 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -28,7 +28,7 @@ class NetPrefObserver : public NotificationObserver {
   // outlive this.
   NetPrefObserver(PrefService* prefs,
                   prerender::PrerenderManager* prerender_manager);
-  ~NetPrefObserver();
+  virtual ~NetPrefObserver();
 
   // NotificationObserver
   virtual void Observe(NotificationType type,
@@ -50,4 +50,3 @@ class NetPrefObserver : public NotificationObserver {
 };
 
 #endif  // CHROME_BROWSER_NET_NET_PREF_OBSERVER_H_
-
diff --git a/chrome/browser/net/passive_log_collector.h b/chrome/browser/net/passive_log_collector.h
index 2e541f5..d209031 100644
--- a/chrome/browser/net/passive_log_collector.h
+++ b/chrome/browser/net/passive_log_collector.h
@@ -90,7 +90,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserver {
   class GlobalSourceTracker : public SourceTrackerInterface {
    public:
     GlobalSourceTracker();
-    ~GlobalSourceTracker();
+    virtual ~GlobalSourceTracker();
 
     // SourceTrackerInterface implementation:
     virtual void OnAddEntry(const ChromeNetLog::Entry& entry);
@@ -343,7 +343,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserver {
 
 
   PassiveLogCollector();
-  ~PassiveLogCollector();
+  virtual ~PassiveLogCollector();
 
   // ThreadSafeObserver implementation:
   virtual void OnAddEntry(net::NetLog::EventType type,
diff --git a/chrome/browser/net/url_request_failed_dns_job.h b/chrome/browser/net/url_request_failed_dns_job.h
index 693f382..34919d5 100644
--- a/chrome/browser/net/url_request_failed_dns_job.h
+++ b/chrome/browser/net/url_request_failed_dns_job.h
@@ -26,7 +26,7 @@ class URLRequestFailedDnsJob : public net::URLRequestJob {
   static void AddUrlHandler();
 
  private:
-  ~URLRequestFailedDnsJob();
+  virtual ~URLRequestFailedDnsJob();
 
   // Simulate a DNS failure.
   void StartAsync();
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.h b/chrome/browser/net/url_request_mock_link_doctor_job.h
index 1e8a5a6..114f369 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.h
@@ -20,7 +20,7 @@ class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
   static void AddUrlHandler();
 
  private:
-  ~URLRequestMockLinkDoctorJob() {}
+  virtual ~URLRequestMockLinkDoctorJob() {}
 };
 
 #endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index 874a3d1..9a8e0a9 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -38,7 +38,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
   static void RemoveMockedURL(const GURL& url);
 
  private:
-  ~URLRequestMockNetErrorJob();
+  virtual ~URLRequestMockNetErrorJob();
 
   static net::URLRequest::ProtocolFactory Factory;
 
diff --git a/chrome/browser/net/url_request_slow_http_job.h b/chrome/browser/net/url_request_slow_http_job.h
index d46719f..3f60f50 100644
--- a/chrome/browser/net/url_request_slow_http_job.h
+++ b/chrome/browser/net/url_request_slow_http_job.h
@@ -28,7 +28,7 @@ class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
   virtual void Start();
 
  private:
-  ~URLRequestSlowHTTPJob();
+  virtual ~URLRequestSlowHTTPJob();
 
   void RealStart();
 
diff --git a/chrome/browser/omnibox_search_hint.h b/chrome/browser/omnibox_search_hint.h
index ac90c0c..452c8a6 100644
--- a/chrome/browser/omnibox_search_hint.h
+++ b/chrome/browser/omnibox_search_hint.h
@@ -23,7 +23,7 @@ class TabContentsWrapper;
 class OmniboxSearchHint : public NotificationObserver {
  public:
   explicit OmniboxSearchHint(TabContentsWrapper* tab);
-  ~OmniboxSearchHint();
+  virtual ~OmniboxSearchHint();
 
   // NotificationObserver method:
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/plugin_data_remover.h b/chrome/browser/plugin_data_remover.h
index 696df1c..c455704 100644
--- a/chrome/browser/plugin_data_remover.h
+++ b/chrome/browser/plugin_data_remover.h
@@ -58,7 +58,7 @@ class PluginDataRemover : public base::RefCountedThreadSafe<PluginDataRemover>,
  private:
   friend class base::RefCountedThreadSafe<PluginDataRemover>;
   friend class PluginDataRemoverTest;
-  ~PluginDataRemover();
+  virtual ~PluginDataRemover();
 
   // Signals that we are finished with removing data (successful or not). This
   // method is safe to call multiple times.
diff --git a/chrome/browser/plugin_data_remover_helper.h b/chrome/browser/plugin_data_remover_helper.h
index 6175c9c..d0f8977b 100644
--- a/chrome/browser/plugin_data_remover_helper.h
+++ b/chrome/browser/plugin_data_remover_helper.h
@@ -21,7 +21,7 @@ class Profile;
 class PluginDataRemoverHelper : public NotificationObserver {
  public:
   PluginDataRemoverHelper();
-  ~PluginDataRemoverHelper();
+  virtual ~PluginDataRemoverHelper();
 
   // Binds this object to the |pref_name| preference in |prefs|, notifying
   // |observer| if the value changes.
diff --git a/chrome/browser/plugin_observer.h b/chrome/browser/plugin_observer.h
index 5bd3d7b..518f341 100644
--- a/chrome/browser/plugin_observer.h
+++ b/chrome/browser/plugin_observer.h
@@ -17,7 +17,7 @@ class TabContentsWrapper;
 class PluginObserver : public TabContentsObserver {
  public:
   explicit PluginObserver(TabContentsWrapper* tab_contents);
-  ~PluginObserver();
+  virtual ~PluginObserver();
 
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message);
diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h
index 1cbc848..5e115dd 100644
--- a/chrome/browser/policy/configuration_policy_provider.h
+++ b/chrome/browser/policy/configuration_policy_provider.h
@@ -103,7 +103,7 @@ class ConfigurationPolicyObserverRegistrar
     : ConfigurationPolicyProvider::Observer {
  public:
   ConfigurationPolicyObserverRegistrar();
-  ~ConfigurationPolicyObserverRegistrar();
+  virtual ~ConfigurationPolicyObserverRegistrar();
   void Init(ConfigurationPolicyProvider* provider,
             ConfigurationPolicyProvider::Observer* observer);
 
diff --git a/chrome/browser/policy/profile_policy_connector.h b/chrome/browser/policy/profile_policy_connector.h
index 9e7f50e..4fc572b 100644
--- a/chrome/browser/policy/profile_policy_connector.h
+++ b/chrome/browser/policy/profile_policy_connector.h
@@ -26,7 +26,7 @@ class UserPolicyIdentityStrategy;
 class ProfilePolicyConnector : public ProfileKeyedService {
  public:
   explicit ProfilePolicyConnector(Profile* profile);
-  ~ProfilePolicyConnector();
+  virtual ~ProfilePolicyConnector();
 
   // Schedules initialization of the policy backend service if the service is
   // already constructed.
diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h
index 7ec804f..47b38ad 100644
--- a/chrome/browser/printing/print_dialog_gtk.h
+++ b/chrome/browser/printing/print_dialog_gtk.h
@@ -53,7 +53,7 @@ class PrintDialogGtk
   friend class DeleteTask<PrintDialogGtk>;
 
   explicit PrintDialogGtk(PrintingContextCairo* context);
-  ~PrintDialogGtk();
+  virtual ~PrintDialogGtk();
 
   // Handles dialog response.
   CHROMEGTK_CALLBACK_1(PrintDialogGtk, void, OnResponse, int);
diff --git a/chrome/browser/printing/print_job_manager.h b/chrome/browser/printing/print_job_manager.h
index 1b629d9..c6089df 100644
--- a/chrome/browser/printing/print_job_manager.h
+++ b/chrome/browser/printing/print_job_manager.h
@@ -27,7 +27,7 @@ class PrinterQuery;
 class PrintJobManager : public NotificationObserver {
  public:
   PrintJobManager();
-  ~PrintJobManager();
+  virtual ~PrintJobManager();
 
   // Registers for changes to the printing enabled preference in |prefs|.
   // This method should be called on the UI thread.
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h
index 0a3f9db..41195c6 100644
--- a/chrome/browser/printing/print_job_worker.h
+++ b/chrome/browser/printing/print_job_worker.h
@@ -32,7 +32,7 @@ class PrintJobWorkerOwner;
 class PrintJobWorker : public base::Thread {
  public:
   explicit PrintJobWorker(PrintJobWorkerOwner* owner);
-  ~PrintJobWorker();
+  virtual ~PrintJobWorker();
 
   void SetNewOwner(PrintJobWorkerOwner* new_owner);
 
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h
index 2490937..cad94cb 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.h
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.h
@@ -85,7 +85,7 @@ class OffTheRecordProfileIOData : public ProfileIOData {
       HttpTransactionFactoryMap;
 
   OffTheRecordProfileIOData();
-  ~OffTheRecordProfileIOData();
+  virtual ~OffTheRecordProfileIOData();
 
   virtual void LazyInitializeInternal(ProfileParams* profile_params) const;
   virtual scoped_refptr<RequestContext> InitializeAppRequestContext(
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index ae3331b..b8ea39b 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -94,7 +94,7 @@ class ProfileIOData : public base::RefCountedThreadSafe<ProfileIOData> {
   class RequestContext : public ChromeURLRequestContext {
    public:
     RequestContext();
-    ~RequestContext();
+    virtual ~RequestContext();
 
     // Setter is used to transfer ownership of the ProfileIOData to the context.
     void set_profile_io_data(const ProfileIOData* profile_io_data) {
diff --git a/chrome/browser/renderer_host/download_resource_handler.h b/chrome/browser/renderer_host/download_resource_handler.h
index 39d18a7..67ad0ee 100644
--- a/chrome/browser/renderer_host/download_resource_handler.h
+++ b/chrome/browser/renderer_host/download_resource_handler.h
@@ -71,7 +71,7 @@ class DownloadResourceHandler : public ResourceHandler {
   std::string DebugString() const;
 
  private:
-  ~DownloadResourceHandler();
+  virtual ~DownloadResourceHandler();
 
   void StartPauseTimer();
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index d70dfbc..6c66cb1 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -47,7 +47,7 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView,
                                 public ui::AnimationDelegate {
  public:
   explicit RenderWidgetHostViewGtk(RenderWidgetHost* widget);
-  ~RenderWidgetHostViewGtk();
+  virtual ~RenderWidgetHostViewGtk();
 
   // Initialize this object for use as a drawing area.
   void InitAsChild();
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.h b/chrome/browser/renderer_host/safe_browsing_resource_handler.h
index ead2fc7..bf999cb 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_handler.h
+++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.h
@@ -95,7 +95,7 @@ class SafeBrowsingResourceHandler : public ResourceHandler,
                               SafeBrowsingService* safe_browsing,
                               ResourceDispatcherHost* resource_dispatcher_host);
 
-  ~SafeBrowsingResourceHandler();
+  virtual ~SafeBrowsingResourceHandler();
 
   // Cancels any in progress safe browsing actions.
   void Shutdown();
diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.h b/chrome/browser/search_engines/search_provider_install_state_message_filter.h
index 130841f..8a89754 100644
--- a/chrome/browser/search_engines/search_provider_install_state_message_filter.h
+++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.h
@@ -18,7 +18,7 @@ class SearchProviderInstallStateMessageFilter : public BrowserMessageFilter {
   // Unlike the other methods, the constructor is called on the UI thread.
   SearchProviderInstallStateMessageFilter(int render_process_id,
                                           Profile* profile);
-  ~SearchProviderInstallStateMessageFilter();
+  virtual ~SearchProviderInstallStateMessageFilter();
 
   // BrowserMessageFilter implementation.
   virtual bool OnMessageReceived(const IPC::Message& message,
diff --git a/chrome/browser/spellcheck_message_filter.h b/chrome/browser/spellcheck_message_filter.h
index 9dd6246..5e6dd5e 100644
--- a/chrome/browser/spellcheck_message_filter.h
+++ b/chrome/browser/spellcheck_message_filter.h
@@ -12,7 +12,7 @@
 class SpellCheckMessageFilter : public BrowserMessageFilter {
  public:
   explicit SpellCheckMessageFilter(int render_process_id);
-  ~SpellCheckMessageFilter();
+  virtual ~SpellCheckMessageFilter();
 
   // BrowserMessageFilter implementation.
   virtual void OverrideThreadForMessage(const IPC::Message& message,
diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h
index fe71398..4031129 100644
--- a/chrome/browser/ssl/ssl_manager.h
+++ b/chrome/browser/ssl/ssl_manager.h
@@ -72,7 +72,7 @@ class SSLManager : public NotificationObserver {
   // Construct an SSLManager for the specified tab.
   // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
   explicit SSLManager(NavigationController* controller);
-  ~SSLManager();
+  virtual ~SSLManager();
 
   SSLPolicy* policy() { return policy_.get(); }
   SSLPolicyBackend* backend() { return &backend_; }
diff --git a/chrome/browser/sync/engine/all_status.h b/chrome/browser/sync/engine/all_status.h
index db1bf48..a453f1f 100644
--- a/chrome/browser/sync/engine/all_status.h
+++ b/chrome/browser/sync/engine/all_status.h
@@ -30,7 +30,7 @@ class AllStatus : public SyncEngineEventListener {
  public:
 
   AllStatus();
-  ~AllStatus();
+  virtual ~AllStatus();
 
   void HandleServerConnectionEvent(const ServerConnectionEvent& event);
 
diff --git a/chrome/browser/sync/glue/generic_change_processor.h b/chrome/browser/sync/glue/generic_change_processor.h
index 1094d12..0a7121f 100644
--- a/chrome/browser/sync/glue/generic_change_processor.h
+++ b/chrome/browser/sync/glue/generic_change_processor.h
@@ -32,7 +32,7 @@ class GenericChangeProcessor : public ChangeProcessor,
   GenericChangeProcessor(SyncableService* local_service,
                          UnrecoverableErrorHandler* error_handler,
                          sync_api::UserShare* user_share);
-  ~GenericChangeProcessor();
+  virtual ~GenericChangeProcessor();
 
   // ChangeProcessor interface.
   // Build and store a list of all changes into |syncer_changes_|.
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index 4c01392..a4ee3eb 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -61,7 +61,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
 
    private:
     // The destructor MUST be called on the IO thread.
-    ~RequestContext();
+    virtual ~RequestContext();
 
     std::string user_agent_;
     net::URLRequestContext* baseline_context_;
@@ -83,7 +83,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
     virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
 
    private:
-    ~RequestContextGetter() {}
+    virtual ~RequestContextGetter() {}
 
     // User agent to apply to the net::URLRequestContext.
     std::string user_agent_;
diff --git a/chrome/browser/sync/notifier/chrome_system_resources.h b/chrome/browser/sync/notifier/chrome_system_resources.h
index a3f9875..26932c3 100644
--- a/chrome/browser/sync/notifier/chrome_system_resources.h
+++ b/chrome/browser/sync/notifier/chrome_system_resources.h
@@ -26,7 +26,7 @@ class ChromeSystemResources : public invalidation::SystemResources {
  public:
   explicit ChromeSystemResources(StateWriter* state_writer);
 
-  ~ChromeSystemResources();
+  virtual ~ChromeSystemResources();
 
   // invalidation::SystemResources implementation.
 
diff --git a/chrome/browser/sync/util/extensions_activity_monitor.h b/chrome/browser/sync/util/extensions_activity_monitor.h
index 3cce238..6d085e6 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.h
+++ b/chrome/browser/sync/util/extensions_activity_monitor.h
@@ -46,7 +46,7 @@ class ExtensionsActivityMonitor : public NotificationObserver {
   // Creates an ExtensionsActivityMonitor to monitor extensions activities on
   // BrowserThread::UI.
   ExtensionsActivityMonitor();
-  ~ExtensionsActivityMonitor();
+  virtual ~ExtensionsActivityMonitor();
 
   // Fills |buffer| with snapshot of current records in constant time by
   // swapping.  This is done mutually exclusively w.r.t methods of this class.
diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.h b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
index 031be00..11cc91c 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_gtk.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
@@ -20,7 +20,7 @@ class RenderViewContextMenuGtk : public RenderViewContextMenu,
                            const ContextMenuParams& params,
                            uint32_t triggering_event_time);
 
-  ~RenderViewContextMenuGtk();
+  virtual ~RenderViewContextMenuGtk();
 
   // Show the menu at the given location.
   void Popup(const gfx::Point& point);
diff --git a/chrome/browser/tab_contents/thumbnail_generator.h b/chrome/browser/tab_contents/thumbnail_generator.h
index fb47293..c44a952 100644
--- a/chrome/browser/tab_contents/thumbnail_generator.h
+++ b/chrome/browser/tab_contents/thumbnail_generator.h
@@ -54,7 +54,7 @@ class ThumbnailGenerator : NotificationObserver {
 
   // This class will do nothing until you call StartThumbnailing.
   ThumbnailGenerator();
-  ~ThumbnailGenerator();
+  virtual ~ThumbnailGenerator();
 
   // Starts taking thumbnails of the given tab contents.
   void StartThumbnailing(TabContents* tab_contents);
diff --git a/chrome/browser/tabs/tab_finder.h b/chrome/browser/tabs/tab_finder.h
index f3a418e..283e60f 100644
--- a/chrome/browser/tabs/tab_finder.h
+++ b/chrome/browser/tabs/tab_finder.h
@@ -55,7 +55,7 @@ class TabFinder : public NotificationObserver {
   typedef std::set<TabContentsObserverImpl*> TabContentsObservers;
 
   TabFinder();
-  ~TabFinder();
+  virtual ~TabFinder();
 
   void Init();
 
diff --git a/chrome/browser/translate/translate_tab_helper.h b/chrome/browser/translate/translate_tab_helper.h
index 874f47d..58ceba0 100644
--- a/chrome/browser/translate/translate_tab_helper.h
+++ b/chrome/browser/translate/translate_tab_helper.h
@@ -13,7 +13,7 @@
 class TranslateTabHelper : public TabContentsObserver {
  public:
   explicit TranslateTabHelper(TabContents* tab_contents);
-  ~TranslateTabHelper();
+  virtual ~TranslateTabHelper();
 
   LanguageState& language_state() { return language_state_; }
 
diff --git a/chrome/browser/transport_security_persister.h b/chrome/browser/transport_security_persister.h
index 13fc658..de0d74d 100644
--- a/chrome/browser/transport_security_persister.h
+++ b/chrome/browser/transport_security_persister.h
@@ -53,7 +53,7 @@ class TransportSecurityPersister
  private:
   friend class base::RefCountedThreadSafe<TransportSecurityPersister>;
 
-  ~TransportSecurityPersister();
+  virtual ~TransportSecurityPersister();
 
   void Load();
   void CompleteLoad(const std::string& state);
diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window_mac.h
index 2de151a..60425c0 100644
--- a/chrome/browser/ui/cocoa/constrained_window_mac.h
+++ b/chrome/browser/ui/cocoa/constrained_window_mac.h
@@ -83,7 +83,7 @@ class ConstrainedWindowMacDelegateCustomSheet
  public:
   ConstrainedWindowMacDelegateCustomSheet();
   ConstrainedWindowMacDelegateCustomSheet(id delegate, SEL didEndSelector);
-  ~ConstrainedWindowMacDelegateCustomSheet();
+  virtual ~ConstrainedWindowMacDelegateCustomSheet();
 
  protected:
   // For when you need to delay initalization after the constructor call.
@@ -146,4 +146,3 @@ class ConstrainedWindowMac : public ConstrainedWindow {
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_CONSTRAINED_WINDOW_MAC_H_
-
diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h
index 24d9c4a..1320f62 100644
--- a/chrome/browser/ui/cocoa/download/download_item_mac.h
+++ b/chrome/browser/ui/cocoa/download/download_item_mac.h
@@ -33,7 +33,7 @@ class DownloadItemMac : DownloadItem::Observer {
                   DownloadItemController* controller);
 
   // Destructor.
-  ~DownloadItemMac();
+  virtual ~DownloadItemMac();
 
   // DownloadItem::Observer implementation
   virtual void OnDownloadUpdated(DownloadItem* download);
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h b/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h
index 3dff871..3545280 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h
+++ b/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h
@@ -19,7 +19,7 @@ class Size;
 class BalloonViewBridge : public BalloonView {
  public:
   BalloonViewBridge();
-  ~BalloonViewBridge();
+  virtual ~BalloonViewBridge();
 
   // BalloonView interface.
   virtual void Show(Balloon* balloon);
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h
index a7bff8f..4d87466 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h
+++ b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h
@@ -19,7 +19,7 @@ class BalloonViewHost : public BalloonHost {
  public:
   explicit BalloonViewHost(Balloon* balloon);
 
-  ~BalloonViewHost();
+  virtual ~BalloonViewHost();
 
   // Changes the size of the balloon.
   void UpdateActualSize(const gfx::Size& new_size);
diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.h b/chrome/browser/ui/cocoa/theme_install_bubble_view.h
index f933d2d..f901e3b 100644
--- a/chrome/browser/ui/cocoa/theme_install_bubble_view.h
+++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.h
@@ -27,7 +27,7 @@
 // instance of the bubble.
 class ThemeInstallBubbleView : public NotificationObserver {
  public:
-  ~ThemeInstallBubbleView();
+  virtual ~ThemeInstallBubbleView();
 
   // NotificationObserver
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h
index 99831be..a563828 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h
@@ -55,7 +55,7 @@ class BookmarkBubbleGtk : public BubbleDelegateGtk,
                     Profile* profile,
                     const GURL& url,
                     bool newly_bookmarked);
-  ~BookmarkBubbleGtk();
+  virtual ~BookmarkBubbleGtk();
 
   // Notified when |content_| is destroyed so we can delete our instance.
   CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnDestroy);
diff --git a/chrome/browser/ui/gtk/custom_button.h b/chrome/browser/ui/gtk/custom_button.h
index eb0dbe8..6bb3c1f 100644
--- a/chrome/browser/ui/gtk/custom_button.h
+++ b/chrome/browser/ui/gtk/custom_button.h
@@ -38,7 +38,7 @@ class CustomDrawButtonBase : public NotificationObserver {
                        int hover_id,
                        int disabled_id);
 
-  ~CustomDrawButtonBase();
+  virtual ~CustomDrawButtonBase();
 
   // Flip the image horizontally. Not to be used for RTL/LTR reasons. (In RTL
   // mode, this will unflip the image.)
@@ -154,7 +154,7 @@ class CustomDrawButton : public NotificationObserver {
                    int disabled_id,
                    GtkWidget* native_widget);
 
-  ~CustomDrawButton();
+  virtual ~CustomDrawButton();
 
   void Init();
 
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.h b/chrome/browser/ui/gtk/download/download_item_gtk.h
index a8f21b4..76f9dc4 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.h
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.h
@@ -45,7 +45,7 @@ class DownloadItemGtk : public DownloadItem::Observer,
                   BaseDownloadItemModel* download_item_model);
 
   // Destroys all widgets belonging to this DownloadItemGtk.
-  ~DownloadItemGtk();
+  virtual ~DownloadItemGtk();
 
   // DownloadItem::Observer implementation.
   virtual void OnDownloadUpdated(DownloadItem* download);
diff --git a/chrome/browser/ui/gtk/download/download_shelf_gtk.h b/chrome/browser/ui/gtk/download/download_shelf_gtk.h
index 5d0f117..a8e39fd 100644
--- a/chrome/browser/ui/gtk/download/download_shelf_gtk.h
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.h
@@ -38,7 +38,7 @@ class DownloadShelfGtk : public DownloadShelf,
  public:
   explicit DownloadShelfGtk(Browser* browser, gfx::NativeView view);
 
-  ~DownloadShelfGtk();
+  virtual ~DownloadShelfGtk();
 
   // DownloadShelf implementation.
   virtual void AddDownload(BaseDownloadItemModel* download_model);
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc
index 1c4ac19..8dfd2dd 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc
@@ -14,6 +14,10 @@ BalloonViewHost::BalloonViewHost(Balloon* balloon)
       render_widget_host_view_(NULL) {
 }
 
+BalloonViewHost::~BalloonViewHost() {
+  Shutdown();
+}
+
 void BalloonViewHost::UpdateActualSize(const gfx::Size& new_size) {
   render_widget_host_view_->SetSize(new_size);
   gtk_widget_set_size_request(
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h
index 60b223c..656ebb3 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h
@@ -19,9 +19,7 @@ class BalloonViewHost : public BalloonHost {
  public:
   explicit BalloonViewHost(Balloon* balloon);
 
-  ~BalloonViewHost() {
-    Shutdown();
-  }
+  virtual ~BalloonViewHost();
 
   // Changes the size of the balloon.
   void UpdateActualSize(const gfx::Size& new_size);
diff --git a/chrome/browser/ui/gtk/reload_button_gtk.h b/chrome/browser/ui/gtk/reload_button_gtk.h
index d5752fa..d623462 100644
--- a/chrome/browser/ui/gtk/reload_button_gtk.h
+++ b/chrome/browser/ui/gtk/reload_button_gtk.h
@@ -26,7 +26,7 @@ class ReloadButtonGtk : public NotificationObserver {
   enum Mode { MODE_RELOAD = 0, MODE_STOP };
 
   ReloadButtonGtk(LocationBarViewGtk* location_bar, Browser* browser);
-  ~ReloadButtonGtk();
+  virtual ~ReloadButtonGtk();
 
   GtkWidget* widget() const { return widget_.get(); }
 
diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk.h b/chrome/browser/ui/gtk/status_icons/status_tray_gtk.h
index 28d0d7a..c3d799e 100644
--- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk.h
+++ b/chrome/browser/ui/gtk/status_icons/status_tray_gtk.h
@@ -11,7 +11,7 @@
 class StatusTrayGtk : public StatusTray {
  public:
   StatusTrayGtk();
-  ~StatusTrayGtk();
+  virtual ~StatusTrayGtk();
 
  protected:
   // Overriden from StatusTray:
diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.h b/chrome/browser/ui/gtk/tab_contents_container_gtk.h
index b882683..4adcd04 100644
--- a/chrome/browser/ui/gtk/tab_contents_container_gtk.h
+++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.h
@@ -26,7 +26,7 @@ class TabContentsContainerGtk : public NotificationObserver,
                                 public ViewIDUtil::Delegate {
  public:
   explicit TabContentsContainerGtk(StatusBubbleGtk* status_bubble);
-  ~TabContentsContainerGtk();
+  virtual ~TabContentsContainerGtk();
 
   void Init();
 
diff --git a/chrome/browser/ui/gtk/tab_contents_drag_source.h b/chrome/browser/ui/gtk/tab_contents_drag_source.h
index 1fa638c..6164300 100644
--- a/chrome/browser/ui/gtk/tab_contents_drag_source.h
+++ b/chrome/browser/ui/gtk/tab_contents_drag_source.h
@@ -29,7 +29,7 @@ struct WebDropData;
 class TabContentsDragSource : public MessageLoopForUI::Observer {
  public:
   explicit TabContentsDragSource(TabContentsView* tab_contents_view);
-  ~TabContentsDragSource();
+  virtual ~TabContentsDragSource();
 
   TabContents* tab_contents() const;
 
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
index 4bbc120..371e142 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
@@ -67,7 +67,7 @@ class TabContentsWrapper : public TabContentsObserver,
   // Takes ownership of |contents|, which must be heap-allocated (as it lives
   // in a scoped_ptr) and can not be NULL.
   explicit TabContentsWrapper(TabContents* contents);
-  ~TabContentsWrapper();
+  virtual ~TabContentsWrapper();
 
   // Used to retrieve this object from |tab_contents_|, which is placed in
   // its property bag to avoid adding additional interfaces.
diff --git a/chrome/browser/ui/webui/history2_ui.h b/chrome/browser/ui/webui/history2_ui.h
index 7643346..e92e337 100644
--- a/chrome/browser/ui/webui/history2_ui.h
+++ b/chrome/browser/ui/webui/history2_ui.h
@@ -32,7 +32,7 @@ class HistoryUIHTMLSource2 : public ChromeURLDataManager::DataSource {
   virtual std::string GetMimeType(const std::string&) const;
 
  private:
-  ~HistoryUIHTMLSource2() {}
+  virtual ~HistoryUIHTMLSource2() {}
 
   DISALLOW_COPY_AND_ASSIGN(HistoryUIHTMLSource2);
 };
diff --git a/chrome/browser/ui/webui/keyboard_ui.h b/chrome/browser/ui/webui/keyboard_ui.h
index d7c24c9..7a80a67 100644
--- a/chrome/browser/ui/webui/keyboard_ui.h
+++ b/chrome/browser/ui/webui/keyboard_ui.h
@@ -17,7 +17,7 @@ class Profile;
 class KeyboardUI : public WebUI {
  public:
   explicit KeyboardUI(TabContents* manager);
-  ~KeyboardUI();
+  virtual ~KeyboardUI();
 
   class KeyboardHTMLSource : public ChromeURLDataManager::DataSource {
    public:
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h
index 8fbcfd2..05888b0c 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.h
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h
@@ -26,7 +26,7 @@ class NewTabUI : public WebUI,
                  public NotificationObserver {
  public:
   explicit NewTabUI(TabContents* manager);
-  ~NewTabUI();
+  virtual ~NewTabUI();
 
   // Override WebUI methods so we can hook up the paint timer to the render
   // view host.
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.h b/chrome/browser/ui/webui/ntp/ntp_login_handler.h
index 6245deb..d39c6cd 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.h
+++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.h
@@ -17,7 +17,7 @@ class NTPLoginHandler : public WebUIMessageHandler,
                         public NotificationObserver {
  public:
   NTPLoginHandler();
-  ~NTPLoginHandler();
+  virtual ~NTPLoginHandler();
 
   virtual WebUIMessageHandler* Attach(WebUI* web_ui);
 
diff --git a/chrome/browser/ui/webui/shared_resources_data_source.h b/chrome/browser/ui/webui/shared_resources_data_source.h
index 8976192..e08ab24 100644
--- a/chrome/browser/ui/webui/shared_resources_data_source.h
+++ b/chrome/browser/ui/webui/shared_resources_data_source.h
@@ -27,7 +27,7 @@ class SharedResourcesDataSource : public ChromeURLDataManager::DataSource {
   virtual std::string GetMimeType(const std::string&) const;
 
  private:
-  ~SharedResourcesDataSource();
+  virtual ~SharedResourcesDataSource();
 
   DISALLOW_COPY_AND_ASSIGN(SharedResourcesDataSource);
 };
diff --git a/chrome/browser/webdata/web_database_table.cc b/chrome/browser/webdata/web_database_table.cc
new file mode 100644
index 0000000..1dada9d
--- /dev/null
+++ b/chrome/browser/webdata/web_database_table.cc
@@ -0,0 +1,10 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/webdata/web_database_table.h"
+
+WebDatabaseTable::~WebDatabaseTable() {
+  db_ = NULL;
+  meta_table_ = NULL;
+}
diff --git a/chrome/browser/webdata/web_database_table.h b/chrome/browser/webdata/web_database_table.h
index 5bb95b9..ea3c5ec 100644
--- a/chrome/browser/webdata/web_database_table.h
+++ b/chrome/browser/webdata/web_database_table.h
@@ -16,10 +16,7 @@ class WebDatabaseTable {
  protected:
   explicit WebDatabaseTable(sql::Connection* db, sql::MetaTable* meta_table)
       : db_(db), meta_table_(meta_table) {}
-  virtual ~WebDatabaseTable() {
-    db_ = NULL;
-    meta_table_ = NULL;
-  };
+  virtual ~WebDatabaseTable();
 
   // Attempts to initialize the table and returns true if successful.
   virtual bool Init() = 0;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 662ebb9..65126cf 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3503,6 +3503,7 @@
         'browser/webdata/web_data_service_win.cc',
         'browser/webdata/web_database.cc',
         'browser/webdata/web_database.h',
+        'browser/webdata/web_database_table.cc',
         'browser/webdata/web_database_table.h',
 
         # These files are generated by GRIT.
diff --git a/chrome/common/net/test_url_fetcher_factory.h b/chrome/common/net/test_url_fetcher_factory.h
index 0e39c08..a9810a0 100644
--- a/chrome/common/net/test_url_fetcher_factory.h
+++ b/chrome/common/net/test_url_fetcher_factory.h
@@ -49,7 +49,7 @@ class TestURLFetcher : public URLFetcher {
                  const GURL& url,
                  RequestType request_type,
                  Delegate* d);
-  ~TestURLFetcher();
+  virtual ~TestURLFetcher();
 
   // Overriden to do nothing. It is assumed the caller will notify the delegate.
   virtual void Start() {}
diff --git a/chrome/nacl/nacl_launcher_thread.h b/chrome/nacl/nacl_launcher_thread.h
index 26992ae..4d709d6 100644
--- a/chrome/nacl/nacl_launcher_thread.h
+++ b/chrome/nacl/nacl_launcher_thread.h
@@ -15,7 +15,7 @@
 class NaClLauncherThread : public ChildThread {
  public:
   explicit NaClLauncherThread(bool debug);
-  ~NaClLauncherThread();
+  virtual ~NaClLauncherThread();
   // Returns the one NaCl thread.
   static NaClLauncherThread* current();
 
diff --git a/chrome/renderer/renderer_histogram_snapshots.h b/chrome/renderer/renderer_histogram_snapshots.h
index c21fd4b..2602276 100644
--- a/chrome/renderer/renderer_histogram_snapshots.h
+++ b/chrome/renderer/renderer_histogram_snapshots.h
@@ -21,7 +21,7 @@ class RendererHistogramSnapshots : public HistogramSender,
                                    public RenderProcessObserver {
  public:
   RendererHistogramSnapshots();
-  ~RendererHistogramSnapshots();
+  virtual ~RendererHistogramSnapshots();
 
   // Send the histogram data.
   void SendHistograms(int sequence_number);
diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h
index a08614c..5cb483a 100644
--- a/chrome/renderer/safe_browsing/malware_dom_details.h
+++ b/chrome/renderer/safe_browsing/malware_dom_details.h
@@ -37,7 +37,7 @@ class MalwareDOMDetails : public RenderViewObserver {
   static uint32 kMaxNodes;
 
   static MalwareDOMDetails* Create(RenderView* render_view);
-  ~MalwareDOMDetails();
+  virtual ~MalwareDOMDetails();
 
   // Begins extracting resource urls for the page currently loaded in
   // this object's RenderView.
diff --git a/chrome/renderer/searchbox.h b/chrome/renderer/searchbox.h
index 47c27ef..b9d5f5c5 100644
--- a/chrome/renderer/searchbox.h
+++ b/chrome/renderer/searchbox.h
@@ -19,7 +19,7 @@ class SearchBox : public RenderViewObserver,
                   public RenderViewObserverTracker<SearchBox> {
  public:
   explicit SearchBox(RenderView* render_view);
-  ~SearchBox();
+  virtual ~SearchBox();
 
   // Sends ViewHostMsg_SetSuggestions to the browser.
   void SetSuggestions(const std::vector<std::string>& suggestions,
diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h
index 0af6ef8..28b9507 100644
--- a/chrome/renderer/spellchecker/spellcheck.h
+++ b/chrome/renderer/spellchecker/spellcheck.h
@@ -30,7 +30,7 @@ class MemoryMappedFile;
 class SpellCheck : public RenderProcessObserver {
  public:
   SpellCheck();
-  ~SpellCheck();
+  virtual ~SpellCheck();
 
   void Init(base::PlatformFile file,
             const std::vector<std::string>& custom_words,
diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h
index 6e804f9..12e19df 100644
--- a/chrome/service/cloud_print/printer_job_handler.h
+++ b/chrome/service/cloud_print/printer_job_handler.h
@@ -113,7 +113,7 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>,
                     const GURL& cloud_print_server_url,
                     cloud_print::PrintSystem* print_system,
                     Delegate* delegate);
-  ~PrinterJobHandler();
+  virtual ~PrinterJobHandler();
   bool Initialize();
   // Requests a job check. |reason| is the reason for fetching the job. Used
   // for logging and diagnostc purposes.
diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h
index 2010690..bb9424e 100644
--- a/chrome/service/gaia/service_gaia_authenticator.h
+++ b/chrome/service/gaia/service_gaia_authenticator.h
@@ -28,7 +28,7 @@ class ServiceGaiaAuthenticator
                            const std::string& service_id,
                            const std::string& gaia_url,
                            base::MessageLoopProxy* io_message_loop_proxy);
-  ~ServiceGaiaAuthenticator();
+  virtual ~ServiceGaiaAuthenticator();
 
   // URLFetcher::Delegate implementation.
   virtual void OnURLFetchComplete(const URLFetcher *source,
diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h
index 8d316b1..ce1fc5a 100644
--- a/chrome/service/service_process.h
+++ b/chrome/service/service_process.h
@@ -32,7 +32,7 @@ class CommandLine;
 class ServiceProcess : public CloudPrintProxy::Client {
  public:
   ServiceProcess();
-  ~ServiceProcess();
+  virtual ~ServiceProcess();
 
   // Initialize the ServiceProcess with the message loop that it should run on.
   // ServiceProcess takes ownership of |state|.
diff --git a/chrome/test/live_sync/live_autofill_sync_test.h b/chrome/test/live_sync/live_autofill_sync_test.h
index 69559d3..2a36ef0 100644
--- a/chrome/test/live_sync/live_autofill_sync_test.h
+++ b/chrome/test/live_sync/live_autofill_sync_test.h
@@ -87,7 +87,7 @@ AutofillProfile CreateAutofillProfile(LiveAutofillSyncTest::ProfileType type);
 class TwoClientLiveAutofillSyncTest : public LiveAutofillSyncTest {
  public:
   TwoClientLiveAutofillSyncTest() : LiveAutofillSyncTest(TWO_CLIENT) {}
-  ~TwoClientLiveAutofillSyncTest() {}
+  virtual ~TwoClientLiveAutofillSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientLiveAutofillSyncTest);
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.h b/chrome/test/live_sync/live_bookmarks_sync_test.h
index f53a511..e568af3 100644
--- a/chrome/test/live_sync/live_bookmarks_sync_test.h
+++ b/chrome/test/live_sync/live_bookmarks_sync_test.h
@@ -174,7 +174,7 @@ class SingleClientLiveBookmarksSyncTest : public LiveBookmarksSyncTest {
  public:
   SingleClientLiveBookmarksSyncTest()
       : LiveBookmarksSyncTest(SINGLE_CLIENT) {}
-  ~SingleClientLiveBookmarksSyncTest() {}
+  virtual ~SingleClientLiveBookmarksSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SingleClientLiveBookmarksSyncTest);
@@ -184,7 +184,7 @@ class TwoClientLiveBookmarksSyncTest : public LiveBookmarksSyncTest {
  public:
   TwoClientLiveBookmarksSyncTest()
       : LiveBookmarksSyncTest(TWO_CLIENT) {}
-  ~TwoClientLiveBookmarksSyncTest() {}
+  virtual ~TwoClientLiveBookmarksSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientLiveBookmarksSyncTest);
@@ -194,7 +194,7 @@ class MultipleClientLiveBookmarksSyncTest : public LiveBookmarksSyncTest {
  public:
   MultipleClientLiveBookmarksSyncTest()
       : LiveBookmarksSyncTest(MULTIPLE_CLIENT) {}
-  ~MultipleClientLiveBookmarksSyncTest() {}
+  virtual ~MultipleClientLiveBookmarksSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MultipleClientLiveBookmarksSyncTest);
@@ -204,7 +204,7 @@ class ManyClientLiveBookmarksSyncTest : public LiveBookmarksSyncTest {
  public:
   ManyClientLiveBookmarksSyncTest()
       : LiveBookmarksSyncTest(MANY_CLIENT) {}
-  ~ManyClientLiveBookmarksSyncTest() {}
+  virtual ~ManyClientLiveBookmarksSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ManyClientLiveBookmarksSyncTest);
diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h
index 4816f9b..3d00cf7 100644
--- a/chrome/test/render_view_test.h
+++ b/chrome/test/render_view_test.h
@@ -44,7 +44,7 @@ class RenderViewTest : public testing::Test {
   };
 
   RenderViewTest();
-  ~RenderViewTest();
+  virtual ~RenderViewTest();
 
  protected:
   // Spins the message loop to process all messages that are currently pending.
diff --git a/chrome/test/test_notification_tracker.h b/chrome/test/test_notification_tracker.h
index 7a9f947..21932c9 100644
--- a/chrome/test/test_notification_tracker.h
+++ b/chrome/test/test_notification_tracker.h
@@ -31,7 +31,7 @@ class TestNotificationTracker : public NotificationObserver {
   // ListenFor for the notifications you are interested in.
   TestNotificationTracker();
 
-  ~TestNotificationTracker();
+  virtual ~TestNotificationTracker();
 
   // Makes this object listen for the given notification with the given source.
   void ListenFor(NotificationType type, const NotificationSource& source);