Work around CancelableCompletionCallback threading restrictions.

webkit/appcache/appcache_quota_client.h

Index: webkit/appcache/appcache_quota_client.h
===================================================================
--- webkit/appcache/appcache_quota_client.h	(revision 122851)
+++ webkit/appcache/appcache_quota_client.h	(working copy)
@@ -65,6 +65,7 @@
   void ProcessPendingRequests();
   void DeletePendingRequests();
   const AppCacheStorage::UsageMap* GetUsageMap();
+  net::CancelableCompletionCallback* GetServiceDeleteCallback();
 
   // For use by appcache internals during initialization and shutdown.
   APPCACHE_EXPORT void NotifyAppCacheReady();
@@ -78,7 +79,7 @@
   // And once it's ready, we can only handle one delete request at a time,
   // so we queue up additional requests while one is in already in progress.
   DeletionCallback current_delete_request_callback_;
-  net::CancelableCompletionCallback service_delete_callback_;
+  scoped_ptr<net::CancelableCompletionCallback> service_delete_callback_;

[mnaganov (inactive), 2012/02/27 22:02:10]

Perhaps, mention that it is lazily created, or maybe reflect this in the name.

[mnaganov (inactive), 2012/02/27 22:02:10]

Does it play well regarding to destruction? WeakPtrFactory checks the thread in
the destructor, and CancellableCallback owns one. I'm not sure if we are really
running destructors at exit, but I think it's worth checking.

[michaeln, 2012/02/27 22:54:15]

Aside from construction, this class is used deleted on the IO thread.

 
   AppCacheService* service_;
   bool appcache_is_ready_;