base::Bind: Final cleanups in webkit/quota.

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/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop_proxy.h"
 #include "base/stl_util.h"
 #include "net/base/net_util.h"
 #include "webkit/quota/quota_manager.h"
 
 using base::AtomicSequenceNumber;
 
 namespace quota {
@@ skipping 22 matching lines @@
 };
 
 }  // anonymous namespace
 
 MockStorageClient::MockStorageClient(
     QuotaManagerProxy* quota_manager_proxy,
     const MockOriginData* mock_data, size_t mock_data_size)
     : quota_manager_proxy_(quota_manager_proxy),
       id_(MockStorageClientIDSequencer::GetInstance()->NextMockID()),
       mock_time_counter_(0),
-      runnable_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(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() {}
 
 void MockStorageClient::AddOriginAndNotify(
     const GURL& origin_url, StorageType type, int64 size) {
@@ skipping 40 matching lines @@
 }
 
 void MockStorageClient::OnQuotaManagerDestroyed() {
   delete this;
 }
 
 void MockStorageClient::GetOriginUsage(const GURL& origin_url,
                                        StorageType type,
                                        const GetUsageCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, runnable_factory_.NewRunnableMethod(
-          &MockStorageClient::RunGetOriginUsage,
-          origin_url, type, callback));
+      FROM_HERE,
+      base::Bind(&MockStorageClient::RunGetOriginUsage,
+                 weak_factory_.GetWeakPtr(), origin_url, type, callback));
 }
 
 void MockStorageClient::GetOriginsForType(
     StorageType type, const GetOriginsCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, runnable_factory_.NewRunnableMethod(
-          &MockStorageClient::RunGetOriginsForType,
-          type, callback));
+      FROM_HERE,
+      base::Bind(&MockStorageClient::RunGetOriginsForType,
+                 weak_factory_.GetWeakPtr(), type, callback));
 }
 
 void MockStorageClient::GetOriginsForHost(
     StorageType type, const std::string& host,
     const GetOriginsCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, runnable_factory_.NewRunnableMethod(
-          &MockStorageClient::RunGetOriginsForHost,
-          type, host, callback));
+      FROM_HERE,
+      base::Bind(&MockStorageClient::RunGetOriginsForHost,
+                 weak_factory_.GetWeakPtr(), type, host, callback));
 }
 
 void MockStorageClient::DeleteOriginData(
     const GURL& origin, StorageType type,
     const DeletionCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, runnable_factory_.NewRunnableMethod(
-          &MockStorageClient::RunDeleteOriginData,
-          origin, type, callback));
+      FROM_HERE,
+      base::Bind(&MockStorageClient::RunDeleteOriginData,
+                 weak_factory_.GetWeakPtr(), origin, type, callback));
 }
 
 void MockStorageClient::RunGetOriginUsage(
     const GURL& origin_url, StorageType type,
     const GetUsageCallback& callback) {
   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 41 matching lines @@
     int64 delta = itr->second;
     quota_manager_proxy_->
         NotifyStorageModified(id(), origin_url, type, -delta);
     origin_data_.erase(itr);
   }
 
   callback.Run(kQuotaStatusOk);
 }
 
 }  // namespace quota