FBTF: Even more ctor/virtual deinlining.

(Only 424k off Linux debug .a files).

BUG=none
TEST=compiles

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

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

86 files changed, 285 insertions, 128 deletions

diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index 851c8ef..ba8c63d 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -25,6 +25,11 @@
 #define AUTO_FILL_QUERY_SERVER_NAME_START_IN_HEADER "SOMESERVER/"
 #endif
 
+struct AutoFillDownloadManager::FormRequestData {
+  std::vector<std::string> form_signatures;
+  AutoFillRequestType request_type;
+};
+
 AutoFillDownloadManager::AutoFillDownloadManager(Profile* profile)
     : profile_(profile),
       observer_(NULL),
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h
index c2f0ba0..3b972a1 100644
--- a/chrome/browser/autofill/autofill_download.h
+++ b/chrome/browser/autofill/autofill_download.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <map>
-#include <vector>
 #include <string>
 
 #include "base/scoped_vector.h"
@@ -92,10 +91,8 @@ class AutoFillDownloadManager : public URLFetcher::Delegate {
 
  private:
   friend class AutoFillDownloadTestHelper;  // unit-test.
-  struct FormRequestData {
-    std::vector<std::string> form_signatures;
-    AutoFillRequestType request_type;
-  };
+
+  struct FormRequestData;
 
   // Initiates request to AutoFill servers to download/upload heuristics.
   // |form_xml| - form structure XML to upload/download.
diff --git a/chrome/browser/autofill/contact_info.cc b/chrome/browser/autofill/contact_info.cc
index f38f049..ce2e36e 100644
--- a/chrome/browser/autofill/contact_info.cc
+++ b/chrome/browser/autofill/contact_info.cc
@@ -23,6 +23,10 @@ static const AutoFillFieldType kAutoFillContactInfoTypes[] = {
 static const size_t kAutoFillContactInfoLength =
     arraysize(kAutoFillContactInfoTypes);
 
+ContactInfo::ContactInfo() {}
+
+ContactInfo::~ContactInfo() {}
+
 FormGroup* ContactInfo::Clone() const {
   return new ContactInfo(*this);
 }
diff --git a/chrome/browser/autofill/contact_info.h b/chrome/browser/autofill/contact_info.h
index 97c3119..d47ec8d 100644
--- a/chrome/browser/autofill/contact_info.h
+++ b/chrome/browser/autofill/contact_info.h
@@ -16,7 +16,8 @@ typedef std::vector<string16> NameTokens;
 // A form group that stores contact information.
 class ContactInfo : public FormGroup {
  public:
-  ContactInfo() {}
+  ContactInfo();
+  virtual ~ContactInfo();
 
   // FormGroup implementation:
   virtual FormGroup* Clone() const;
diff --git a/chrome/browser/autofill/form_group.cc b/chrome/browser/autofill/form_group.cc
index 83f3147f..e99059b 100644
--- a/chrome/browser/autofill/form_group.cc
+++ b/chrome/browser/autofill/form_group.cc
@@ -4,6 +4,12 @@
 
 #include "chrome/browser/autofill/form_group.h"
 
+string16 FormGroup::GetPreviewText(const AutoFillType& type) const {
+  return GetFieldText(type);
+}
+
+const string16& FormGroup::Label() const { return EmptyString16(); }
+
 bool FormGroup::operator!=(const FormGroup& form_group) const {
   FieldTypeSet a, b, symmetric_difference;
   GetAvailableFieldTypes(&a);
diff --git a/chrome/browser/autofill/form_group.h b/chrome/browser/autofill/form_group.h
index 4a61c1a..68a7d3a 100644
--- a/chrome/browser/autofill/form_group.h
+++ b/chrome/browser/autofill/form_group.h
@@ -38,9 +38,7 @@ class FormGroup {
   virtual string16 GetFieldText(const AutoFillType& type) const = 0;
 
   // Returns the text for preview.
-  virtual string16 GetPreviewText(const AutoFillType& type) const {
-    return GetFieldText(type);
-  }
+  virtual string16 GetPreviewText(const AutoFillType& type) const;
 
   // Used to determine if the text being typed into a field matches the
   // information in this FormGroup object. This is used by the preview
@@ -55,7 +53,7 @@ class FormGroup {
 
   // Returns the label for this FormGroup item. This should be overridden for
   // form group items that implement a label.
-  virtual const string16& Label() const { return EmptyString16(); }
+  virtual const string16& Label() const;
 
   // Returns true if the field data in |form_group| does not match the field
   // data in this FormGroup.
diff --git a/chrome/browser/autofill/phone_number.cc b/chrome/browser/autofill/phone_number.cc
index 997edd9..025f031 100644
--- a/chrome/browser/autofill/phone_number.cc
+++ b/chrome/browser/autofill/phone_number.cc
@@ -32,6 +32,10 @@ const int kAutoFillPhoneLength = arraysize(kAutoFillPhoneTypes);
 
 }  // namespace
 
+PhoneNumber::PhoneNumber() {}
+
+PhoneNumber::~PhoneNumber() {}
+
 void PhoneNumber::GetPossibleFieldTypes(const string16& text,
                                         FieldTypeSet* possible_types) const {
   string16 stripped_text(text);
diff --git a/chrome/browser/autofill/phone_number.h b/chrome/browser/autofill/phone_number.h
index ef1bafc..1167683 100644
--- a/chrome/browser/autofill/phone_number.h
+++ b/chrome/browser/autofill/phone_number.h
@@ -14,8 +14,8 @@
 // A form group that stores phone number information.
 class PhoneNumber : public FormGroup {
  public:
-  PhoneNumber() {}
-  virtual ~PhoneNumber() {}
+  PhoneNumber();
+  virtual ~PhoneNumber();
 
   // FormGroup implementation:
   virtual FormGroup* Clone() const = 0;
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index d836bee..b98d78c 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -973,6 +973,8 @@ MetricEventDurationObserver::MetricEventDurationObserver() {
                  NotificationService::AllSources());
 }
 
+MetricEventDurationObserver::~MetricEventDurationObserver() {}
+
 int MetricEventDurationObserver::GetEventDurationMs(
     const std::string& event_name) {
   EventDurationMap::const_iterator it = durations_.find(event_name);
@@ -1002,6 +1004,8 @@ PageTranslatedObserver::PageTranslatedObserver(AutomationProvider* automation,
                  Source<TabContents>(tab_contents));
 }
 
+PageTranslatedObserver::~PageTranslatedObserver() {}
+
 void PageTranslatedObserver::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index 8706d85..5c7b77b 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -508,6 +508,7 @@ class DocumentPrintedNotificationObserver : public NotificationObserver {
 class MetricEventDurationObserver : public NotificationObserver {
  public:
   MetricEventDurationObserver();
+  virtual ~MetricEventDurationObserver();
 
   // Get the duration of an event.  Returns -1 if we haven't seen the event.
   int GetEventDurationMs(const std::string& event_name);
@@ -530,6 +531,7 @@ class PageTranslatedObserver : public NotificationObserver {
   PageTranslatedObserver(AutomationProvider* automation,
                          IPC::Message* reply_message,
                          TabContents* tab_contents);
+  virtual ~PageTranslatedObserver();
 
   // NotificationObserver interface.
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc
index abdf099..9cb0ecd3 100644
--- a/chrome/browser/automation/automation_resource_message_filter.cc
+++ b/chrome/browser/automation/automation_resource_message_filter.cc
@@ -82,6 +82,10 @@ class AutomationCookieStore : public net::CookieStore {
   DISALLOW_COPY_AND_ASSIGN(AutomationCookieStore);
 };
 
+struct AutomationResourceMessageFilter::CookieCompletionInfo {
+  net::CompletionCallback* completion_callback;
+  scoped_refptr<net::CookieStore> cookie_store;
+};
 
 AutomationResourceMessageFilter::AutomationResourceMessageFilter()
     : channel_(NULL) {
diff --git a/chrome/browser/automation/automation_resource_message_filter.h b/chrome/browser/automation/automation_resource_message_filter.h
index c245f280..a30825f 100644
--- a/chrome/browser/automation/automation_resource_message_filter.h
+++ b/chrome/browser/automation/automation_resource_message_filter.h
@@ -203,10 +203,7 @@ class AutomationResourceMessageFilter
 
   // Contains information used for completing the request to read cookies from
   // the host coming in from the renderer.
-  struct CookieCompletionInfo {
-    net::CompletionCallback* completion_callback;
-    scoped_refptr<net::CookieStore> cookie_store;
-  };
+  struct CookieCompletionInfo;
 
   // Map of completion callback id to CookieCompletionInfo, which contains the
   // actual callback which is invoked on successful retrieval of cookies from
diff --git a/chrome/browser/blocked_content_container.cc b/chrome/browser/blocked_content_container.cc
index 58897c4..640e505 100644
--- a/chrome/browser/blocked_content_container.cc
+++ b/chrome/browser/blocked_content_container.cc
@@ -31,6 +31,8 @@ BlockedContentContainer::BlockedContentContainer(TabContents* owner)
     : owner_(owner) {
 }
 
+BlockedContentContainer::~BlockedContentContainer() {}
+
 void BlockedContentContainer::AddTabContents(TabContents* tab_contents,
                                              WindowOpenDisposition disposition,
                                              const gfx::Rect& bounds,
diff --git a/chrome/browser/blocked_content_container.h b/chrome/browser/blocked_content_container.h
index 29fc467..714af7ce0 100644
--- a/chrome/browser/blocked_content_container.h
+++ b/chrome/browser/blocked_content_container.h
@@ -20,6 +20,7 @@ class BlockedContentContainer : public TabContentsDelegate {
  public:
   // Creates a container for a certain TabContents:
   explicit BlockedContentContainer(TabContents* owner);
+  virtual ~BlockedContentContainer();
 
   // Adds a TabContents to this container. |bounds| are the window bounds
   // requested for the TabContents.
diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index a4f0461..9b5be0f 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -40,6 +40,8 @@ BookmarkCodec::BookmarkCodec()
       maximum_id_(0) {
 }
 
+BookmarkCodec::~BookmarkCodec() {}
+
 Value* BookmarkCodec::Encode(BookmarkModel* model) {
   return Encode(model->GetBookmarkBarNode(), model->other_node());
 }
diff --git a/chrome/browser/bookmarks/bookmark_codec.h b/chrome/browser/bookmarks/bookmark_codec.h
index 94c9213..fe57d1f 100644
--- a/chrome/browser/bookmarks/bookmark_codec.h
+++ b/chrome/browser/bookmarks/bookmark_codec.h
@@ -33,6 +33,7 @@ class BookmarkCodec {
   // guarantees on how the IDs are reassigned or about doing minimal
   // reassignments to achieve uniqueness.
   BookmarkCodec();
+  ~BookmarkCodec();
 
   // Encodes the model to a JSON value. It's up to the caller to delete the
   // returned object. This is invoked to encode the contents of the bookmark bar
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
index e6309f4..7990de6 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
@@ -49,6 +49,8 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
   node_parent_index_ = static_cast<int>(it - nodes_.begin());
 }
 
+RecentlyUsedFoldersComboModel::~RecentlyUsedFoldersComboModel() {}
+
 int RecentlyUsedFoldersComboModel::GetItemCount() {
   return static_cast<int>(nodes_.size() + 1);
 }
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
index adf36a9..e8fcc75 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
@@ -18,6 +18,7 @@
 class RecentlyUsedFoldersComboModel : public ComboboxModel {
  public:
   RecentlyUsedFoldersComboModel(BookmarkModel* model, const BookmarkNode* node);
+  virtual ~RecentlyUsedFoldersComboModel();
 
   // Overridden from ComboboxModel:
   virtual int GetItemCount();
diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc
index 9c31138..18331b1 100644
--- a/chrome/browser/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data_appcache_helper.cc
@@ -61,6 +61,8 @@ void BrowsingDataAppCacheHelper::DeleteAppCacheGroup(
   GetAppCacheService()->DeleteAppCacheGroup(manifest_url, NULL);
 }
 
+BrowsingDataAppCacheHelper::~BrowsingDataAppCacheHelper() {}
+
 void BrowsingDataAppCacheHelper::OnFetchComplete(int rv) {
   if (BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     // Filter out appache info entries for extensions. Extension state is not
@@ -136,3 +138,5 @@ void CannedBrowsingDataAppCacheHelper::StartFetching(
   completion_callback->Run();
   delete completion_callback;
 }
+
+CannedBrowsingDataAppCacheHelper::~CannedBrowsingDataAppCacheHelper() {}
diff --git a/chrome/browser/browsing_data_appcache_helper.h b/chrome/browser/browsing_data_appcache_helper.h
index 58d92af..b54b511 100644
--- a/chrome/browser/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data_appcache_helper.h
@@ -32,7 +32,7 @@ class BrowsingDataAppCacheHelper
 
  protected:
   friend class base::RefCountedThreadSafe<BrowsingDataAppCacheHelper>;
-  virtual ~BrowsingDataAppCacheHelper() {}
+  virtual ~BrowsingDataAppCacheHelper();
 
   scoped_ptr<Callback0::Type> completion_callback_;
   scoped_refptr<appcache::AppCacheInfoCollection> info_collection_;
@@ -71,7 +71,7 @@ class CannedBrowsingDataAppCacheHelper : public BrowsingDataAppCacheHelper {
   virtual void CancelNotification() {}
 
  private:
-  virtual ~CannedBrowsingDataAppCacheHelper() {}
+  virtual ~CannedBrowsingDataAppCacheHelper();
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataAppCacheHelper);
 };
diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data_indexed_db_helper.cc
index 830e299..0ecdc2e 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data_indexed_db_helper.cc
@@ -215,3 +215,5 @@ void CannedBrowsingDataIndexedDBHelper::StartFetching(
   callback->Run(indexed_db_info_);
   delete callback;
 }
+
+CannedBrowsingDataIndexedDBHelper::~CannedBrowsingDataIndexedDBHelper() {}
diff --git a/chrome/browser/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data_indexed_db_helper.h
index c3704ec..11a9755 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data_indexed_db_helper.h
@@ -113,7 +113,7 @@ class CannedBrowsingDataIndexedDBHelper
   virtual void DeleteIndexedDBFile(const FilePath& file_path) {}
 
  private:
-  virtual ~CannedBrowsingDataIndexedDBHelper() {}
+  virtual ~CannedBrowsingDataIndexedDBHelper();
 
   Profile* profile_;
 
diff --git a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc b/chrome/browser/dom_ui/dom_ui_screenshot_source.cc
index 8913fd7..db35499 100644
--- a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_screenshot_source.cc
@@ -108,6 +108,8 @@ DOMUIScreenshotSource::DOMUIScreenshotSource(
     current_screenshot_.clear();
 }
 
+DOMUIScreenshotSource::~DOMUIScreenshotSource() {}
+
 void DOMUIScreenshotSource::StartDataRequest(const std::string& path,
                                             bool is_off_the_record,
                                             int request_id) {
diff --git a/chrome/browser/dom_ui/dom_ui_screenshot_source.h b/chrome/browser/dom_ui/dom_ui_screenshot_source.h
index be4e280..8cd8b2c 100644
--- a/chrome/browser/dom_ui/dom_ui_screenshot_source.h
+++ b/chrome/browser/dom_ui/dom_ui_screenshot_source.h
@@ -36,7 +36,7 @@ class DOMUIScreenshotSource : public ChromeURLDataManager::DataSource {
   std::vector<unsigned char> GetScreenshot(const std::string& path);
 
  private:
-  ~DOMUIScreenshotSource() {}
+  virtual ~DOMUIScreenshotSource();
 
 //  scoped_refptr<RefCountedBytes> current_screenshot_;
   std::vector<unsigned char> current_screenshot_;
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc
index a1b8bf0..dca2917 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.cc
+++ b/chrome/browser/dom_ui/ntp_resource_cache.cc
@@ -140,6 +140,8 @@ NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) {
   pref_change_registrar_.Add(prefs::kNTPShownSections, this);
 }
 
+NTPResourceCache::~NTPResourceCache() {}
+
 RefCountedBytes* NTPResourceCache::GetNewTabHTML(bool is_off_the_record) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_off_the_record) {
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.h b/chrome/browser/dom_ui/ntp_resource_cache.h
index 3cdc3e5..b4d10b6 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.h
+++ b/chrome/browser/dom_ui/ntp_resource_cache.h
@@ -20,7 +20,7 @@ class RefCountedBytes;
 class NTPResourceCache : public NotificationObserver {
  public:
   explicit NTPResourceCache(Profile* profile);
-  virtual ~NTPResourceCache() {}
+  virtual ~NTPResourceCache();
 
   RefCountedBytes* GetNewTabHTML(bool is_off_the_record);
   RefCountedBytes* GetNewTabCSS(bool is_off_the_record);
diff --git a/chrome/browser/dom_ui/options/core_options_handler.cc b/chrome/browser/dom_ui/options/core_options_handler.cc
index 520c57bd..aabd3f4 100644
--- a/chrome/browser/dom_ui/options/core_options_handler.cc
+++ b/chrome/browser/dom_ui/options/core_options_handler.cc
@@ -20,8 +20,9 @@
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 
-CoreOptionsHandler::CoreOptionsHandler() {
-}
+CoreOptionsHandler::CoreOptionsHandler() {}
+
+CoreOptionsHandler::~CoreOptionsHandler() {}
 
 void CoreOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
diff --git a/chrome/browser/dom_ui/options/core_options_handler.h b/chrome/browser/dom_ui/options/core_options_handler.h
index 85618e2..7860525 100644
--- a/chrome/browser/dom_ui/options/core_options_handler.h
+++ b/chrome/browser/dom_ui/options/core_options_handler.h
@@ -18,6 +18,7 @@
 class CoreOptionsHandler : public OptionsPageUIHandler {
  public:
   CoreOptionsHandler();
+  virtual ~CoreOptionsHandler();
 
   // OptionsUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
diff --git a/chrome/browser/dom_ui/options/options_managed_banner_handler.cc b/chrome/browser/dom_ui/options/options_managed_banner_handler.cc
index 2f802f4..7be5bf9 100644
--- a/chrome/browser/dom_ui/options/options_managed_banner_handler.cc
+++ b/chrome/browser/dom_ui/options/options_managed_banner_handler.cc
@@ -17,6 +17,8 @@ OptionsManagedBannerHandler::OptionsManagedBannerHandler(
   SetupBannerVisibilty();
 }
 
+OptionsManagedBannerHandler::~OptionsManagedBannerHandler() {}
+
 void OptionsManagedBannerHandler::OnUpdateVisibility() {
   // A preference that may be managed has changed.  Update our visibility
   // state.
diff --git a/chrome/browser/dom_ui/options/options_managed_banner_handler.h b/chrome/browser/dom_ui/options/options_managed_banner_handler.h
index b03bed2..6c63484 100644
--- a/chrome/browser/dom_ui/options/options_managed_banner_handler.h
+++ b/chrome/browser/dom_ui/options/options_managed_banner_handler.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DOM_UI_OPTIONS_OPTIONS_MANAGED_BANNER_HANDLER_H_
 #pragma once
 
+#include "base/string16.h"
 #include "chrome/browser/policy/managed_prefs_banner_base.h"
 #include "chrome/browser/options_window.h"
 
@@ -18,7 +19,7 @@ class OptionsManagedBannerHandler : public policy::ManagedPrefsBannerBase {
  public:
   OptionsManagedBannerHandler(DOMUI* dom_ui, const string16& page_name,
                               OptionsPage page);
-  virtual ~OptionsManagedBannerHandler() { }
+  virtual ~OptionsManagedBannerHandler();
 
  protected:
   // ManagedPrefsBannerBase implementation.
diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc
index 4d4cc48..3b79465 100644
--- a/chrome/browser/dom_ui/options/options_ui.cc
+++ b/chrome/browser/dom_ui/options/options_ui.cc
@@ -85,6 +85,8 @@ OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings)
   localized_strings_.reset(localized_strings);
 }
 
+OptionsUIHTMLSource::~OptionsUIHTMLSource() {}
+
 void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
                                            bool is_off_the_record,
                                            int request_id) {
@@ -103,6 +105,10 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
   SendResponse(request_id, html_bytes);
 }
 
+std::string OptionsUIHTMLSource::GetMimeType(const std::string&) const {
+  return "text/html";
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OptionsPageUIHandler
diff --git a/chrome/browser/dom_ui/options/options_ui.h b/chrome/browser/dom_ui/options/options_ui.h
index 4f9bf6c..fafe972 100644
--- a/chrome/browser/dom_ui/options/options_ui.h
+++ b/chrome/browser/dom_ui/options/options_ui.h
@@ -23,16 +23,14 @@ class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource {
  public:
   // The constructor takes over ownership of |localized_strings|.
   explicit OptionsUIHTMLSource(DictionaryValue* localized_strings);
-  virtual ~OptionsUIHTMLSource() {}
+  virtual ~OptionsUIHTMLSource();
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
   virtual void StartDataRequest(const std::string& path,
                                 bool is_off_the_record,
                                 int request_id);
-  virtual std::string GetMimeType(const std::string&) const {
-    return "text/html";
-  }
+  virtual std::string GetMimeType(const std::string&) const;
 
  private:
    // Localized strings collection.
diff --git a/chrome/browser/download/drag_download_util.cc b/chrome/browser/download/drag_download_util.cc
index f493ab1..72804e5 100644
--- a/chrome/browser/download/drag_download_util.cc
+++ b/chrome/browser/download/drag_download_util.cc
@@ -86,6 +86,13 @@ FileStream* CreateFileStreamForDrop(FilePath* file_path) {
   return NULL;
 }
 
+PromiseFileFinalizer::PromiseFileFinalizer(
+    DragDownloadFile* drag_file_downloader)
+    : drag_file_downloader_(drag_file_downloader) {
+}
+
+PromiseFileFinalizer::~PromiseFileFinalizer() {}
+
 void PromiseFileFinalizer::Cleanup() {
   if (drag_file_downloader_.get())
     drag_file_downloader_ = NULL;
diff --git a/chrome/browser/download/drag_download_util.h b/chrome/browser/download/drag_download_util.h
index bd9d44a..31bda47 100644
--- a/chrome/browser/download/drag_download_util.h
+++ b/chrome/browser/download/drag_download_util.h
@@ -42,10 +42,8 @@ net::FileStream* CreateFileStreamForDrop(FilePath* file_path);
 // Implementation of DownloadFileObserver to finalize the download process.
 class PromiseFileFinalizer : public DownloadFileObserver {
  public:
-  explicit PromiseFileFinalizer(DragDownloadFile* drag_file_downloader)
-      : drag_file_downloader_(drag_file_downloader) {
-  }
-  virtual ~PromiseFileFinalizer() { }
+  explicit PromiseFileFinalizer(DragDownloadFile* drag_file_downloader);
+  virtual ~PromiseFileFinalizer();
 
   // DownloadFileObserver methods.
   virtual void OnDownloadCompleted(const FilePath& file_path);
diff --git a/chrome/browser/extensions/extension_accessibility_api.cc b/chrome/browser/extensions/extension_accessibility_api.cc
index 3a24759..4c60b5e 100644
--- a/chrome/browser/extensions/extension_accessibility_api.cc
+++ b/chrome/browser/extensions/extension_accessibility_api.cc
@@ -40,6 +40,9 @@ ExtensionAccessibilityEventRouter*
   return Singleton<ExtensionAccessibilityEventRouter>::get();
 }
 
+ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
+    : enabled_(false) {}
+
 ExtensionAccessibilityEventRouter::~ExtensionAccessibilityEventRouter() {
   STLDeleteElements(&on_enabled_listeners_);
   STLDeleteElements(&on_disabled_listeners_);
diff --git a/chrome/browser/extensions/extension_accessibility_api.h b/chrome/browser/extensions/extension_accessibility_api.h
index 87f94d7..749dc7e 100644
--- a/chrome/browser/extensions/extension_accessibility_api.h
+++ b/chrome/browser/extensions/extension_accessibility_api.h
@@ -47,8 +47,7 @@ class ExtensionAccessibilityEventRouter : public NotificationObserver {
  private:
   friend struct DefaultSingletonTraits<ExtensionAccessibilityEventRouter>;
 
-  ExtensionAccessibilityEventRouter()
-      : enabled_(false) {}
+  ExtensionAccessibilityEventRouter();
   virtual ~ExtensionAccessibilityEventRouter();
 
   // NotificationObserver::Observe.
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index 791b4f9..f805a1e 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -762,6 +762,10 @@ void CreateBookmarkFunction::GetQuotaLimitHeuristics(
   BookmarksQuotaLimitFactory::BuildForCreate(heuristics, profile());
 }
 
+BookmarksIOFunction::BookmarksIOFunction() {}
+
+BookmarksIOFunction::~BookmarksIOFunction() {}
+
 void BookmarksIOFunction::SelectFile(SelectFileDialog::Type type) {
   // Balanced in one of the three callbacks of SelectFileDialog:
   // either FileSelectionCanceled, MultiFilesSelected, or FileSelected
diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/extensions/extension_bookmarks_module.h
index 27c2111..e8e91a1 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.h
+++ b/chrome/browser/extensions/extension_bookmarks_module.h
@@ -174,6 +174,9 @@ class UpdateBookmarkFunction : public BookmarksFunction {
 class BookmarksIOFunction : public BookmarksFunction,
                             public SelectFileDialog::Listener {
  public:
+  BookmarksIOFunction();
+  virtual ~BookmarksIOFunction();
+
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const FilePath& path, int index, void* params) = 0;
   void MultiFilesSelected(const std::vector<FilePath>& files, void* params);
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index ed37fa9..b9ef775 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -137,6 +137,8 @@ ExtensionBrowserEventRouter::ExtensionBrowserEventRouter()
       focused_window_id_(extension_misc::kUnknownWindowId),
       profile_(NULL) { }
 
+ExtensionBrowserEventRouter::~ExtensionBrowserEventRouter() {}
+
 void ExtensionBrowserEventRouter::OnBrowserAdded(const Browser* browser) {
   RegisterForBrowserNotifications(browser);
 }
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index 7cd2f99..bfd2205 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -122,6 +122,7 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
   void UnregisterForTabNotifications(TabContents* contents);
 
   ExtensionBrowserEventRouter();
+  ~ExtensionBrowserEventRouter();
   friend struct DefaultSingletonTraits<ExtensionBrowserEventRouter>;
 
   NotificationRegistrar registrar_;
diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc
index 554c005..08f3b45 100644
--- a/chrome/browser/extensions/extension_dom_ui.cc
+++ b/chrome/browser/extensions/extension_dom_ui.cc
@@ -146,6 +146,8 @@ ExtensionDOMUI::ExtensionDOMUI(TabContents* tab_contents, GURL url)
   }
 }
 
+ExtensionDOMUI::~ExtensionDOMUI() {}
+
 void ExtensionDOMUI::ResetExtensionFunctionDispatcher(
     RenderViewHost* render_view_host) {
   // Use the NavigationController to get the URL rather than the TabContents
@@ -189,10 +191,19 @@ Browser* ExtensionDOMUI::GetBrowser() const {
   return BrowserList::FindBrowserWithProfile(DOMUI::GetProfile());
 }
 
+TabContents* ExtensionDOMUI::associated_tab_contents() const {
+  return tab_contents();
+}
+
 Profile* ExtensionDOMUI::GetProfile() {
   return DOMUI::GetProfile();
 }
 
+ExtensionBookmarkManagerEventRouter*
+ExtensionDOMUI::extension_bookmark_manager_event_router() {
+  return extension_bookmark_manager_event_router_.get();
+}
+
 gfx::NativeWindow ExtensionDOMUI::GetCustomFrameNativeWindow() {
   if (GetBrowser())
     return NULL;
diff --git a/chrome/browser/extensions/extension_dom_ui.h b/chrome/browser/extensions/extension_dom_ui.h
index a6c598f..22a106c 100644
--- a/chrome/browser/extensions/extension_dom_ui.h
+++ b/chrome/browser/extensions/extension_dom_ui.h
@@ -35,6 +35,8 @@ class ExtensionDOMUI
 
   explicit ExtensionDOMUI(TabContents* tab_contents, GURL url);
 
+  virtual ~ExtensionDOMUI();
+
   ExtensionFunctionDispatcher* extension_function_dispatcher() const {
     return extension_function_dispatcher_.get();
   }
@@ -48,15 +50,11 @@ class ExtensionDOMUI
   virtual Browser* GetBrowser() const;
   virtual gfx::NativeView GetNativeViewOfHost();
   virtual gfx::NativeWindow GetCustomFrameNativeWindow();
-  virtual TabContents* associated_tab_contents() const {
-    return tab_contents();
-  }
+  virtual TabContents* associated_tab_contents() const;
   virtual Profile* GetProfile();
 
   virtual ExtensionBookmarkManagerEventRouter*
-      extension_bookmark_manager_event_router() {
-    return extension_bookmark_manager_event_router_.get();
-  }
+      extension_bookmark_manager_event_router();
 
   // BrowserURLHandler
   static bool HandleChromeURLOverride(GURL* url, Profile* profile);
diff --git a/chrome/browser/extensions/extension_history_api.cc b/chrome/browser/extensions/extension_history_api.cc
index 412c091..6c07488 100644
--- a/chrome/browser/extensions/extension_history_api.cc
+++ b/chrome/browser/extensions/extension_history_api.cc
@@ -82,6 +82,10 @@ void ExtensionHistoryEventRouter::ObserveProfile(Profile* profile) {
   }
 }
 
+ExtensionHistoryEventRouter::ExtensionHistoryEventRouter() {}
+
+ExtensionHistoryEventRouter::~ExtensionHistoryEventRouter() {}
+
 void ExtensionHistoryEventRouter::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
diff --git a/chrome/browser/extensions/extension_history_api.h b/chrome/browser/extensions/extension_history_api.h
index 9bd89e3..a0694f4 100644
--- a/chrome/browser/extensions/extension_history_api.h
+++ b/chrome/browser/extensions/extension_history_api.h
@@ -28,8 +28,8 @@ class ExtensionHistoryEventRouter : public NotificationObserver {
  private:
   friend struct DefaultSingletonTraits<ExtensionHistoryEventRouter>;
 
-  ExtensionHistoryEventRouter() {}
-  virtual ~ExtensionHistoryEventRouter() {}
+  ExtensionHistoryEventRouter();
+  virtual ~ExtensionHistoryEventRouter();
 
   // NotificationObserver::Observe.
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index 52a4b4fe..fc71437 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -68,6 +68,12 @@ static const int kMaxUpdateFrequencySeconds = 60 * 60 * 24 * 7;  // 7 days
 // request. We want to stay under 2K because of proxies, etc.
 static const int kExtensionsManifestMaxURLSize = 2000;
 
+ManifestFetchData::ManifestFetchData(GURL update_url)
+    : base_url_(update_url),
+      full_url_(update_url) {
+}
+
+ManifestFetchData::~ManifestFetchData() {}
 
 // The format for request parameters in update checks is:
 //
@@ -126,6 +132,10 @@ bool ManifestFetchData::AddExtension(std::string id, std::string version,
   return true;
 }
 
+bool ManifestFetchData::Includes(std::string extension_id) const {
+  return extension_ids_.find(extension_id) != extension_ids_.end();
+}
+
 bool ManifestFetchData::DidPing(std::string extension_id) const {
   std::map<std::string, int>::const_iterator i = ping_days_.find(extension_id);
   if (i != ping_days_.end()) {
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index ad8d243..6f646e1 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -36,8 +36,8 @@ class ManifestFetchData {
  public:
   static const int kNeverPinged = -1;
 
-  explicit ManifestFetchData(GURL update_url) : base_url_(update_url),
-      full_url_(update_url) {}
+  explicit ManifestFetchData(GURL update_url);
+  ~ManifestFetchData();
 
   // Returns true if this extension information was successfully added. If the
   // return value is false it means the full_url would have become too long, and
@@ -50,9 +50,7 @@ class ManifestFetchData {
   const std::set<std::string>& extension_ids() const { return extension_ids_; }
 
   // Returns true if the given id is included in this manifest fetch.
-  bool Includes(std::string extension_id) const {
-    return extension_ids_.find(extension_id) != extension_ids_.end();
-  }
+  bool Includes(std::string extension_id) const;
 
   // Returns true if a ping parameter was added to full_url for this extension
   // id.
diff --git a/chrome/browser/extensions/file_reader.cc b/chrome/browser/extensions/file_reader.cc
index 485565f..b46e1d1 100644
--- a/chrome/browser/extensions/file_reader.cc
+++ b/chrome/browser/extensions/file_reader.cc
@@ -22,6 +22,8 @@ void FileReader::Start() {
       NewRunnableMethod(this, &FileReader::ReadFileOnBackgroundThread));
 }
 
+FileReader::~FileReader() {}
+
 void FileReader::ReadFileOnBackgroundThread() {
   std::string data;
   bool success = file_util::ReadFileToString(resource_.GetFilePath(), &data);
diff --git a/chrome/browser/extensions/file_reader.h b/chrome/browser/extensions/file_reader.h
index b64d83c..c26ce11 100644
--- a/chrome/browser/extensions/file_reader.h
+++ b/chrome/browser/extensions/file_reader.h
@@ -32,7 +32,7 @@ class FileReader : public base::RefCountedThreadSafe<FileReader> {
  private:
   friend class base::RefCountedThreadSafe<FileReader>;
 
-  ~FileReader() {}
+  virtual ~FileReader();
 
   void ReadFileOnBackgroundThread();
   void RunCallback(bool success, const std::string& data);
diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc
index d363631..5f64025 100644
--- a/chrome/browser/extensions/pack_extension_job.cc
+++ b/chrome/browser/extensions/pack_extension_job.cc
@@ -30,6 +30,8 @@ void PackExtensionJob::ClearClient() {
   client_ = NULL;
 }
 
+PackExtensionJob::~PackExtensionJob() {}
+
 void PackExtensionJob::RunOnFileThread() {
   crx_file_out_ = FilePath(root_directory_.value() +
                            chrome::kExtensionFileExtension);
diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h
index 62e226d..ecd3d68 100644
--- a/chrome/browser/extensions/pack_extension_job.h
+++ b/chrome/browser/extensions/pack_extension_job.h
@@ -48,7 +48,7 @@ class PackExtensionJob : public base::RefCountedThreadSafe<PackExtensionJob> {
  private:
   friend class base::RefCountedThreadSafe<PackExtensionJob>;
 
-  ~PackExtensionJob() {}
+  virtual ~PackExtensionJob();
 
   void RunOnFileThread();
   void ReportSuccessOnClientThread();
diff --git a/chrome/browser/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/gtk/extension_installed_bubble_gtk.cc
index f5a6f5f..c3ad8d6 100644
--- a/chrome/browser/gtk/extension_installed_bubble_gtk.cc
+++ b/chrome/browser/gtk/extension_installed_bubble_gtk.cc
@@ -75,6 +75,8 @@ ExtensionInstalledBubbleGtk::ExtensionInstalledBubbleGtk(Extension *extension,
       NotificationService::AllSources());
 }
 
+ExtensionInstalledBubbleGtk::~ExtensionInstalledBubbleGtk() {}
+
 void ExtensionInstalledBubbleGtk::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
diff --git a/chrome/browser/gtk/extension_installed_bubble_gtk.h b/chrome/browser/gtk/extension_installed_bubble_gtk.h
index 17b6672d..9b8483c 100644
--- a/chrome/browser/gtk/extension_installed_bubble_gtk.h
+++ b/chrome/browser/gtk/extension_installed_bubble_gtk.h
@@ -54,7 +54,7 @@ class ExtensionInstalledBubbleGtk
   ExtensionInstalledBubbleGtk(Extension *extension, Browser *browser,
                               SkBitmap icon);
 
-  ~ExtensionInstalledBubbleGtk() {}
+  virtual ~ExtensionInstalledBubbleGtk();
 
   // Shows the bubble. Called internally via PostTask.
   void ShowInternal();
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index 51c71cc..22bdcff 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -160,6 +160,8 @@ TabRendererGtk::LoadingAnimation::LoadingAnimation(
       animation_frame_(0) {
 }
 
+TabRendererGtk::LoadingAnimation::~LoadingAnimation() {}
+
 bool TabRendererGtk::LoadingAnimation::ValidateLoadingAnimation(
     AnimationState animation_state) {
   bool has_changed = false;
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
index f3a9763..b25e001 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
@@ -61,6 +61,8 @@ class TabRendererGtk : public AnimationDelegate,
     // Used in unit tests to inject specific data.
     explicit LoadingAnimation(const LoadingAnimation::Data& data);
 
+    virtual ~LoadingAnimation();
+
     // Advance the loading animation to the next frame, or hide the animation if
     // the tab isn't loading. Returns |true| if the icon area needs to be
     // repainted.
diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc
index ea76e59..8b68971 100644
--- a/chrome/browser/history/in_memory_url_index.cc
+++ b/chrome/browser/history/in_memory_url_index.cc
@@ -33,6 +33,19 @@ ScoredHistoryMatch::ScoredHistoryMatch(const URLRow& url_info,
       raw_score(score) {
 }
 
+struct InMemoryURLIndex::TermCharWordSet {
+  TermCharWordSet(Char16Set char_set, WordIDSet word_id_set, bool used)
+      : char_set_(char_set),
+        word_id_set_(word_id_set),
+        used_(used) {}
+
+  bool IsNotUsed() const { return !used_; }
+
+  Char16Set char_set_;
+  WordIDSet word_id_set_;
+  bool used_;  // true if this set has been used for the current term search.
+};
+
 InMemoryURLIndex::InMemoryURLIndex() : history_item_count_(0) {}
 
 InMemoryURLIndex::~InMemoryURLIndex() {}
diff --git a/chrome/browser/history/in_memory_url_index.h b/chrome/browser/history/in_memory_url_index.h
index 8008a74..6993e0d 100644
--- a/chrome/browser/history/in_memory_url_index.h
+++ b/chrome/browser/history/in_memory_url_index.h
@@ -120,18 +120,7 @@ class InMemoryURLIndex {
 
   // Support caching of term character intersections so that we can optimize
   // searches which build upon a previous search.
-  struct TermCharWordSet {
-    TermCharWordSet(Char16Set char_set, WordIDSet word_id_set, bool used)
-        : char_set_(char_set),
-          word_id_set_(word_id_set),
-          used_(used) {}
-
-    bool IsNotUsed() const { return !used_; }
-
-    Char16Set char_set_;
-    WordIDSet word_id_set_;
-    bool used_;  // true if this set has been used for the current term search.
-  };
+  struct TermCharWordSet;
   typedef std::vector<TermCharWordSet> TermCharWordSetVector;
 
   // TODO(rohitrao): Probably replace this with QueryResults.
diff --git a/chrome/browser/history/page_usage_data.cc b/chrome/browser/history/page_usage_data.cc
index f202538..8fc2d8b 100644
--- a/chrome/browser/history/page_usage_data.cc
+++ b/chrome/browser/history/page_usage_data.cc
@@ -8,6 +8,17 @@
 
 #include "third_party/skia/include/core/SkBitmap.h"
 
+PageUsageData::PageUsageData(history::URLID id)
+    : id_(id),
+      thumbnail_(NULL),
+      thumbnail_set_(false),
+      thumbnail_pending_(false),
+      favicon_(NULL),
+      favicon_set_(false),
+      favicon_pending_(false),
+      score_(0.0) {
+}
+
 PageUsageData::~PageUsageData() {
   delete thumbnail_;
   delete favicon_;
diff --git a/chrome/browser/history/page_usage_data.h b/chrome/browser/history/page_usage_data.h
index b7a689a..41d9841 100644
--- a/chrome/browser/history/page_usage_data.h
+++ b/chrome/browser/history/page_usage_data.h
@@ -24,16 +24,7 @@ class SkBitmap;
 /////////////////////////////////////////////////////////////////////////////
 class PageUsageData {
  public:
-  explicit PageUsageData(history::URLID id)
-      : id_(id),
-        thumbnail_(NULL),
-        thumbnail_set_(false),
-        thumbnail_pending_(false),
-        favicon_(NULL),
-        favicon_set_(false),
-        favicon_pending_(false),
-        score_(0.0) {
-  }
+  explicit PageUsageData(history::URLID id);
 
   virtual ~PageUsageData();
 
diff --git a/chrome/browser/history/text_database.cc b/chrome/browser/history/text_database.cc
index 7454681..84367d3 100644
--- a/chrome/browser/history/text_database.cc
+++ b/chrome/browser/history/text_database.cc
@@ -58,6 +58,10 @@ const FilePath::CharType kFilePrefix[] = FILE_PATH_LITERAL("History Index ");
 
 }  // namespace
 
+TextDatabase::Match::Match() {}
+
+TextDatabase::Match::~Match() {}
+
 TextDatabase::TextDatabase(const FilePath& path,
                            DBIdent id,
                            bool allow_create)
diff --git a/chrome/browser/history/text_database.h b/chrome/browser/history/text_database.h
index e881888..9fb3c0d 100644
--- a/chrome/browser/history/text_database.h
+++ b/chrome/browser/history/text_database.h
@@ -28,6 +28,9 @@ class TextDatabase {
 
   // Returned from the search function.
   struct Match {
+    Match();
+    ~Match();
+
     // URL of the match.
     GURL url;
 
diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/host_content_settings_map.cc
index 5e2a78c..96a9bc2 100644
--- a/chrome/browser/host_content_settings_map.cc
+++ b/chrome/browser/host_content_settings_map.cc
@@ -101,6 +101,12 @@ static bool ShouldAllowAllContent(const GURL& url) {
 }
 }  // namespace
 
+
+struct HostContentSettingsMap::ExtendedContentSettings {
+  ContentSettings content_settings;
+  ResourceContentSettings content_settings_for_resources;
+};
+
 // static
 HostContentSettingsMap::Pattern HostContentSettingsMap::Pattern::FromURL(
     const GURL& url) {
diff --git a/chrome/browser/host_content_settings_map.h b/chrome/browser/host_content_settings_map.h
index 24518bf..25edb99 100644
--- a/chrome/browser/host_content_settings_map.h
+++ b/chrome/browser/host_content_settings_map.h
@@ -247,11 +247,7 @@ class HostContentSettingsMap
   typedef std::map<ContentSettingsTypeResourceIdentifierPair, ContentSetting>
       ResourceContentSettings;
 
-  struct ExtendedContentSettings {
-    ContentSettings content_settings;
-    ResourceContentSettings content_settings_for_resources;
-  };
-
+  struct ExtendedContentSettings;
   typedef std::map<std::string, ExtendedContentSettings> HostContentSettings;
 
   // Sets the fields of |settings| based on the values in |dictionary|.
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 6c1ea77..0318219 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -24,6 +24,15 @@
 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
 #endif
 
+ProcessMemoryInformation::ProcessMemoryInformation()
+    : pid(0),
+      num_processes(0),
+      is_diagnostics(false),
+      type(ChildProcessInfo::UNKNOWN_PROCESS) {
+}
+
+ProcessMemoryInformation::~ProcessMemoryInformation() {}
+
 // About threading:
 //
 // This operation will hit no fewer than 3 threads.
@@ -36,7 +45,6 @@
 // one task run for that long on the UI or IO threads.  So, we run the
 // expensive parts of this operation over on the file thread.
 //
-
 void MemoryDetails::StartFetch() {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ -48,6 +56,8 @@ void MemoryDetails::StartFetch() {
       NewRunnableMethod(this, &MemoryDetails::CollectChildInfoOnIOThread));
 }
 
+MemoryDetails::~MemoryDetails() {}
+
 void MemoryDetails::CollectChildInfoOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
diff --git a/chrome/browser/memory_details.h b/chrome/browser/memory_details.h
index e9ceb464..1513ab4 100644
--- a/chrome/browser/memory_details.h
+++ b/chrome/browser/memory_details.h
@@ -16,12 +16,8 @@
 // have multiple processes (of course!).  Even IE has multiple
 // processes these days.
 struct ProcessMemoryInformation {
-  ProcessMemoryInformation()
-      : pid(0),
-        num_processes(0),
-        is_diagnostics(false),
-        type(ChildProcessInfo::UNKNOWN_PROCESS) {
-  }
+  ProcessMemoryInformation();
+  ~ProcessMemoryInformation();
 
   // The process id.
   base::ProcessId pid;
@@ -101,7 +97,7 @@ class MemoryDetails : public base::RefCountedThreadSafe<MemoryDetails> {
  protected:
   friend class base::RefCountedThreadSafe<MemoryDetails>;
 
-  virtual ~MemoryDetails() {}
+  virtual ~MemoryDetails();
 
  private:
   // Collect child process information on the IO thread.  This is needed because
diff --git a/chrome/browser/net/url_info.cc b/chrome/browser/net/url_info.cc
index cbf35db..c383359 100644
--- a/chrome/browser/net/url_info.cc
+++ b/chrome/browser/net/url_info.cc
@@ -30,6 +30,17 @@ void EnablePredictorDetailedLog(bool enable) {
 // static
 int UrlInfo::sequence_counter = 1;
 
+UrlInfo::UrlInfo()
+    : state_(PENDING),
+      old_prequeue_state_(state_),
+      resolve_duration_(kNullDuration),
+      queue_duration_(kNullDuration),
+      sequence_number_(0),
+      motivation_(NO_PREFETCH_MOTIVATION),
+      was_linked_(false) {
+}
+
+UrlInfo::~UrlInfo() {}
 
 bool UrlInfo::NeedsDnsUpdate() {
   switch (state_) {
diff --git a/chrome/browser/net/url_info.h b/chrome/browser/net/url_info.h
index 6b50f42..378edbf 100644
--- a/chrome/browser/net/url_info.h
+++ b/chrome/browser/net/url_info.h
@@ -74,17 +74,9 @@ class UrlInfo {
 
   // UrlInfo are usually made by the default constructor during
   // initializing of the Predictor's map (of info for Hostnames).
-  UrlInfo()
-      : state_(PENDING),
-        old_prequeue_state_(state_),
-        resolve_duration_(kNullDuration),
-        queue_duration_(kNullDuration),
-        sequence_number_(0),
-        motivation_(NO_PREFETCH_MOTIVATION),
-        was_linked_(false) {
-  }
+  UrlInfo();
 
-  ~UrlInfo() {}
+  ~UrlInfo();
 
   // NeedDnsUpdate decides, based on our internal info,
   // if it would be valuable to attempt to update (prefectch)
diff --git a/chrome/browser/net/url_request_mock_net_error_job.cc b/chrome/browser/net/url_request_mock_net_error_job.cc
index a590833..f4aa330 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.cc
+++ b/chrome/browser/net/url_request_mock_net_error_job.cc
@@ -19,6 +19,20 @@
 URLRequestMockNetErrorJob::URLMockInfoMap
     URLRequestMockNetErrorJob::url_mock_info_map_;
 
+struct URLRequestMockNetErrorJob::MockInfo {
+  MockInfo() : ssl_cert(NULL) { }
+  MockInfo(std::wstring base,
+           std::vector<int> errors,
+           net::X509Certificate* ssl_cert)
+      : base(base),
+        errors(errors),
+        ssl_cert(ssl_cert) { }
+
+  std::wstring base;
+  std::vector<int> errors;
+  scoped_refptr<net::X509Certificate> ssl_cert;
+};
+
 // static
 void URLRequestMockNetErrorJob::AddMockedURL(const GURL& url,
                                              const std::wstring& base,
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 4519161..059272f 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -38,19 +38,6 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
 
  private:
   ~URLRequestMockNetErrorJob();
-  struct MockInfo {
-    MockInfo() : ssl_cert(NULL) { }
-    MockInfo(std::wstring base,
-             std::vector<int> errors,
-             net::X509Certificate* ssl_cert)
-        : base(base),
-          errors(errors),
-          ssl_cert(ssl_cert) { }
-
-    std::wstring base;
-    std::vector<int> errors;
-    scoped_refptr<net::X509Certificate> ssl_cert;
-  };
 
   static URLRequest::ProtocolFactory Factory;
 
@@ -62,6 +49,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
   // The certificate to use for SSL errors.
   scoped_refptr<net::X509Certificate> ssl_cert_;
 
+  struct MockInfo;
   typedef std::map<GURL, MockInfo> URLMockInfoMap;
   static URLMockInfoMap url_mock_info_map_;
 
diff --git a/chrome/browser/password_manager/password_store.cc b/chrome/browser/password_manager/password_store.cc
index 4ae9ee0..4035de3 100644
--- a/chrome/browser/password_manager/password_store.cc
+++ b/chrome/browser/password_manager/password_store.cc
@@ -28,6 +28,8 @@ void PasswordStore::ReportMetrics() {
   ScheduleTask(NewRunnableMethod(this, &PasswordStore::ReportMetricsImpl));
 }
 
+PasswordStore::~PasswordStore() {}
+
 void PasswordStore::AddLogin(const PasswordForm& form) {
   ScheduleTask(NewRunnableMethod(this, &PasswordStore::AddLoginImpl, form));
 }
diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h
index 6b538d9..4ab5575 100644
--- a/chrome/browser/password_manager/password_store.h
+++ b/chrome/browser/password_manager/password_store.h
@@ -85,7 +85,7 @@ class PasswordStore : public base::RefCountedThreadSafe<PasswordStore> {
   friend class browser_sync::PasswordModelWorker;
   friend class LivePasswordsSyncTest;
 
-  virtual ~PasswordStore() {}
+  virtual ~PasswordStore();
 
   // Simple container class that represents a login lookup request.
   class GetLoginsRequest {
diff --git a/chrome/browser/policy/configuration_policy_provider.cc b/chrome/browser/policy/configuration_policy_provider.cc
index f828836..0c7f2fd 100644
--- a/chrome/browser/policy/configuration_policy_provider.cc
+++ b/chrome/browser/policy/configuration_policy_provider.cc
@@ -21,6 +21,8 @@ ConfigurationPolicyProvider::ConfigurationPolicyProvider(
   }
 }
 
+ConfigurationPolicyProvider::~ConfigurationPolicyProvider() {}
+
 void ConfigurationPolicyProvider::NotifyStoreOfPolicyChange() {
   NotificationService::current()->Notify(
       NotificationType::POLICY_CHANGED,
diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h
index 494f5a8..4115107 100644
--- a/chrome/browser/policy/configuration_policy_provider.h
+++ b/chrome/browser/policy/configuration_policy_provider.h
@@ -34,7 +34,7 @@ class ConfigurationPolicyProvider {
 
   explicit ConfigurationPolicyProvider(const StaticPolicyValueMap& policy_map);
 
-  virtual ~ConfigurationPolicyProvider() {}
+  virtual ~ConfigurationPolicyProvider();
 
   // Must be implemented by provider subclasses to specify the
   // provider-specific policy decisions. The preference service
diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc
index e02ec25..1351da4 100644
--- a/chrome/browser/policy/managed_prefs_banner_base.cc
+++ b/chrome/browser/policy/managed_prefs_banner_base.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
@@ -23,6 +24,8 @@ ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* local_state,
   Init(local_state, user_prefs, page);
 }
 
+ManagedPrefsBannerBase::~ManagedPrefsBannerBase() {}
+
 void ManagedPrefsBannerBase::AddLocalStatePref(const char* pref) {
   local_state_set_->AddPref(pref);
 }
diff --git a/chrome/browser/policy/managed_prefs_banner_base.h b/chrome/browser/policy/managed_prefs_banner_base.h
index e175175..e087cb1 100644
--- a/chrome/browser/policy/managed_prefs_banner_base.h
+++ b/chrome/browser/policy/managed_prefs_banner_base.h
@@ -9,10 +9,10 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/options_window.h"
-#include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/common/notification_observer.h"
 
 class PrefService;
+class PrefSetObserver;
 
 namespace policy {
 
@@ -32,6 +32,8 @@ class ManagedPrefsBannerBase : public NotificationObserver {
   // global g_browser_process.
   ManagedPrefsBannerBase(PrefService* user_prefs, OptionsPage page);
 
+  virtual ~ManagedPrefsBannerBase();
+
   // Determine whether the banner should be visible.
   bool DetermineVisibility() const;
 
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 3331ed5b..8d398b6 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -28,12 +28,16 @@ CommandLinePrefStore::CommandLinePrefStore(const CommandLine* command_line)
     : command_line_(command_line),
       prefs_(new DictionaryValue()) {}
 
+CommandLinePrefStore::~CommandLinePrefStore() {}
+
 PrefStore::PrefReadError CommandLinePrefStore::ReadPrefs() {
   ApplySimpleSwitches();
   ValidateProxySwitches();
   return PrefStore::PREF_READ_ERROR_NONE;
 }
 
+DictionaryValue* CommandLinePrefStore::prefs() { return prefs_.get(); }
+
 void CommandLinePrefStore::ApplySimpleSwitches() {
   // Look for each switch we know about and set its preference accordingly.
   for (size_t i = 0; i < arraysize(string_switch_map_); ++i) {
diff --git a/chrome/browser/prefs/command_line_pref_store.h b/chrome/browser/prefs/command_line_pref_store.h
index 89e49ce..8dd7cd5 100644
--- a/chrome/browser/prefs/command_line_pref_store.h
+++ b/chrome/browser/prefs/command_line_pref_store.h
@@ -18,11 +18,11 @@ class DictionaryValue;
 class CommandLinePrefStore : public PrefStore {
  public:
   explicit CommandLinePrefStore(const CommandLine* command_line);
-  virtual ~CommandLinePrefStore() {}
+  virtual ~CommandLinePrefStore();
 
   // PrefStore methods:
   virtual PrefReadError ReadPrefs();
-  virtual DictionaryValue* prefs() { return prefs_.get(); }
+  virtual DictionaryValue* prefs();
 
  protected:
   // Logs a message and returns false if the proxy switches are
diff --git a/chrome/browser/prefs/pref_set_observer.cc b/chrome/browser/prefs/pref_set_observer.cc
index 70810c6..a073eb2 100644
--- a/chrome/browser/prefs/pref_set_observer.cc
+++ b/chrome/browser/prefs/pref_set_observer.cc
@@ -14,6 +14,8 @@ PrefSetObserver::PrefSetObserver(PrefService* pref_service,
   registrar_.Init(pref_service);
 }
 
+PrefSetObserver::~PrefSetObserver() {}
+
 void PrefSetObserver::AddPref(const std::string& pref) {
   if (!prefs_.count(pref) && pref_service_->FindPreference(pref.c_str())) {
     prefs_.insert(pref);
diff --git a/chrome/browser/prefs/pref_set_observer.h b/chrome/browser/prefs/pref_set_observer.h
index ff350df..568265c 100644
--- a/chrome/browser/prefs/pref_set_observer.h
+++ b/chrome/browser/prefs/pref_set_observer.h
@@ -20,7 +20,7 @@ class PrefSetObserver : public NotificationObserver {
   // Initialize with an empty set of preferences.
   PrefSetObserver(PrefService* pref_service,
                   NotificationObserver* observer);
-  virtual ~PrefSetObserver() {}
+  virtual ~PrefSetObserver();
 
   // Add a |pref| to the set of preferences to observe.
   void AddPref(const std::string& pref);
diff --git a/chrome/browser/renderer_host/mock_render_process_host.cc b/chrome/browser/renderer_host/mock_render_process_host.cc
index cdecb6f..a2ccfa0 100644
--- a/chrome/browser/renderer_host/mock_render_process_host.cc
+++ b/chrome/browser/renderer_host/mock_render_process_host.cc
@@ -87,6 +87,10 @@ bool MockRenderProcessHost::SendWithTimeout(IPC::Message* msg, int timeout_ms) {
   return true;
 }
 
+base::ProcessHandle MockRenderProcessHost::GetHandle() {
+  return base::kNullProcessHandle;
+}
+
 bool MockRenderProcessHost::Send(IPC::Message* msg) {
   // Save the message in the sink.
   sink_.OnMessageReceived(*msg);
@@ -119,6 +123,8 @@ void MockRenderProcessHost::OnMessageReceived(const IPC::Message& msg) {
 void MockRenderProcessHost::OnChannelConnected(int32 peer_pid) {
 }
 
+MockRenderProcessHostFactory::MockRenderProcessHostFactory() {}
+
 MockRenderProcessHostFactory::~MockRenderProcessHostFactory() {
   // Detach this object from MockRenderProcesses to prevent STLDeleteElements()
   // from calling MockRenderProcessHostFactory::Remove().
diff --git a/chrome/browser/renderer_host/mock_render_process_host.h b/chrome/browser/renderer_host/mock_render_process_host.h
index 33a6516..232725b 100644
--- a/chrome/browser/renderer_host/mock_render_process_host.h
+++ b/chrome/browser/renderer_host/mock_render_process_host.h
@@ -51,9 +51,7 @@ class MockRenderProcessHost : public RenderProcessHost {
   virtual void ResetVisitedLinks();
   virtual bool FastShutdownIfPossible();
   virtual bool SendWithTimeout(IPC::Message* msg, int timeout_ms);
-  virtual base::ProcessHandle GetHandle() {
-    return base::kNullProcessHandle;
-  }
+  virtual base::ProcessHandle GetHandle();
 
   virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id);
 
@@ -82,7 +80,7 @@ class MockRenderProcessHost : public RenderProcessHost {
 
 class MockRenderProcessHostFactory : public RenderProcessHostFactory {
  public:
-  MockRenderProcessHostFactory() {}
+  MockRenderProcessHostFactory();
   virtual ~MockRenderProcessHostFactory();
 
   virtual RenderProcessHost* CreateRenderProcessHost(Profile* profile) const;
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 3f19e58..cea0c94 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -1665,6 +1665,8 @@ SetCookieCompletion::SetCookieCompletion(int render_process_id,
       context_(context) {
 }
 
+SetCookieCompletion::~SetCookieCompletion() {}
+
 void SetCookieCompletion::RunWithParams(const Tuple1<int>& params) {
   int result = params.a;
   bool blocked_by_policy = true;
@@ -1703,6 +1705,8 @@ GetCookiesCompletion::GetCookiesCompletion(int render_process_id,
   set_cookie_store(context_->cookie_store());
 }
 
+GetCookiesCompletion::~GetCookiesCompletion() {}
+
 void GetCookiesCompletion::RunWithParams(const Tuple1<int>& params) {
   if (!raw_cookies_) {
     int result = params.a;
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index 7c46541..97d3992 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -510,6 +510,7 @@ class SetCookieCompletion : public net::CompletionCallback {
                       const GURL& url,
                       const std::string& cookie_line,
                       ChromeURLRequestContext* context);
+  virtual ~SetCookieCompletion();
 
   virtual void RunWithParams(const Tuple1<int>& params);
 
@@ -537,6 +538,7 @@ class GetCookiesCompletion : public net::CompletionCallback {
                        ResourceMessageFilter* filter,
                        URLRequestContext* context,
                        bool raw_cookies);
+  virtual ~GetCookiesCompletion();
 
   virtual void RunWithParams(const Tuple1<int>& params);
 
diff --git a/chrome/browser/sync/glue/ui_model_worker.cc b/chrome/browser/sync/glue/ui_model_worker.cc
index 62b0b15..86dbf44 100644
--- a/chrome/browser/sync/glue/ui_model_worker.cc
+++ b/chrome/browser/sync/glue/ui_model_worker.cc
@@ -41,6 +41,14 @@ void UIModelWorker::DoWorkAndWaitUntilDone(Callback0::Type* work) {
   work_done.Wait();
 }
 
+UIModelWorker::UIModelWorker(MessageLoop* ui_loop)
+    : state_(WORKING),
+      pending_work_(NULL),
+      syncapi_has_shutdown_(false),
+      ui_loop_(ui_loop),
+      syncapi_event_(&lock_) {
+}
+
 UIModelWorker::~UIModelWorker() {
   DCHECK_EQ(state_, STOPPED);
 }
diff --git a/chrome/browser/sync/glue/ui_model_worker.h b/chrome/browser/sync/glue/ui_model_worker.h
index f1df84c..66a2a995 100644
--- a/chrome/browser/sync/glue/ui_model_worker.h
+++ b/chrome/browser/sync/glue/ui_model_worker.h
@@ -31,13 +31,7 @@ namespace browser_sync {
 // after the actual syncer pthread has exited.
 class UIModelWorker : public browser_sync::ModelSafeWorker {
  public:
-  explicit UIModelWorker(MessageLoop* ui_loop)
-      : state_(WORKING),
-        pending_work_(NULL),
-        syncapi_has_shutdown_(false),
-        ui_loop_(ui_loop),
-        syncapi_event_(&lock_) {
-  }
+  explicit UIModelWorker(MessageLoop* ui_loop);
   virtual ~UIModelWorker();
 
   // A simple task to signal a waitable event after Run()ning a Closure.
diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc
index 6b27cd5..3ff8502 100644
--- a/chrome/browser/translate/translate_infobar_delegate.cc
+++ b/chrome/browser/translate/translate_infobar_delegate.cc
@@ -100,6 +100,8 @@ TranslateInfoBarDelegate::TranslateInfoBarDelegate(
   }
 }
 
+TranslateInfoBarDelegate::~TranslateInfoBarDelegate() {}
+
 int TranslateInfoBarDelegate::GetLanguageCount() const {
   return static_cast<int>(languages_.size());
 }
@@ -208,6 +210,12 @@ InfoBarDelegate::Type TranslateInfoBarDelegate::GetInfoBarType() {
   return InfoBarDelegate::PAGE_ACTION_TYPE;
 }
 
+TranslateInfoBarDelegate*
+TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
+  return this;
+}
+
+
 bool TranslateInfoBarDelegate::IsLanguageBlacklisted() {
   return prefs_.IsLanguageBlacklisted(GetOriginalLanguageCode());
 }
diff --git a/chrome/browser/translate/translate_infobar_delegate.h b/chrome/browser/translate/translate_infobar_delegate.h
index 0359caf..549af3d 100644
--- a/chrome/browser/translate/translate_infobar_delegate.h
+++ b/chrome/browser/translate/translate_infobar_delegate.h
@@ -51,6 +51,8 @@ class TranslateInfoBarDelegate : public InfoBarDelegate {
       const std::string& original_language,
       const std::string& target_language);
 
+  virtual ~TranslateInfoBarDelegate();
+
   // Returns the number of languages supported.
   int GetLanguageCount() const;
 
@@ -102,9 +104,7 @@ class TranslateInfoBarDelegate : public InfoBarDelegate {
   virtual void InfoBarClosed();
   virtual SkBitmap* GetIcon() const;
   virtual InfoBarDelegate::Type GetInfoBarType();
-  virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() {
-    return this;
-  }
+  virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate();
 
   // Methods called by the Options menu delegate.
   virtual bool IsLanguageBlacklisted();