Use base::Callback in Quota related code.

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/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 37 matching lines @@
     : quota_manager_proxy_(quota_manager_proxy),
       id_(MockStorageClientIDSequencer::GetInstance()->NextMockID()),
       mock_time_counter_(0),
       runnable_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   for (size_t i = 0; i < mock_data_size; ++i) {
     origin_data_[make_pair(GURL(mock_data[i].origin), mock_data[i].type)] =
         mock_data[i].usage;
   }
 }
 
-MockStorageClient::~MockStorageClient() {
-  STLDeleteContainerPointers(usage_callbacks_.begin(), usage_callbacks_.end());
-  STLDeleteContainerPointers(
-      origins_callbacks_.begin(), origins_callbacks_.end());
-  STLDeleteContainerPointers(
-      deletion_callbacks_.begin(), deletion_callbacks_.end());
-}
+MockStorageClient::~MockStorageClient() {}
 
 void MockStorageClient::AddOriginAndNotify(
     const GURL& origin_url, StorageType type, int64 size) {
   DCHECK(origin_data_.find(make_pair(origin_url, type)) == origin_data_.end());
   DCHECK_GE(size, 0);
   origin_data_[make_pair(origin_url, type)] = size;
   quota_manager_proxy_->quota_manager()->NotifyStorageModifiedInternal(
       id(), origin_url, type, size, IncrementMockTime());
 }
 
@@ skipping 31 matching lines @@
 QuotaClient::ID MockStorageClient::id() const {
   return id_;
 }
 
 void MockStorageClient::OnQuotaManagerDestroyed() {
   delete this;
 }
 
 void MockStorageClient::GetOriginUsage(const GURL& origin_url,
                                        StorageType type,
-                                       GetUsageCallback* callback) {
-  usage_callbacks_.insert(callback);
+                                       GetUsageCallback callback) {

[awong, 2011/09/29 18:05:15]

const &.

[tzik, 2011/10/11 04:53:57]

Done.

   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, runnable_factory_.NewRunnableMethod(

[awong, 2011/09/29 18:05:15]

weak_ptr + base::Bind?  Or is that for another pass?

[tzik, 2011/10/11 04:53:57]

Yes, I'll do it later.

           &MockStorageClient::RunGetOriginUsage,
           origin_url, type, callback));
 }
 
 void MockStorageClient::GetOriginsForType(
-    StorageType type, GetOriginsCallback* callback) {
-  origins_callbacks_.insert(callback);
+    StorageType type, GetOriginsCallback callback) {

[awong, 2011/09/29 18:05:15]

const &.

[tzik, 2011/10/11 04:53:57]

Done.

   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, runnable_factory_.NewRunnableMethod(
           &MockStorageClient::RunGetOriginsForType,
           type, callback));
 }
 
 void MockStorageClient::GetOriginsForHost(
     StorageType type, const std::string& host,
-    GetOriginsCallback* callback) {
-  origins_callbacks_.insert(callback);
+    GetOriginsCallback callback) {

[awong, 2011/09/29 18:05:15]

const &.

[tzik, 2011/10/11 04:53:57]

Done.

   base::MessageLoopProxy::current()->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);
+    DeletionCallback callback) {
   base::MessageLoopProxy::current()->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);
+    const GURL& origin_url, StorageType type, GetUsageCallback callback) {

[awong, 2011/09/29 18:05:15]

const &.

[tzik, 2011/10/11 04:53:57]

Done.

   OriginDataMap::iterator find = origin_data_.find(make_pair(origin_url, type));
   if (find == origin_data_.end()) {
-    callback->Run(0);
+    callback.Run(0);
   } else {
-    callback->Run(find->second);
+    callback.Run(find->second);
   }
 }
 
 void MockStorageClient::RunGetOriginsForType(
-    StorageType type, GetOriginsCallback* callback_ptr) {
-  scoped_ptr<GetOriginsCallback> callback(callback_ptr);
-  origins_callbacks_.erase(callback_ptr);
+    StorageType type, GetOriginsCallback callback) {

[awong, 2011/09/29 18:05:15]

const &.

[tzik, 2011/10/11 04:53:57]

Done.

   std::set<GURL> origins;
   for (OriginDataMap::iterator iter = origin_data_.begin();
        iter != origin_data_.end(); ++iter) {
     if (type == iter->first.second)
       origins.insert(iter->first.first);
   }
-  callback->Run(origins, type);
+  callback.Run(origins, type);
 }
 
 void MockStorageClient::RunGetOriginsForHost(
     StorageType type, const std::string& host,
-    GetOriginsCallback* callback_ptr) {
-  scoped_ptr<GetOriginsCallback> callback(callback_ptr);
-  origins_callbacks_.erase(callback_ptr);
+    GetOriginsCallback callback) {

[awong, 2011/09/29 18:05:15]

const &.

[tzik, 2011/10/11 04:53:57]

Done.

   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, type);
+  callback.Run(origins, type);
 }
 
 void MockStorageClient::RunDeleteOriginData(
     const GURL& origin_url,
     StorageType type,
-    DeletionCallback* callback_ptr) {
-  scoped_ptr<DeletionCallback> callback(callback_ptr);
+    DeletionCallback callback) {

[awong, 2011/09/29 18:05:15]

const &.

[tzik, 2011/10/11 04:53:57]

Done.

   ErrorOriginSet::iterator itr_error =
       error_origins_.find(make_pair(origin_url, type));
   if (itr_error != error_origins_.end()) {
-    deletion_callbacks_.erase(callback_ptr);
-    callback->Run(kQuotaErrorInvalidModification);
+    callback.Run(kQuotaErrorInvalidModification);
     return;
   }
 
   OriginDataMap::iterator itr =
       origin_data_.find(make_pair(origin_url, type));
   if (itr != origin_data_.end()) {
     int64 delta = itr->second;
     quota_manager_proxy_->
         NotifyStorageModified(id(), origin_url, type, -delta);
     origin_data_.erase(itr);
   }
 
-  deletion_callbacks_.erase(callback_ptr);
-  callback->Run(kQuotaStatusOk);
+  callback.Run(kQuotaStatusOk);
 }
 
 }  // namespace quota