Index: webkit/quota/quota_manager.h |
diff --git a/webkit/quota/quota_manager.h b/webkit/quota/quota_manager.h |
index 65361521ac9e697bdd0253d28228ec23037e7ad4..b86cbfde7b305782d852af4cfef596a3920de1cc 100644 |
--- a/webkit/quota/quota_manager.h |
+++ b/webkit/quota/quota_manager.h |
@@ -21,6 +21,7 @@ |
#include "base/memory/weak_ptr.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
+#include "base/sequenced_task_runner_helpers.h" |
#include "webkit/quota/quota_database.h" |
#include "webkit/quota/quota_client.h" |
#include "webkit/quota/quota_task.h" |
@@ -109,8 +110,6 @@ class QuotaManager : public QuotaTaskObserver, |
base::MessageLoopProxy* db_thread, |
SpecialStoragePolicy* special_storage_policy); |
- virtual ~QuotaManager(); |
- |
// Returns a proxy object that can be used on any thread. |
QuotaManagerProxy* proxy() { return proxy_.get(); } |
@@ -204,7 +203,19 @@ class QuotaManager : public QuotaTaskObserver, |
static const int kEvictionIntervalInMilliSeconds; |
+ protected: |
+ virtual ~QuotaManager(); |
+ |
private: |
+ friend class base::DeleteHelper<QuotaManager>; |
+ friend class MockQuotaManager; |
+ friend class MockStorageClient; |
+ friend class quota_internals::QuotaInternalsProxy; |
+ friend class QuotaManagerProxy; |
+ friend class QuotaManagerTest; |
+ friend class QuotaTemporaryStorageEvictor; |
+ friend struct QuotaManagerDeleter; |
+ |
class DatabaseTaskBase; |
class InitializeTask; |
class UpdateTemporaryQuotaOverrideTask; |
@@ -256,14 +267,6 @@ class QuotaManager : public QuotaTaskObserver, |
typedef QuotaEvictionHandler::GetUsageAndQuotaForEvictionCallback |
UsageAndQuotaDispatcherCallback; |
- friend class quota_internals::QuotaInternalsProxy; |
- friend struct QuotaManagerDeleter; |
- friend class MockStorageClient; |
- friend class QuotaManagerProxy; |
- friend class QuotaManagerTest; |
- friend class QuotaTemporaryStorageEvictor; |
- friend class MockQuotaManager; |
- |
// This initialization method is lazily called on the IO thread |
// when the first quota manager API is called. |
// Initialize must be called after all quota clients are added to the |