base::Bind: Implement a 1-arity CancelableCallback and use this to implement

webkit/appcache/appcache_service.h

Index: webkit/appcache/appcache_service.h
diff --git a/webkit/appcache/appcache_service.h b/webkit/appcache/appcache_service.h
index 3a81a079ad4072f4bd428f686a4d541d87b1142b..113f61f04eb25b731cf3cae4b673778af9501069 100644
--- a/webkit/appcache/appcache_service.h
+++ b/webkit/appcache/appcache_service.h
@@ -71,7 +71,7 @@ class APPCACHE_EXPORT AppCacheService {
   // This method always completes asynchronously.
   void CanHandleMainResourceOffline(const GURL& url,
                                     const GURL& first_party,
-                                    net::OldCompletionCallback* callback);
+                                    const net::CompletionCallback& callback);
 
   // Populates 'collection' with info about all of the appcaches stored
   // within the service, 'callback' is invoked upon completion. The service
@@ -149,6 +149,7 @@ class APPCACHE_EXPORT AppCacheService {
   friend class AppCacheServiceTest;
 
   class AsyncHelper;

[michaeln, 2011/11/30 01:18:21]

maybe rename the existing class to OldAsyncHelper and old_pending_helpers_ and
let the new go unprefixed

[James Hawkins, 2011/11/30 01:44:58]

There are tons of existing usages of AsyncHelper, so I'm going to slowly convert
everything to NewAsyncHelper then get rid of the old one. I have a CL up that
does this in one blow.

+  class NewAsyncHelper;
   class CanHandleOfflineHelper;
   class DeleteHelper;
   class DeleteOriginHelper;
@@ -156,6 +157,7 @@ class APPCACHE_EXPORT AppCacheService {
   class CheckResponseHelper;
 
   typedef std::set<AsyncHelper*> PendingAsyncHelpers;
+  typedef std::set<NewAsyncHelper*> PendingNewAsyncHelpers;
   typedef std::map<int, AppCacheBackendImpl*> BackendMap;
 
   AppCachePolicy* appcache_policy_;
@@ -164,6 +166,7 @@ class APPCACHE_EXPORT AppCacheService {
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
   PendingAsyncHelpers pending_helpers_;
+  PendingNewAsyncHelpers pending_new_helpers_;
   BackendMap backends_;  // One 'backend' per child process.
   // Context for use during cache updates.
   net::URLRequestContext* request_context_;