Implement EvictOriginData in QuotaManager.

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 ff199d0716800b218dff1be6d7d7cec6457cf474..c77e2671c7970962ca8ccea6b6a9c8c92946abdb 100644
--- a/webkit/quota/quota_manager.h
+++ b/webkit/quota/quota_manager.h
@@ -160,6 +160,7 @@ class QuotaManager : public QuotaTaskObserver,
 
   friend struct QuotaManagerDeleter;
   friend class QuotaManagerProxy;
+  friend class QuotaManagerTest;
 
   // This initialization method is lazily called on the IO thread
   // when the first quota manager API is called.
@@ -179,6 +180,8 @@ class QuotaManager : public QuotaTaskObserver,
   // Methods for eviction logic.
   void DeleteOriginFromDatabase(const GURL& origin, StorageType type);
 
+  void OnOriginDataEvicted(QuotaStatusCode status);
+
   virtual void GetLRUOrigin(
       StorageType type,
       GetLRUOriginCallback* callback) OVERRIDE;
@@ -207,12 +210,18 @@ class QuotaManager : public QuotaTaskObserver,
 
   UsageAndQuotaDispatcherTaskMap usage_and_quota_dispatchers_;
 
+  EvictOriginDataCallback* evict_origin_data_callback_;

[kinuko, 2011/05/18 04:45:12]

could this be simply scoped_ptr?

The current code doesn't initialize this to zero anywhere or doesn't check if
the callback is already set when we assign a new callback, and it worries me a
bit.

[Dai Mikurube (NOT FULLTIME), 2011/05/18 05:08:00]

I guess scoped_ptr is better.  Done though I didn't understand the error case
you worries...

[michaeln, 2011/05/18 05:24:36]

not a good idea to have wild pointers or dangling pointers lingering around in
long-lived classes... long live scoped_ptr<> !!

[Dai Mikurube (NOT FULLTIME), 2011/05/18 05:34:29]

Thanks.  Yes, I agree with that and modified it to scoped_ptr<>. :)

+  int num_eviction_requested_clients_;
+  int num_evicted_clients_;
+
   int64 temporary_global_quota_;
   QuotaCallbackQueue temporary_global_quota_callbacks_;
 
   // Map from origin to count.
   std::map<GURL, int> origins_in_use_;
 
+  base::ScopedCallbackFactory<QuotaManager> callback_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(QuotaManager);
 };