5 files changed, 5 insertions, 13 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 2295961..30a67c6 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -2082,11 +2082,10 @@ ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest,
         static_cast<DictionaryValue*>(manifest->DeepCopy()));
 }
 
-ExtensionInfo::~ExtensionInfo() {}
+ExtensionInfo::~ExtensionInfo() {
+}
 
 UninstalledExtensionInfo::UninstalledExtensionInfo(
     const Extension& extension)
     : extension_id(extension.id()),
       extension_api_permissions(extension.api_permissions()) {}
-
-UninstalledExtensionInfo::~UninstalledExtensionInfo() {}
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 55349a1..51f35e0 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -672,7 +672,6 @@ 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 1f1dd21..3eedce0 100644
--- a/chrome/common/extensions/extension_icon_set.cc
+++ b/chrome/common/extensions/extension_icon_set.cc
@@ -6,10 +6,6 @@
 
 #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 7fe80c5..d1dc9f3 100644
--- a/chrome/common/extensions/extension_icon_set.h
+++ b/chrome/common/extensions/extension_icon_set.h
@@ -12,9 +12,6 @@
 // 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 b0a5b07..3fe6eb6 100644
--- a/chrome/common/extensions/url_pattern.h
+++ b/chrome/common/extensions/url_pattern.h
@@ -174,8 +174,9 @@ class URLPattern {
   };
 
   // Used for origin comparisons in a std::set.
-  class EffectiveHostCompareFunctor {
-   public:
+  class EffectiveHostCompareFunctor :
+      public std::binary_function<URLPattern, URLPattern, bool> {
+  public:
     bool operator()(const URLPattern& a, const URLPattern& b) const {
       return EffectiveHostCompare(a, b);
     };