diff options
author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 21:15:53 +0000 |
---|---|---|
committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 21:15:53 +0000 |
commit | 3ea7dc5140fe9b2e3d91f12e3a6d7f54eb4762ee (patch) | |
tree | 6e727ae81e3136d0cc153e8269f84f73638c3288 /chrome | |
parent | ec23f52894e3660862bc822940ae8899e1fef2df (diff) | |
download | chromium_src-3ea7dc5140fe9b2e3d91f12e3a6d7f54eb4762ee.zip chromium_src-3ea7dc5140fe9b2e3d91f12e3a6d7f54eb4762ee.tar.gz chromium_src-3ea7dc5140fe9b2e3d91f12e3a6d7f54eb4762ee.tar.bz2 |
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
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/extensions/extension_special_storage_policy.cc | 4 | ||||
-rw-r--r-- | chrome/browser/extensions/extension_special_storage_policy.h | 5 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 1 |
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': [ |