Part 1 of repairing regressions to my old clang check plugins so Nico can

deploy the clang plugins to the waterfall/trybots.

BUG=none
TEST=compiles

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

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

48 files changed, 268 insertions, 108 deletions

diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index 98adf2f..1db38f0 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -425,6 +425,8 @@ bool HistoryURLProvider::PromoteMatchForInlineAutocomplete(
   return true;
 }
 
+HistoryURLProvider::~HistoryURLProvider() {}
+
 // static
 history::Prefixes HistoryURLProvider::GetPrefixes() {
   // We'll complete text following these prefixes.
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
index 9b72cb1..ac93c57 100644
--- a/chrome/browser/autocomplete/history_url_provider.h
+++ b/chrome/browser/autocomplete/history_url_provider.h
@@ -175,7 +175,7 @@ class HistoryURLProvider : public HistoryProvider {
   void QueryComplete(HistoryURLProviderParams* params_gets_deleted);
 
  private:
-  ~HistoryURLProvider() {}
+  ~HistoryURLProvider();
 
   // Returns the set of prefixes to use for prefixes_.
   static history::Prefixes GetPrefixes();
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc
index 86df59b..338e58c 100644
--- a/chrome/browser/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data_database_helper.cc
@@ -15,6 +15,33 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
+BrowsingDataDatabaseHelper::DatabaseInfo::DatabaseInfo() {}
+
+BrowsingDataDatabaseHelper::DatabaseInfo::DatabaseInfo(
+    const std::string& host,
+    const std::string& database_name,
+    const std::string& origin_identifier,
+    const std::string& description,
+    const std::string& origin,
+    int64 size,
+    base::Time last_modified)
+    : host(host),
+      database_name(database_name),
+      origin_identifier(origin_identifier),
+      description(description),
+      origin(origin),
+      size(size),
+      last_modified(last_modified) {
+}
+
+BrowsingDataDatabaseHelper::DatabaseInfo::~DatabaseInfo() {}
+
+bool BrowsingDataDatabaseHelper::DatabaseInfo::IsFileSchemeData() {
+  return StartsWithASCII(origin_identifier,
+                         std::string(chrome::kFileScheme),
+                         true);
+}
+
 BrowsingDataDatabaseHelper::BrowsingDataDatabaseHelper(Profile* profile)
     : tracker_(profile->GetDatabaseTracker()),
       completion_callback_(NULL),
diff --git a/chrome/browser/browsing_data_database_helper.h b/chrome/browser/browsing_data_database_helper.h
index 26210a7..af506c0 100644
--- a/chrome/browser/browsing_data_database_helper.h
+++ b/chrome/browser/browsing_data_database_helper.h
@@ -29,28 +29,17 @@ class BrowsingDataDatabaseHelper
  public:
   // Contains detailed information about a web database.
   struct DatabaseInfo {
-    DatabaseInfo() {}
+    DatabaseInfo();
     DatabaseInfo(const std::string& host,
                  const std::string& database_name,
                  const std::string& origin_identifier,
                  const std::string& description,
                  const std::string& origin,
                  int64 size,
-                 base::Time last_modified)
-        : host(host),
-          database_name(database_name),
-          origin_identifier(origin_identifier),
-          description(description),
-          origin(origin),
-          size(size),
-          last_modified(last_modified) {
-    }
-
-    bool IsFileSchemeData() {
-      return StartsWithASCII(origin_identifier,
-                             std::string(chrome::kFileScheme),
-                             true);
-    }
+                 base::Time last_modified);
+    ~DatabaseInfo();
+
+    bool IsFileSchemeData();
 
     std::string host;
     std::string database_name;
diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data_indexed_db_helper.cc
index a5594d2..6c02d213a 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data_indexed_db_helper.cc
@@ -158,6 +158,27 @@ void BrowsingDataIndexedDBHelperImpl::DeleteIndexedDBFileInWebKitThread(
 
 }  // namespace
 
+BrowsingDataIndexedDBHelper::IndexedDBInfo::IndexedDBInfo(
+    const std::string& protocol,
+    const std::string& host,
+    unsigned short port,
+    const std::string& database_identifier,
+    const std::string& origin,
+    const FilePath& file_path,
+    int64 size,
+    base::Time last_modified)
+    : protocol(protocol),
+      host(host),
+      port(port),
+      database_identifier(database_identifier),
+      origin(origin),
+      file_path(file_path),
+      size(size),
+      last_modified(last_modified) {
+}
+
+BrowsingDataIndexedDBHelper::IndexedDBInfo::~IndexedDBInfo() {}
+
 // static
 BrowsingDataIndexedDBHelper* BrowsingDataIndexedDBHelper::Create(
     Profile* profile) {
diff --git a/chrome/browser/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data_indexed_db_helper.h
index 932c00b..129987b 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data_indexed_db_helper.h
@@ -37,16 +37,8 @@ class BrowsingDataIndexedDBHelper
         const std::string& origin,
         const FilePath& file_path,
         int64 size,
-        base::Time last_modified)
-        : protocol(protocol),
-          host(host),
-          port(port),
-          database_identifier(database_identifier),
-          origin(origin),
-          file_path(file_path),
-          size(size),
-          last_modified(last_modified) {
-    }
+        base::Time last_modified);
+    ~IndexedDBInfo();
 
     bool IsFileSchemeData() {
       return protocol == chrome::kFileScheme;
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h
index 48e8216..d07e96e 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.h
+++ b/chrome/browser/debugger/inspectable_tab_proxy.h
@@ -80,7 +80,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
  private:
   // Message handling routines
   void OnDebuggerOutput(const std::string& msg);
-  void FrameNavigating(const std::string& url);
+  virtual void FrameNavigating(const std::string& url);
   void TabClosed();
 
   int32 id_;
diff --git a/chrome/browser/sync/engine/syncer_thread2.cc b/chrome/browser/sync/engine/syncer_thread2.cc
index dfb9b95..c53ea15 100644
--- a/chrome/browser/sync/engine/syncer_thread2.cc
+++ b/chrome/browser/sync/engine/syncer_thread2.cc
@@ -22,6 +22,26 @@ using sync_pb::GetUpdatesCallerInfo;
 
 namespace s3 {
 
+struct SyncerThread::WaitInterval {
+  enum Mode {
+    // A wait interval whose duration has been affected by exponential
+    // backoff.
+    // EXPONENTIAL_BACKOFF intervals are nudge-rate limited to 1 per interval.
+    EXPONENTIAL_BACKOFF,
+    // A server-initiated throttled interval.  We do not allow any syncing
+    // during such an interval.
+    THROTTLED,
+  };
+  Mode mode;
+
+  // This bool is set to true if we have observed a nudge during this
+  // interval and mode == EXPONENTIAL_BACKOFF.
+  bool had_nudge;
+  base::TimeDelta length;
+  base::OneShotTimer<SyncerThread> timer;
+  WaitInterval(Mode mode, base::TimeDelta length);
+};
+
 SyncerThread::DelayProvider::DelayProvider() {}
 SyncerThread::DelayProvider::~DelayProvider() {}
 
diff --git a/chrome/browser/sync/engine/syncer_thread2.h b/chrome/browser/sync/engine/syncer_thread2.h
index e60b5f4..138d2a5 100644
--- a/chrome/browser/sync/engine/syncer_thread2.h
+++ b/chrome/browser/sync/engine/syncer_thread2.h
@@ -84,25 +84,7 @@ class SyncerThread : public sessions::SyncSession::Delegate {
   friend class SyncerThread2Test;
 
   // State pertaining to exponential backoff or throttling periods.
-  struct WaitInterval {
-    enum Mode {
-      // A wait interval whose duration has been affected by exponential
-      // backoff.
-      // EXPONENTIAL_BACKOFF intervals are nudge-rate limited to 1 per interval.
-      EXPONENTIAL_BACKOFF,
-      // A server-initiated throttled interval.  We do not allow any syncing
-      // during such an interval.
-      THROTTLED,
-    };
-    Mode mode;
-
-    // This bool is set to true if we have observed a nudge during this
-    // interval and mode == EXPONENTIAL_BACKOFF.
-    bool had_nudge;
-    base::TimeDelta length;
-    base::OneShotTimer<SyncerThread> timer;
-    WaitInterval(Mode mode, base::TimeDelta length);
-  };
+  struct WaitInterval;
 
   // Internal state for every sync task that is scheduled.
   struct SyncSessionJob {
diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.cc b/chrome/browser/sync/glue/autofill_profile_model_associator.cc
index e6e33d7..0b7e651 100644
--- a/chrome/browser/sync/glue/autofill_profile_model_associator.cc
+++ b/chrome/browser/sync/glue/autofill_profile_model_associator.cc
@@ -470,5 +470,12 @@ bool AutofillProfileModelAssociator::IsAbortPending() {
   return abort_association_pending_;
 }
 
+AutofillProfileModelAssociator::DataBundle::DataBundle() {}
+
+AutofillProfileModelAssociator::DataBundle::~DataBundle() {
+  STLDeleteElements(&new_profiles);
+}
+
+
 }  // namespace browser_sync
 
diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.h b/chrome/browser/sync/glue/autofill_profile_model_associator.h
index fdc67f1..f5d999ea 100644
--- a/chrome/browser/sync/glue/autofill_profile_model_associator.h
+++ b/chrome/browser/sync/glue/autofill_profile_model_associator.h
@@ -181,11 +181,13 @@ class AutofillProfileModelAssociator
 };
 
 struct AutofillProfileModelAssociator::DataBundle {
+  DataBundle();
+  ~DataBundle();
+
   std::set<std::string> current_profiles;
   std::vector<std::string> profiles_to_delete;
   std::vector<AutoFillProfile*> updated_profiles;
   std::vector<AutoFillProfile*> new_profiles;  // We own these pointers.
-  ~DataBundle() { STLDeleteElements(&new_profiles); }
 };
 
 }  // namespace browser_sync
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index 21b2d91..cad5b98 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -80,6 +80,20 @@ int64 SessionModelAssociator::GetSyncIdFromSessionTag(const std::string& tag) {
     return sync_api::kInvalidId;
   return node.GetId();
 }
+
+const TabContents*
+SessionModelAssociator::GetChromeNodeFromSyncId(int64 sync_id) {
+  NOTREACHED();
+  return NULL;
+}
+
+bool SessionModelAssociator::InitSyncNodeFromChromeId(
+    const size_t& id,
+    sync_api::BaseNode* sync_node) {
+  NOTREACHED();
+  return false;
+}
+
 void SessionModelAssociator::ReassociateWindows(bool reload_tabs) {
   DCHECK(CalledOnValidThread());
   sync_pb::SessionSpecifics specifics;
@@ -692,6 +706,8 @@ SessionModelAssociator::TabNodePool::TabNodePool(
       sync_service_(sync_service) {
 }
 
+SessionModelAssociator::TabNodePool::~TabNodePool() {}
+
 void SessionModelAssociator::TabNodePool::AddTabNode(int64 sync_id) {
   tab_syncid_pool_.resize(tab_syncid_pool_.size() + 1);
   tab_syncid_pool_[static_cast<size_t>(++tab_pool_fp_)] = sync_id;
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index cff376f..b6746cf 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -77,17 +77,11 @@ class SessionModelAssociator
   virtual int64 GetSyncIdFromSessionTag(const std::string& tag);
 
   // Not used.
-  virtual const TabContents* GetChromeNodeFromSyncId(int64 sync_id) {
-    NOTREACHED();
-    return NULL;
-  }
+  virtual const TabContents* GetChromeNodeFromSyncId(int64 sync_id);
 
   // Not used.
-  bool InitSyncNodeFromChromeId(const size_t& id,
-                                sync_api::BaseNode* sync_node) {
-    NOTREACHED();
-    return false;
-  }
+  virtual bool InitSyncNodeFromChromeId(const size_t& id,
+                                        sync_api::BaseNode* sync_node);
 
   // Resync local window information. Updates the local sessions header node
   // with the status of open windows and the order of tabs they contain. Should
@@ -224,6 +218,7 @@ class SessionModelAssociator
   class TabNodePool {
    public:
     explicit TabNodePool(ProfileSyncService* sync_service);
+    ~TabNodePool();
 
     // Add a previously allocated tab sync node to our pool. Increases the size
     // of tab_syncid_pool_ by one and marks the new tab node as free.
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 6ff01af..9b154fd 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -491,6 +491,25 @@ void SyncBackendHost::Core::NotifyUpdatedToken(const std::string& token) {
       Details<const TokenAvailableDetails>(&details));
 }
 
+SyncBackendHost::Core::DoInitializeOptions::DoInitializeOptions(
+    const GURL& service_url,
+    sync_api::HttpPostProviderFactory* http_bridge_factory,
+    const sync_api::SyncCredentials& credentials,
+    bool delete_sync_data_folder,
+    const notifier::NotifierOptions& notifier_options,
+    std::string restored_key_for_bootstrapping,
+    bool setup_for_test_mode)
+    : service_url(service_url),
+      http_bridge_factory(http_bridge_factory),
+      credentials(credentials),
+      delete_sync_data_folder(delete_sync_data_folder),
+      notifier_options(notifier_options),
+      restored_key_for_bootstrapping(restored_key_for_bootstrapping),
+      setup_for_test_mode(setup_for_test_mode) {
+}
+
+SyncBackendHost::Core::DoInitializeOptions::~DoInitializeOptions() {}
+
 sync_api::UserShare* SyncBackendHost::GetUserShare() const {
   DCHECK(syncapi_initialized_);
   return core_->syncapi()->GetUserShare();
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index 14ffebb..01954a5 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -268,14 +268,8 @@ class SyncBackendHost : public browser_sync::ModelSafeWorkerRegistrar {
           bool delete_sync_data_folder,
           const notifier::NotifierOptions& notifier_options,
           std::string restored_key_for_bootstrapping,
-          bool setup_for_test_mode)
-          : service_url(service_url),
-            http_bridge_factory(http_bridge_factory),
-            credentials(credentials),
-            delete_sync_data_folder(delete_sync_data_folder),
-            notifier_options(notifier_options),
-            restored_key_for_bootstrapping(restored_key_for_bootstrapping),
-            setup_for_test_mode(setup_for_test_mode) {}
+          bool setup_for_test_mode);
+      ~DoInitializeOptions();
 
       GURL service_url;
       sync_api::HttpPostProviderFactory* http_bridge_factory;
diff --git a/chrome/browser/tab_contents/web_navigation_observer.cc b/chrome/browser/tab_contents/web_navigation_observer.cc
new file mode 100644
index 0000000..a096e97
--- /dev/null
+++ b/chrome/browser/tab_contents/web_navigation_observer.cc
@@ -0,0 +1,9 @@
+// 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/tab_contents/web_navigation_observer.h"
+
+bool WebNavigationObserver::OnMessageReceived(const IPC::Message& message) {
+  return false;
+}
diff --git a/chrome/browser/tab_contents/web_navigation_observer.h b/chrome/browser/tab_contents/web_navigation_observer.h
index 1a9d16d..97f8411 100644
--- a/chrome/browser/tab_contents/web_navigation_observer.h
+++ b/chrome/browser/tab_contents/web_navigation_observer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -27,7 +27,7 @@ class WebNavigationObserver : public IPC::Channel::Listener {
   virtual void DidStopLoading() { }
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) { return false; }
+  virtual bool OnMessageReceived(const IPC::Message& message);
 
 #if 0
   // For unifying with delegate...
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b2d44d1..c598bc0 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2581,6 +2581,7 @@
         'browser/tab_contents/web_drag_utils_win.h',
         'browser/tab_contents/web_drop_target_win.cc',
         'browser/tab_contents/web_drop_target_win.h',
+        'browser/tab_contents/web_navigation_observer.cc',
         'browser/tab_contents/web_navigation_observer.h',
         'browser/tabs/default_tab_handler.cc',
         'browser/tabs/default_tab_handler.h',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2cb8e92..eab4abc 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -331,6 +331,8 @@
         'common/persistent_pref_store.h',
         'common/pref_store.cc',
         'common/pref_store.h',
+        'common/remoting/chromoting_host_info.cc',
+        'common/remoting/chromoting_host_info.h',
         'common/render_messages.cc',
         'common/render_messages.h',
         'common/render_messages_internal.h',
@@ -506,6 +508,7 @@
         'common/net/url_request_context_getter.h',
         'common/net/url_request_intercept_job.cc',
         'common/net/url_request_intercept_job.h',
+        'common/net/gaia/gaia_auth_consumer.cc',
         'common/net/gaia/gaia_auth_consumer.h',
         'common/net/gaia/gaia_auth_fetcher.cc',
         'common/net/gaia/gaia_auth_fetcher.h',
diff --git a/chrome/common/appcache/appcache_dispatcher.h b/chrome/common/appcache/appcache_dispatcher.h
index f88a38a..bec0d82 100644
--- a/chrome/common/appcache/appcache_dispatcher.h
+++ b/chrome/common/appcache/appcache_dispatcher.h
@@ -24,7 +24,7 @@ class AppCacheDispatcher : public IPC::Channel::Listener {
   AppCacheBackendProxy* backend_proxy() { return &backend_proxy_; }
 
   // IPC::Channel::Listener implementation
-  bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg);
 
  private:
   // Ipc message handlers
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc
index c1f5371..1b6459a 100644
--- a/chrome/common/child_process_host.cc
+++ b/chrome/common/child_process_host.cc
@@ -143,6 +143,16 @@ void ChildProcessHost::InstanceCreated() {
   Notify(NotificationType::CHILD_INSTANCE_CREATED);
 }
 
+bool ChildProcessHost::OnMessageReceived(const IPC::Message& msg) {
+  return false;
+}
+
+void ChildProcessHost::OnChannelConnected(int32 peer_pid) {
+}
+
+void ChildProcessHost::OnChannelError() {
+}
+
 bool ChildProcessHost::Send(IPC::Message* message) {
   if (!channel_.get()) {
     delete message;
@@ -155,6 +165,12 @@ void ChildProcessHost::OnChildDied() {
   delete this;
 }
 
+void ChildProcessHost::ShutdownStarted() {
+}
+
+void ChildProcessHost::Notify(NotificationType type) {
+}
+
 ChildProcessHost::ListenerHook::ListenerHook(ChildProcessHost* host)
     : host_(host) {
 }
diff --git a/chrome/common/child_process_host.h b/chrome/common/child_process_host.h
index c822346..08f585e 100644
--- a/chrome/common/child_process_host.h
+++ b/chrome/common/child_process_host.h
@@ -58,7 +58,7 @@ class ChildProcessHost : public IPC::Channel::Listener,
 #endif  // defined(OS_WIN)
 
   // IPC::Message::Sender implementation.
-  bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message);
 
  protected:
   ChildProcessHost();
@@ -80,9 +80,9 @@ class ChildProcessHost : public IPC::Channel::Listener,
   virtual void InstanceCreated();
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg) { return false; }
-  virtual void OnChannelConnected(int32 peer_pid) { }
-  virtual void OnChannelError() { }
+  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual void OnChannelConnected(int32 peer_pid);
+  virtual void OnChannelError();
 
   bool opening_channel() { return opening_channel_; }
   const std::string& channel_id() { return channel_id_; }
@@ -91,9 +91,9 @@ class ChildProcessHost : public IPC::Channel::Listener,
   // Called when the child process goes away.
   virtual void OnChildDied();
   // Notifies the derived class that we told the child process to kill itself.
-  virtual void ShutdownStarted() { }
+  virtual void ShutdownStarted();
   // Subclasses can implement specific notification methods.
-  virtual void Notify(NotificationType type) { }
+  virtual void Notify(NotificationType type);
 
  private:
   // By using an internal class as the IPC::Channel::Listener, we can intercept
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc
index 53823bc..dd74aee 100644
--- a/chrome/common/child_thread.cc
+++ b/chrome/common/child_thread.cc
@@ -168,6 +168,10 @@ bool ChildThread::OnMessageReceived(const IPC::Message& msg) {
   return router_.OnMessageReceived(msg);
 }
 
+bool ChildThread::OnControlMessageReceived(const IPC::Message& msg) {
+  return false;
+}
+
 void ChildThread::OnAskBeforeShutdown() {
   check_with_browser_before_shutdown_ = true;
 }
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index dbe8677..4537f1b 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -74,9 +74,7 @@ class ChildThread : public IPC::Channel::Listener,
   // Called when the process refcount is 0.
   void OnProcessFinalRelease();
 
-  virtual bool OnControlMessageReceived(const IPC::Message& msg) {
-    return false;
-  }
+  virtual bool OnControlMessageReceived(const IPC::Message& msg);
   virtual void OnAskBeforeShutdown();
   virtual void OnShutdown();
 
diff --git a/chrome/common/extensions/extension_resource.cc b/chrome/common/extensions/extension_resource.cc
index e2a5e24..cc88382 100644
--- a/chrome/common/extensions/extension_resource.cc
+++ b/chrome/common/extensions/extension_resource.cc
@@ -19,6 +19,8 @@ ExtensionResource::ExtensionResource(const std::string& extension_id,
       relative_path_(relative_path) {
 }
 
+ExtensionResource::~ExtensionResource() {}
+
 const FilePath& ExtensionResource::GetFilePath() const {
   if (extension_root_.empty() || relative_path_.empty()) {
     DCHECK(full_resource_path_.empty());
diff --git a/chrome/common/extensions/extension_resource.h b/chrome/common/extensions/extension_resource.h
index 86705a88..6fe3773 100644
--- a/chrome/common/extensions/extension_resource.h
+++ b/chrome/common/extensions/extension_resource.h
@@ -22,6 +22,8 @@ class ExtensionResource {
                     const FilePath& extension_root,
                     const FilePath& relative_path);
 
+  ~ExtensionResource();
+
   // Returns actual path to the resource (default or locale specific). In the
   // browser process, this will DCHECK if not called on the file thread. To
   // easily load extension images on the UI thread, see ImageLoadingTracker.
diff --git a/chrome/common/extensions/update_manifest.cc b/chrome/common/extensions/update_manifest.cc
index c75aa01..d2ceda7 100644
--- a/chrome/common/extensions/update_manifest.cc
+++ b/chrome/common/extensions/update_manifest.cc
@@ -19,6 +19,10 @@ static const char* kExpectedGupdateProtocol = "2.0";
 static const char* kExpectedGupdateXmlns =
     "http://www.google.com/update2/response";
 
+UpdateManifest::Result::Result() {}
+
+UpdateManifest::Result::~Result() {}
+
 UpdateManifest::Results::Results() : daystart_elapsed_seconds(kNoDaystart) {}
 
 UpdateManifest::Results::~Results() {}
diff --git a/chrome/common/extensions/update_manifest.h b/chrome/common/extensions/update_manifest.h
index 16a4f01..89e0f8b 100644
--- a/chrome/common/extensions/update_manifest.h
+++ b/chrome/common/extensions/update_manifest.h
@@ -36,6 +36,9 @@ class UpdateManifest {
 
   // The result of parsing one <app> tag in an xml update check manifest.
   struct Result {
+    Result();
+    ~Result();
+
     std::string extension_id;
     std::string version;
     std::string browser_min_version;
diff --git a/chrome/common/file_system/file_system_dispatcher.h b/chrome/common/file_system/file_system_dispatcher.h
index 21bc792..bc84d2a 100644
--- a/chrome/common/file_system/file_system_dispatcher.h
+++ b/chrome/common/file_system/file_system_dispatcher.h
@@ -31,7 +31,7 @@ class FileSystemDispatcher : public IPC::Channel::Listener {
   ~FileSystemDispatcher();
 
   // IPC::Channel::Listener implementation.
-  bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg);
 
   bool OpenFileSystem(const GURL& origin_url,
                       fileapi::FileSystemType type,
diff --git a/chrome/common/net/gaia/gaia_auth_consumer.cc b/chrome/common/net/gaia/gaia_auth_consumer.cc
new file mode 100644
index 0000000..7c47b60d
--- /dev/null
+++ b/chrome/common/net/gaia/gaia_auth_consumer.cc
@@ -0,0 +1,31 @@
+// 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/common/net/gaia/gaia_auth_consumer.h"
+
+GaiaAuthConsumer::ClientLoginResult::ClientLoginResult()
+    : two_factor(false) {
+}
+
+GaiaAuthConsumer::ClientLoginResult::ClientLoginResult(
+    const std::string& new_sid,
+    const std::string& new_lsid,
+    const std::string& new_token,
+    const std::string& new_data)
+    : sid(new_sid),
+      lsid(new_lsid),
+      token(new_token),
+      data(new_data),
+      two_factor(false) {}
+
+GaiaAuthConsumer::ClientLoginResult::~ClientLoginResult() {}
+
+bool GaiaAuthConsumer::ClientLoginResult::operator==(
+    const ClientLoginResult &b) const {
+  return sid == b.sid &&
+      lsid == b.lsid &&
+      token == b.token &&
+      data == b.data &&
+      two_factor == b.two_factor;
+}
diff --git a/chrome/common/net/gaia/gaia_auth_consumer.h b/chrome/common/net/gaia/gaia_auth_consumer.h
index d498e6c..4d6c37d 100644
--- a/chrome/common/net/gaia/gaia_auth_consumer.h
+++ b/chrome/common/net/gaia/gaia_auth_consumer.h
@@ -15,24 +15,14 @@ class GoogleServiceAuthError;
 class GaiaAuthConsumer {
  public:
   struct ClientLoginResult {
-    inline ClientLoginResult() : two_factor(false) {}
-    inline ClientLoginResult(const std::string& new_sid,
-                             const std::string& new_lsid,
-                             const std::string& new_token,
-                             const std::string& new_data)
-        : sid(new_sid),
-          lsid(new_lsid),
-          token(new_token),
-          data(new_data),
-          two_factor(false) {}
-
-    inline bool operator==(const ClientLoginResult &b) const {
-      return sid == b.sid &&
-             lsid == b.lsid &&
-             token == b.token &&
-             data == b.data &&
-             two_factor == b.two_factor;
-    }
+    ClientLoginResult();
+    ClientLoginResult(const std::string& new_sid,
+                      const std::string& new_lsid,
+                      const std::string& new_token,
+                      const std::string& new_data);
+    ~ClientLoginResult();
+
+    bool operator==(const ClientLoginResult &b) const;
 
     std::string sid;
     std::string lsid;
diff --git a/chrome/common/remoting/chromoting_host_info.cc b/chrome/common/remoting/chromoting_host_info.cc
new file mode 100644
index 0000000..acb0ce5
--- /dev/null
+++ b/chrome/common/remoting/chromoting_host_info.cc
@@ -0,0 +1,15 @@
+// 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/common/remoting/chromoting_host_info.h"
+
+namespace remoting {
+
+ChromotingHostInfo::ChromotingHostInfo()
+    : enabled(false) {
+}
+
+ChromotingHostInfo::~ChromotingHostInfo() {}
+
+}  // namespace remoting
diff --git a/chrome/common/remoting/chromoting_host_info.h b/chrome/common/remoting/chromoting_host_info.h
index e803eef..f1816da 100644
--- a/chrome/common/remoting/chromoting_host_info.h
+++ b/chrome/common/remoting/chromoting_host_info.h
@@ -11,6 +11,9 @@ namespace remoting {
 
 // This struct is used for ServiceHostMsg_ChromotingHost_Info IPC message.
 struct ChromotingHostInfo {
+  ChromotingHostInfo();
+  ~ChromotingHostInfo();
+
   std::string host_id;
   std::string hostname;
   std::string public_key;
diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h
index 823af81..c9c4be5 100644
--- a/chrome/common/resource_dispatcher.h
+++ b/chrome/common/resource_dispatcher.h
@@ -29,7 +29,7 @@ class ResourceDispatcher : public IPC::Channel::Listener {
   ~ResourceDispatcher();
 
   // IPC::Channel::Listener implementation.
-  bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message);
 
   // Creates a ResourceLoaderBridge for this type of dispatcher, this is so
   // this can be tested regardless of the ResourceLoaderBridge::Create
diff --git a/chrome/common/socket_stream_dispatcher.h b/chrome/common/socket_stream_dispatcher.h
index 01c5421..38da8a6 100644
--- a/chrome/common/socket_stream_dispatcher.h
+++ b/chrome/common/socket_stream_dispatcher.h
@@ -27,14 +27,14 @@ class WebSocketStreamHandleDelegate;
 class SocketStreamDispatcher : public IPC::Channel::Listener {
  public:
   SocketStreamDispatcher();
-  ~SocketStreamDispatcher() {}
+  virtual ~SocketStreamDispatcher() {}
 
   static webkit_glue::WebSocketStreamHandleBridge* CreateBridge(
       WebKit::WebSocketStreamHandle* handle,
       webkit_glue::WebSocketStreamHandleDelegate* delegate);
 
   // IPC::Channel::Listener implementation.
-  bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg);
 
  private:
   void OnConnected(int socket_id, int max_amount_send_allowed);
diff --git a/chrome/renderer/autofill_helper.cc b/chrome/renderer/autofill_helper.cc
index 462aeb8..39aab8a 100644
--- a/chrome/renderer/autofill_helper.cc
+++ b/chrome/renderer/autofill_helper.cc
@@ -52,6 +52,8 @@ AutoFillHelper::AutoFillHelper(
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
+AutoFillHelper::~AutoFillHelper() {}
+
 bool AutoFillHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AutoFillHelper, message)
diff --git a/chrome/renderer/autofill_helper.h b/chrome/renderer/autofill_helper.h
index 442b888..c26ff80 100644
--- a/chrome/renderer/autofill_helper.h
+++ b/chrome/renderer/autofill_helper.h
@@ -33,6 +33,7 @@ class AutoFillHelper : public RenderViewObserver,
   // PasswordAutocompleteManager is guaranteed to outlive AutoFillHelper.
   AutoFillHelper(RenderView* render_view,
                  PasswordAutocompleteManager* password_autocomplete_manager);
+  virtual ~AutoFillHelper();
 
   // WebKit::WebAutoFillClient implementation.  Public for tests.
   virtual void didAcceptAutoFillSuggestion(const WebKit::WebNode& node,
diff --git a/chrome/renderer/device_orientation_dispatcher.h b/chrome/renderer/device_orientation_dispatcher.h
index cbd32bc..0d0115e 100644
--- a/chrome/renderer/device_orientation_dispatcher.h
+++ b/chrome/renderer/device_orientation_dispatcher.h
@@ -17,12 +17,12 @@ struct ViewMsg_DeviceOrientationUpdated_Params;
 class DeviceOrientationDispatcher : public RenderViewObserver,
                                     public WebKit::WebDeviceOrientationClient {
  public:
-  DeviceOrientationDispatcher(RenderView* render_view);
+  explicit DeviceOrientationDispatcher(RenderView* render_view);
   virtual ~DeviceOrientationDispatcher();
 
  private:
   // RenderView::Observer implementation.
-  bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message);
 
   // From WebKit::WebDeviceOrientationClient.
   virtual void setController(
diff --git a/chrome/renderer/extensions/extension_renderer_info.cc b/chrome/renderer/extensions/extension_renderer_info.cc
index a35a663..5cc2dc8 100644
--- a/chrome/renderer/extensions/extension_renderer_info.cc
+++ b/chrome/renderer/extensions/extension_renderer_info.cc
@@ -10,6 +10,9 @@
 ExtensionRendererInfo::ExtensionRendererInfo() {
 }
 
+ExtensionRendererInfo::~ExtensionRendererInfo() {
+}
+
 size_t ExtensionRendererInfo::size() const {
   return extensions_.size();
 }
diff --git a/chrome/renderer/extensions/extension_renderer_info.h b/chrome/renderer/extensions/extension_renderer_info.h
index cc49fde..efcc436 100644
--- a/chrome/renderer/extensions/extension_renderer_info.h
+++ b/chrome/renderer/extensions/extension_renderer_info.h
@@ -20,6 +20,7 @@
 class ExtensionRendererInfo {
  public:
   ExtensionRendererInfo();
+  ~ExtensionRendererInfo();
 
   // Gets the number of extensions contained.
   size_t size() const;
diff --git a/chrome/renderer/geolocation_dispatcher.h b/chrome/renderer/geolocation_dispatcher.h
index 983cad7..b7809a0 100644
--- a/chrome/renderer/geolocation_dispatcher.h
+++ b/chrome/renderer/geolocation_dispatcher.h
@@ -32,7 +32,7 @@ class GeolocationDispatcher : public RenderViewObserver,
 
  private:
   // RenderView::Observer implementation.
-  bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message);
 
   // WebGeolocationClient
   virtual void geolocationDestroyed();
diff --git a/chrome/renderer/indexed_db_dispatcher.h b/chrome/renderer/indexed_db_dispatcher.h
index 46e3f5b..44da3d4 100644
--- a/chrome/renderer/indexed_db_dispatcher.h
+++ b/chrome/renderer/indexed_db_dispatcher.h
@@ -30,7 +30,7 @@ class IndexedDBDispatcher : public IPC::Channel::Listener {
   ~IndexedDBDispatcher();
 
   // IPC::Channel::Listener implementation.
-  bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg);
 
   void RequestIDBFactoryOpen(
       const string16& name,
diff --git a/chrome/renderer/notification_provider.h b/chrome/renderer/notification_provider.h
index bba77cd..5090b9fa 100644
--- a/chrome/renderer/notification_provider.h
+++ b/chrome/renderer/notification_provider.h
@@ -25,7 +25,7 @@ class NotificationProvider : public RenderViewObserver,
 
  private:
   // RenderView::Observer implementation.
-  bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message);
 
   // WebKit::WebNotificationPresenter interface.
   virtual bool show(const WebKit::WebNotification& proxy);
diff --git a/chrome/renderer/page_click_tracker.h b/chrome/renderer/page_click_tracker.h
index 880d57c..c2ae9d9 100644
--- a/chrome/renderer/page_click_tracker.h
+++ b/chrome/renderer/page_click_tracker.h
@@ -51,7 +51,7 @@ class PageClickTracker : public RenderViewObserver,
   virtual void handleEvent(const WebKit::WebDOMEvent& event);
 
   // Called after the mouse event |event| has been processed by WebKit.
-  void DidHandleMouseEvent(const WebKit::WebMouseEvent& event);
+  virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event);
 
   // Returns the currently focused node in the associated render view.
   // That node may be null.
diff --git a/chrome/renderer/renderer_webaudiodevice_impl.h b/chrome/renderer/renderer_webaudiodevice_impl.h
index b27b3f5..92954aa 100644
--- a/chrome/renderer/renderer_webaudiodevice_impl.h
+++ b/chrome/renderer/renderer_webaudiodevice_impl.h
@@ -26,7 +26,8 @@ class RendererWebAudioDeviceImpl : public WebKit::WebAudioDevice,
   virtual void stop();
 
   // AudioDevice::RenderCallback implementation.
-  void Render(const std::vector<float*>& audio_data, size_t number_of_frames);
+  virtual void Render(const std::vector<float*>& audio_data,
+                      size_t number_of_frames);
 
  private:
   scoped_ptr<AudioDevice> audio_device_;
diff --git a/chrome/renderer/speech_input_dispatcher.h b/chrome/renderer/speech_input_dispatcher.h
index cbfc86e..1ec07b6 100644
--- a/chrome/renderer/speech_input_dispatcher.h
+++ b/chrome/renderer/speech_input_dispatcher.h
@@ -26,7 +26,7 @@ class SpeechInputDispatcher : public RenderViewObserver,
 
  private:
   // RenderView::Observer implementation.
-  bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message);
 
   // WebKit::WebSpeechInputController.
   virtual bool startRecognition(int request_id,
diff --git a/chrome/service/remoting/chromoting_host_manager.cc b/chrome/service/remoting/chromoting_host_manager.cc
index 1fb369f..aaffdac 100644
--- a/chrome/service/remoting/chromoting_host_manager.cc
+++ b/chrome/service/remoting/chromoting_host_manager.cc
@@ -46,6 +46,8 @@ void ChromotingHostManager::Teardown() {
   Stop();
 }
 
+ChromotingHostManager::~ChromotingHostManager() {}
+
 bool ChromotingHostManager::IsConfigInitialized() {
   std::string host_id;
   if (!chromoting_config_->GetString(remoting::kHostIdConfigPath, &host_id))
diff --git a/chrome/service/remoting/chromoting_host_manager.h b/chrome/service/remoting/chromoting_host_manager.h
index 6c510e8..b64bfe9 100644
--- a/chrome/service/remoting/chromoting_host_manager.h
+++ b/chrome/service/remoting/chromoting_host_manager.h
@@ -38,7 +38,7 @@ class ChromotingHostManager
 
   // Caller keeps ownership of |observer|. |observer| must not be
   // destroyed while this object exists.
-  ChromotingHostManager(Observer* observer);
+  explicit ChromotingHostManager(Observer* observer);
 
   void Initialize(base::MessageLoopProxy* file_message_loop);
   void Teardown();
@@ -60,6 +60,9 @@ class ChromotingHostManager
   void GetHostInfo(ChromotingHostInfo* host_info);
 
  private:
+  friend class base::RefCountedThreadSafe<ChromotingHostManager>;
+  virtual ~ChromotingHostManager();
+
   bool IsConfigInitialized();
   void InitializeConfig();