Fix a memory leak and add the webkit_quota library to the project.

BUG=73268
TEST=look at the memory bots this time

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

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

3 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index 0a405c7..a67617d 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -10,6 +10,8 @@
 
 ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy() {}
 
+ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {}
+
 bool ExtensionSpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
   if (origin.SchemeIs(chrome::kExtensionScheme))
     return true;
@@ -56,8 +58,6 @@ void ExtensionSpecialStoragePolicy::RevokeRightsForAllExtensions() {
   unlimited_extensions_.Clear();
 }
 
-ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {}
-
 //-----------------------------------------------------------------------------
 // SpecialCollection helper class
 //-----------------------------------------------------------------------------
diff --git a/chrome/browser/extensions/extension_special_storage_policy.h b/chrome/browser/extensions/extension_special_storage_policy.h
index 34c4267..ead9b60 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.h
+++ b/chrome/browser/extensions/extension_special_storage_policy.h
@@ -33,9 +33,6 @@ class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy {
   void RevokeRightsForAllExtensions();
 
  private:
-  friend class base::RefCountedThreadSafe<SpecialStoragePolicy>;
-  virtual ~ExtensionSpecialStoragePolicy();
-
   class SpecialCollection {
    public:
     SpecialCollection();
@@ -53,6 +50,8 @@ class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy {
     CachedResults cached_resuts_;
   };
 
+  virtual ~ExtensionSpecialStoragePolicy();
+
   base::Lock lock_;  // Synchronize all access to the collections.
   SpecialCollection protected_apps_;
   SpecialCollection unlimited_extensions_;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a8888df..489384a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -47,6 +47,7 @@
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:fileapi',
         '../webkit/support/webkit_support.gyp:glue',
+        '../webkit/support/webkit_support.gyp:quota',
         '../webkit/support/webkit_support.gyp:webkit_resources',
       ],
       'include_dirs': [