Add an interface QuotaEvictionHandler.

webkit/quota/quota_manager.h

Index: webkit/quota/quota_manager.h
diff --git a/webkit/quota/quota_manager.h b/webkit/quota/quota_manager.h
index 0d63c8480026758b035bdb12e44af78b20c48c7c..e52a75c8a6f127f1f7841363c2b9cfa1dc3e4922 100644
--- a/webkit/quota/quota_manager.h
+++ b/webkit/quota/quota_manager.h
@@ -34,10 +34,35 @@ class UsageTracker;
 struct QuotaManagerDeleter;
 class QuotaManagerProxy;
 
+// An interface called by QuotaTemporaryStorageEvictor.
+class QuotaEvictionHandler {
+ public:
+  typedef Callback1<GURL>::Type GetLRUOriginCallback;
+  typedef Callback1<QuotaStatusCode>::Type EvictOriginDataCallback;
+  typedef Callback4<QuotaStatusCode,
+                    int64 /* usage */,
+                    int64 /* quota */,
+                    int64 /* physical_available */ >::Type
+      GetUsageAndQuotaForEvictionCallback;
+
+  virtual void GetLRUOrigin(
+      StorageType type,
+      GetLRUOriginCallback* callback) = 0;
+
+  virtual void EvictOriginData(
+      const GURL& origin,
+      StorageType type,

[kinuko, 2011/05/17 05:05:59]

Not very sure we want type parameter here (since now it's called 'evict' origin,
which implies temporary storage) but since we have it in GetLRUOrigin and other
methods probably ok to keep it around...

+      EvictOriginDataCallback* callback) = 0;
+
+  virtual void GetUsageAndQuotaForEviction(
+      GetUsageAndQuotaForEvictionCallback* callback) = 0;
+};
+
 // The quota manager class.  This class is instantiated per profile and
 // held by the profile.  With the exception of the constructor and the
 // proxy() method, all methods should only be called on the IO thread.
 class QuotaManager : public QuotaTaskObserver,
+                     public QuotaEvictionHandler,
                      public base::RefCountedThreadSafe<
                          QuotaManager, QuotaManagerDeleter> {
  public:
@@ -46,7 +71,6 @@ class QuotaManager : public QuotaTaskObserver,
                     int64 /* quota */>::Type GetUsageAndQuotaCallback;
   typedef Callback2<QuotaStatusCode,
                     int64 /* granted_quota */>::Type RequestQuotaCallback;
-  typedef Callback1<GURL>::Type GetLRUOriginCallback;
 
   QuotaManager(bool is_incognito,
                const FilePath& profile_path,
@@ -150,7 +174,16 @@ class QuotaManager : public QuotaTaskObserver,
 
   // Methods for eviction logic.
   void DeleteOriginFromDatabase(const GURL& origin, StorageType type);
-  void GetLRUOrigin(StorageType type, GetLRUOriginCallback* callback);
+
+  virtual void GetLRUOrigin(
+      StorageType type,
+      GetLRUOriginCallback* callback) OVERRIDE;
+  virtual void EvictOriginData(
+      const GURL& origin,
+      StorageType type,
+      EvictOriginDataCallback* callback) OVERRIDE;
+  virtual void GetUsageAndQuotaForEviction(
+      GetUsageAndQuotaForEvictionCallback* callback) OVERRIDE;
 
   void DeleteOnCorrectThread() const;