commit 18d4f55aea3cea92fafe2a457615fef7b8becab6
author jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Dec 02 02:48:31 2011
committer jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Dec 02 02:48:31 2011
tree 2fc7dffb92b9c2caca0bf77dd774819ac8b63a55
parent 4f4d42ad6fd496f99e9b5e29e7ba66d4bc360717

base::Bind: Convert AppCacheService::GetAllAppCacheInfo.

BUG=none
TEST=none

R=csilv@chromium.org

Review URL: http://codereview.chromium.org/8776024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112622 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browsing_data_appcache_helper.cc

diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc
index b30fbb4..4d4febf6 100644
--- a/chrome/browser/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data_appcache_helper.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/browsing_data_appcache_helper.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
@@ -34,11 +35,11 @@
   }
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  appcache_info_callback_ =
-      new net::CancelableOldCompletionCallback<BrowsingDataAppCacheHelper>(
-          this, &BrowsingDataAppCacheHelper::OnFetchComplete);
+  appcache_info_callback_.Reset(
+      base::Bind(&BrowsingDataAppCacheHelper::OnFetchComplete,
+                 base::Unretained(this)));
   appcache_service_->GetAllAppCacheInfo(info_collection_,
-                                        appcache_info_callback_);
+                                        appcache_info_callback_.callback());
 }
 
 void BrowsingDataAppCacheHelper::CancelNotification() {
@@ -50,8 +51,7 @@
     return;
   }
 
-  if (appcache_info_callback_)
-    appcache_info_callback_.release()->Cancel();
+  appcache_info_callback_.Cancel();
 }
 
 void BrowsingDataAppCacheHelper::DeleteAppCacheGroup(
@@ -82,7 +82,6 @@
         origin_map.erase(current);
     }
 
-    appcache_info_callback_ = NULL;
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&BrowsingDataAppCacheHelper::OnFetchComplete, this, rv));