Implement EvictOriginData in QuotaManager.

webkit/quota/quota_manager.cc

Index: webkit/quota/quota_manager.cc
diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc
index 01f9c75b989cda7a84d7ca6378ca8b0ef2606005..cb2ab8297b70883031ac5eb18616cb11beccb50a 100644
--- a/webkit/quota/quota_manager.cc
+++ b/webkit/quota/quota_manager.cc
@@ -515,6 +515,8 @@ QuotaManager::QuotaManager(bool is_incognito,
     db_disabled_(false),
     io_thread_(io_thread),
     db_thread_(db_thread),
+    num_deletion_requested_clients_(0),
+    num_deleted_clients_(0),
     temporary_global_quota_(-1) {
 }
 
@@ -735,11 +737,56 @@ void QuotaManager::GetLRUOrigin(
   task->Start();
 }
 
+void QuotaManager::OnOriginDataEvicted(
+    QuotaStatusCode status,
+    EvictOriginDataCallback* callback) {

[kinuko, 2011/05/17 09:48:55]

This method won't take the callback parameter for non-testing code right?

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

Done.

+  LOG(ERROR) << "QM::OnOriginDataDeleted";
+  DCHECK(io_thread_->BelongsToCurrentThread());
+
+  if (status != kQuotaStatusOk) {
+    // TODO(dmikurube): Handle error.
+  }
+
+  ++num_deleted_clients_;
+  DCHECK(num_deleted_clients_ <= num_deletion_requested_clients_);
+  if (num_deleted_clients_ == num_deletion_requested_clients_) {
+    num_deletion_requested_clients_ = 0;
+    num_deleted_clients_ = 0;
+
+    // TODO(dmikurube): Get usage, quota and physical space and then callback.

[kinuko, 2011/05/17 09:48:55]

This comment is obsoleted?

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

Done.

+    callback->Run(kQuotaStatusOk);
+    delete callback;
+  }
+}
+
 void QuotaManager::EvictOriginData(
     const GURL& origin,
     StorageType type,
     EvictOriginDataCallback* callback) {
-  // TODO(dmikurube): Implement it.
+  LOG(ERROR) << "QM::DeleteOriginData";
+  DCHECK(io_thread_->BelongsToCurrentThread());
+  LazyInitialize();

[kinuko, 2011/05/17 09:48:55]

Eviction must run after temporary storage initialization has finished, so I
think we can replace this with DCHECK(database_.get()) ?

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

Done.

+
+  int num_clients = clients_.size();
+
+  if (origin.is_empty() || num_clients == 0 || num_deleted_clients_ > 0) {

[kinuko, 2011/05/17 09:48:55]

As michael pointed out please DCHECK on num_deleted_clients_ or on whatever with
which you can ensure we're not re-entering this method.
If you're not going to make a separate class to track DeleteOriginData progress
you'll want to keep the given EvictOriginDataCallback as a QM member variable
(to dispatch the callback later), so probably you can DCHECK on the callback I
think.

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

Done.

I don't understand the second paragraph... Which callback? What is DCHECK'd on
the callback?

+    callback->Run(kQuotaStatusOk);
+    delete callback;
+    return;
+  }
+
+  num_deletion_requested_clients_ = num_clients;
+  num_deleted_clients_ = 0;
+
+  for (QuotaClientList::iterator p = clients_.begin();
+       p != clients_.end();
+       ++p) {
+    /*
+      p->DeleteOriginData(origin, kStorageTypeTemporary, NewRunnableMethod(
+          this, &QuotaManager::OnOriginDataDeleted));
+    */
+    OnOriginDataEvicted(kQuotaStatusOk, callback);  // test.
+  }
 }
 
 void QuotaManager::GetUsageAndQuotaForEviction(