Reapply r61237: FBTF: Another big ctor/dtor cleanup found by automated tools.

Removes changes to code in webkit/ that broke chrome_frame. Will debug that portion later.

(Shaves ~2MB off Linux Debug .a files)

BUG=none
TEST=compiles

First Review URL: http://codereview.chromium.org/3563004

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

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

5 files changed, 13 insertions, 5 deletions

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index c7f6f3f..cc6b8585 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -2163,8 +2163,7 @@ ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest,
         static_cast<DictionaryValue*>(manifest->DeepCopy()));
 }
 
-ExtensionInfo::~ExtensionInfo() {
-}
+ExtensionInfo::~ExtensionInfo() {}
 
 UninstalledExtensionInfo::UninstalledExtensionInfo(
     const Extension& extension)
@@ -2174,3 +2173,5 @@ UninstalledExtensionInfo::UninstalledExtensionInfo(
       is_app(extension.is_app()),
       converted_from_user_script(extension.converted_from_user_script()),
       update_url(extension.update_url()) {}
+
+UninstalledExtensionInfo::~UninstalledExtensionInfo() {}
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 630f1af..e012ad6 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -697,6 +697,7 @@ struct ExtensionInfo {
 // notification.
 struct UninstalledExtensionInfo {
   explicit UninstalledExtensionInfo(const Extension& extension);
+  ~UninstalledExtensionInfo();
 
   std::string extension_id;
   std::set<std::string> extension_api_permissions;
diff --git a/chrome/common/extensions/extension_icon_set.cc b/chrome/common/extensions/extension_icon_set.cc
index 3eedce0..1f1dd21 100644
--- a/chrome/common/extensions/extension_icon_set.cc
+++ b/chrome/common/extensions/extension_icon_set.cc
@@ -6,6 +6,10 @@
 
 #include "base/logging.h"
 
+ExtensionIconSet::ExtensionIconSet() {}
+
+ExtensionIconSet::~ExtensionIconSet() {}
+
 void ExtensionIconSet::Clear() {
   map_.clear();
 }
diff --git a/chrome/common/extensions/extension_icon_set.h b/chrome/common/extensions/extension_icon_set.h
index d1dc9f3..7fe80c5 100644
--- a/chrome/common/extensions/extension_icon_set.h
+++ b/chrome/common/extensions/extension_icon_set.h
@@ -12,6 +12,9 @@
 // Represents the set of icons for an extension.
 class ExtensionIconSet {
  public:
+  ExtensionIconSet();
+  ~ExtensionIconSet();
+
   // Access to the underlying map from icon size->path.
   typedef std::map<int, std::string> IconMap;
   const IconMap& map() const { return map_; }
diff --git a/chrome/common/extensions/url_pattern.h b/chrome/common/extensions/url_pattern.h
index 0067678..832673c 100644
--- a/chrome/common/extensions/url_pattern.h
+++ b/chrome/common/extensions/url_pattern.h
@@ -184,9 +184,8 @@ class URLPattern {
   };
 
   // Used for origin comparisons in a std::set.
-  class EffectiveHostCompareFunctor :
-      public std::binary_function<URLPattern, URLPattern, bool> {
-  public:
+  class EffectiveHostCompareFunctor {
+   public:
     bool operator()(const URLPattern& a, const URLPattern& b) const {
       return EffectiveHostCompare(a, b);
     };