base::Bind: Convert AppCacheHelper::DeleteAppCachesForOrigin.

webkit/appcache/appcache_quota_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/appcache/appcache_quota_client.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "webkit/appcache/appcache_service.h"
 
 using quota::QuotaClient;
 
 namespace {
 quota::QuotaStatusCode NetErrorCodeToQuotaStatus(int code) {
   if (code == net::OK)
     return quota::kQuotaStatusOk;
   else if (code == net::ERR_ABORTED)
     return quota::kQuotaErrorAbort;
   else
     return quota::kQuotaStatusUnknown;
 }
 
 void RunFront(appcache::AppCacheQuotaClient::RequestQueue* queue) {
   base::Closure request = queue->front();
   queue->pop_front();
   request.Run();
 }
 }  // namespace
 
 namespace appcache {
 
 AppCacheQuotaClient::AppCacheQuotaClient(AppCacheService* service)
     : ALLOW_THIS_IN_INITIALIZER_LIST(service_delete_callback_(
-          new net::CancelableOldCompletionCallback<AppCacheQuotaClient>(
-              this, &AppCacheQuotaClient::DidDeleteAppCachesForOrigin))),
-      service_(service), appcache_is_ready_(false),
+          base::Bind(&AppCacheQuotaClient::DidDeleteAppCachesForOrigin,
+                     base::Unretained(this)))),
+      service_(service),
+      appcache_is_ready_(false),
       quota_manager_is_destroyed_(false) {
 }
 
 AppCacheQuotaClient::~AppCacheQuotaClient() {
   DCHECK(pending_batch_requests_.empty());
   DCHECK(pending_serial_requests_.empty());
   DCHECK(current_delete_request_callback_.is_null());
 }
 
 QuotaClient::ID AppCacheQuotaClient::id() const {
   return kAppcache;
 }
 
 void AppCacheQuotaClient::OnQuotaManagerDestroyed() {
   DeletePendingRequests();
   if (!current_delete_request_callback_.is_null()) {
     current_delete_request_callback_.Reset();
-    service_delete_callback_.release()->Cancel();
-  } else {
-    service_delete_callback_ = NULL;

[groby-ooo-7-16, 2011/12/01 23:55:51]

Doesn't the new code require a service_delete_callback.Reset()?

[James Hawkins, 2011/12/01 23:58:13]

There is no such thing, and it was not necessary to set it to NULL in the old
code.

+    service_delete_callback_.Cancel();
   }
+
   quota_manager_is_destroyed_ = true;
   if (!service_)
     delete this;
 }
 
 void AppCacheQuotaClient::GetOriginUsage(
     const GURL& origin,
     quota::StorageType type,
     const GetUsageCallback& callback) {
   DCHECK(!callback.is_null());
@@ skipping 58 matching lines @@
         base::Bind(&AppCacheQuotaClient::DeleteOriginData,
                    base::Unretained(this), origin, type, callback));
     return;
   }
 
   current_delete_request_callback_ = callback;
   if (type == quota::kStorageTypePersistent) {
     DidDeleteAppCachesForOrigin(net::OK);
     return;
   }
-  service_->DeleteAppCachesForOrigin(origin, service_delete_callback_);
+
+  service_->DeleteAppCachesForOrigin(
+      origin, service_delete_callback_.callback());
 }
 
 void AppCacheQuotaClient::DidDeleteAppCachesForOrigin(int rv) {
   DCHECK(service_);
   if (quota_manager_is_destroyed_)
     return;
 
   // Finish the request by calling our callers callback.
   current_delete_request_callback_.Run(NetErrorCodeToQuotaStatus(rv));
   current_delete_request_callback_.Reset();
@@ skipping 66 matching lines @@
   service_ = NULL;
   while (!pending_batch_requests_.empty())
     RunFront(&pending_batch_requests_);
 
   while (!pending_serial_requests_.empty())
     RunFront(&pending_serial_requests_);
 
   if (!current_delete_request_callback_.is_null()) {
     current_delete_request_callback_.Run(quota::kQuotaErrorAbort);
     current_delete_request_callback_.Reset();
-    service_delete_callback_.release()->Cancel();
-  } else {
-    service_delete_callback_ = NULL;
+    service_delete_callback_.Cancel();
   }
+
   if (quota_manager_is_destroyed_)
     delete this;
 }
 
 }  // namespace appcache