Part 2 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/6272025

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

8 files changed, 41 insertions, 18 deletions

diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc
index 3ae4ca9..e410a73 100644
--- a/chrome/browser/extensions/extension_pref_value_map.cc
+++ b/chrome/browser/extensions/extension_pref_value_map.cc
@@ -8,6 +8,17 @@
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 
+struct ExtensionPrefValueMap::ExtensionEntry {
+  // Installation time of the extension.
+  base::Time install_time;
+  // Whether extension is enabled in the profile.
+  bool enabled;
+  // Regular preferences.
+  PrefValueMap reg_preferences;
+  // Incognito preferences, empty for regular ExtensionPrefStore.
+  PrefValueMap inc_preferences;
+};
+
 ExtensionPrefValueMap::ExtensionPrefValueMap() {
 }
 
diff --git a/chrome/browser/extensions/extension_pref_value_map.h b/chrome/browser/extensions/extension_pref_value_map.h
index 63d9285..896a68c 100644
--- a/chrome/browser/extensions/extension_pref_value_map.h
+++ b/chrome/browser/extensions/extension_pref_value_map.h
@@ -103,16 +103,7 @@ class ExtensionPrefValueMap {
                                      bool incognito) const;
 
  private:
-  struct ExtensionEntry {
-    // Installation time of the extension.
-    base::Time install_time;
-    // Whether extension is enabled in the profile.
-    bool enabled;
-    // Regular preferences.
-    PrefValueMap reg_preferences;
-    // Incognito preferences, empty for regular ExtensionPrefStore.
-    PrefValueMap inc_preferences;
-  };
+  struct ExtensionEntry;
 
   typedef std::map<std::string, ExtensionEntry*> ExtensionEntryMap;
 
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index 01b0e07..835d672a 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -357,6 +357,20 @@ class ExtensionUpdaterFileHandler
   ~ExtensionUpdaterFileHandler() {}
 };
 
+ExtensionUpdater::ExtensionFetch::ExtensionFetch()
+    : id(""),
+      url(),
+      package_hash(""),
+      version("") {}
+
+ExtensionUpdater::ExtensionFetch::ExtensionFetch(const std::string& i,
+                                                 const GURL& u,
+                                                 const std::string& h,
+                                                 const std::string& v)
+    : id(i), url(u), package_hash(h), version(v) {}
+
+ExtensionUpdater::ExtensionFetch::~ExtensionFetch() {}
+
 ExtensionUpdater::ExtensionUpdater(ExtensionUpdateService* service,
                                    PrefService* prefs,
                                    int frequency_seconds)
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index 3d7986c..d5ed01f 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -178,14 +178,15 @@ class ExtensionUpdater
   // We need to keep track of some information associated with a url
   // when doing a fetch.
   struct ExtensionFetch {
+    ExtensionFetch();
+    ExtensionFetch(const std::string& i, const GURL& u,
+                   const std::string& h, const std::string& v);
+    ~ExtensionFetch();
+
     std::string id;
     GURL url;
     std::string package_hash;
     std::string version;
-    ExtensionFetch() : id(""), url(), package_hash(""), version("") {}
-    ExtensionFetch(const std::string& i, const GURL& u,
-      const std::string& h, const std::string& v)
-      : id(i), url(u), package_hash(h), version(v) {}
   };
 
   // These are needed for unit testing, to help identify the correct mock
diff --git a/chrome/browser/extensions/external_extension_loader.cc b/chrome/browser/extensions/external_extension_loader.cc
index 48bda43..8f48d5e 100644
--- a/chrome/browser/extensions/external_extension_loader.cc
+++ b/chrome/browser/extensions/external_extension_loader.cc
@@ -9,6 +9,8 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
 
+ExternalExtensionLoader::ExternalExtensionLoader() : running_(false) {}
+
 void ExternalExtensionLoader::Init(
     ExternalExtensionProviderImpl* owner) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -28,6 +30,8 @@ void ExternalExtensionLoader::OwnerShutdown() {
   owner_ = NULL;
 }
 
+ExternalExtensionLoader::~ExternalExtensionLoader() {}
+
 void ExternalExtensionLoader::LoadFinished() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   running_ = false;
diff --git a/chrome/browser/extensions/external_extension_loader.h b/chrome/browser/extensions/external_extension_loader.h
index f4864cb..7791664 100644
--- a/chrome/browser/extensions/external_extension_loader.h
+++ b/chrome/browser/extensions/external_extension_loader.h
@@ -27,7 +27,7 @@ class ExternalExtensionProviderImpl;
 class ExternalExtensionLoader
     : public base::RefCountedThreadSafe<ExternalExtensionLoader> {
  public:
-  explicit ExternalExtensionLoader() : running_(false) {}
+  explicit ExternalExtensionLoader();
 
   // Specifies the provider that owns this object.
   void Init(ExternalExtensionProviderImpl* owner);
@@ -50,7 +50,7 @@ class ExternalExtensionLoader
   virtual const FilePath GetBaseCrxFilePath();
 
  protected:
-  virtual ~ExternalExtensionLoader() {}
+  virtual ~ExternalExtensionLoader();
 
   // Notifies the provider that the list of extensions has been loaded.
   void LoadFinished();
diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc
index f770e7c..8d264a9 100644
--- a/chrome/browser/extensions/external_pref_extension_loader.cc
+++ b/chrome/browser/extensions/external_pref_extension_loader.cc
@@ -112,6 +112,8 @@ void ExternalTestingExtensionLoader::StartLoading() {
   LoadFinished();
 }
 
+ExternalTestingExtensionLoader::~ExternalTestingExtensionLoader() {}
+
 const FilePath ExternalTestingExtensionLoader::GetBaseCrxFilePath() {
   return fake_base_path_;
 }
diff --git a/chrome/browser/extensions/external_pref_extension_loader.h b/chrome/browser/extensions/external_pref_extension_loader.h
index c6852d3..0590014 100644
--- a/chrome/browser/extensions/external_pref_extension_loader.h
+++ b/chrome/browser/extensions/external_pref_extension_loader.h
@@ -58,7 +58,7 @@ class ExternalTestingExtensionLoader : public ExternalExtensionLoader {
  private:
   friend class base::RefCountedThreadSafe<ExternalExtensionLoader>;
 
-  virtual ~ExternalTestingExtensionLoader() {}
+  virtual ~ExternalTestingExtensionLoader();
 
   FilePath fake_base_path_;
   scoped_ptr<DictionaryValue> testing_prefs_;