Added DeleteOriginData to QuotaClient

webkit/quota/mock_storage_client.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/quota/mock_storage_client.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop_proxy.h"
@@ skipping 34 matching lines @@
 MockStorageClient::MockStorageClient(QuotaManagerProxy* quota_manager_proxy)
     : quota_manager_proxy_(quota_manager_proxy),
       id_(MockStorageClientIDSequencer::GetInstance()->NextMockID()),
       runnable_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 MockStorageClient::~MockStorageClient() {
   STLDeleteContainerPointers(usage_callbacks_.begin(), usage_callbacks_.end());
   STLDeleteContainerPointers(
       origins_callbacks_.begin(), origins_callbacks_.end());
+  STLDeleteContainerPointers(
+      deletion_callbacks_.begin(), deletion_callbacks_.end());
 }
 
 void MockStorageClient::AddMockOriginData(
     const GURL& origin_url, StorageType type, int64 size) {
   origin_data_[make_pair(origin_url, type)] = size;
 }
 
 void MockStorageClient::ModifyMockOriginDataSize(
     const GURL& origin_url, StorageType type, int64 delta) {
   OriginDataMap::iterator find = origin_data_.find(make_pair(origin_url, type));
@@ skipping 39 matching lines @@
 void MockStorageClient::GetOriginsForHost(
     StorageType type, const std::string& host,
     GetOriginsCallback* callback) {
   origins_callbacks_.insert(callback);
   base::MessageLoopProxy::CreateForCurrentThread()->PostTask(
       FROM_HERE, runnable_factory_.NewRunnableMethod(
           &MockStorageClient::RunGetOriginsForHost,
           type, host, callback));
 }
 
+void MockStorageClient::DeleteOriginData(
+    const GURL& origin, StorageType type,
+    DeletionCallback* callback) {
+  deletion_callbacks_.insert(callback);
+  base::MessageLoopProxy::CreateForCurrentThread()->PostTask(
+      FROM_HERE, runnable_factory_.NewRunnableMethod(
+          &MockStorageClient::RunDeleteOriginData,
+          origin, type, callback));
+}
+
 void MockStorageClient::RunGetOriginUsage(
     const GURL& origin_url, StorageType type, GetUsageCallback* callback_ptr) {
   usage_callbacks_.erase(callback_ptr);
   scoped_ptr<GetUsageCallback> callback(callback_ptr);
   OriginDataMap::iterator find = origin_data_.find(make_pair(origin_url, type));
   if (find == origin_data_.end()) {
     callback->Run(0);
   } else {
     callback->Run(find->second);
   }
@@ skipping 20 matching lines @@
   std::set<GURL> origins;
   for (OriginDataMap::iterator iter = origin_data_.begin();
        iter != origin_data_.end(); ++iter) {
     std::string host_or_spec = net::GetHostOrSpecFromURL(iter->first.first);
     if (type == iter->first.second && host == host_or_spec)
       origins.insert(iter->first.first);
   }
   callback->Run(origins);
 }
 
+void MockStorageClient::RunDeleteOriginData(
+    const GURL& origin_url,
+    StorageType type,
+    DeletionCallback* callback_ptr) {
+  origin_data_.erase(make_pair(origin_url, type));

[kinuko, 2011/05/16 06:18:53]

Here can we call NotifyStorageModified with -origin_size?

[tzik (google), 2011/05/16 07:47:01]

Done.

+  scoped_ptr<DeletionCallback> callback(callback_ptr);
+  deletion_callbacks_.erase(callback_ptr);
+  callback->Run(kQuotaStatusOk);
+}
+
 }  // namespace quota