Remove bad use of CancelableCallback from BrowingDataAppCacheHelper

chrome/browser/browsing_data/browsing_data_appcache_helper.cc

 // Copyright (c) 2012 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 "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
+#include "net/base/completion_callback.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
 BrowsingDataAppCacheHelper::BrowsingDataAppCacheHelper(
     BrowserContext* browser_context)
     : is_fetching_(false),
       appcache_service_(BrowserContext::GetDefaultStoragePartition(
                             browser_context)->GetAppCacheService()) {
 }
 
 void BrowsingDataAppCacheHelper::StartFetching(const base::Closure& callback) {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     DCHECK(!is_fetching_);
     DCHECK(!callback.is_null());
     is_fetching_ = true;
     info_collection_ = new content::AppCacheInfoCollection;
     completion_callback_ = callback;
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&BrowsingDataAppCacheHelper::StartFetching, this, callback));
     return;
   }
 
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  appcache_info_callback_.Reset(
-      base::Bind(&BrowsingDataAppCacheHelper::OnFetchComplete,
-                 base::Unretained(this)));
+  net::CompletionCallback appcache_info_callback =
+      base::Bind(&BrowsingDataAppCacheHelper::OnFetchComplete, this);

[michaeln, 2015/01/13 21:46:27]

nit: its real common to put the base::Bind call inline in the param list (as on
line 34)

   appcache_service_->GetAllAppCacheInfo(info_collection_.get(),
-                                        appcache_info_callback_.callback());
+                                        appcache_info_callback);
 }
 
 void BrowsingDataAppCacheHelper::DeleteAppCacheGroup(
     const GURL& manifest_url) {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&BrowsingDataAppCacheHelper::DeleteAppCacheGroup, this,
                    manifest_url));
     return;
@@ skipping 87 matching lines @@
   completion_callback.Run();
 }
 
 void CannedBrowsingDataAppCacheHelper::DeleteAppCacheGroup(
     const GURL& manifest_url) {
   info_collection_->infos_by_origin.erase(manifest_url.GetOrigin());
   BrowsingDataAppCacheHelper::DeleteAppCacheGroup(manifest_url);
 }
 
 CannedBrowsingDataAppCacheHelper::~CannedBrowsingDataAppCacheHelper() {}