Move creation of BrowserContext objects that live in content to content, instead of depending on th…

content/browser/appcache/chrome_appcache_service.h

Index: content/browser/appcache/chrome_appcache_service.h
===================================================================
--- content/browser/appcache/chrome_appcache_service.h	(revision 122721)
+++ content/browser/appcache/chrome_appcache_service.h	(working copy)
@@ -23,6 +23,8 @@
 class ResourceContext;
 }
 
+struct ChromeAppCacheServiceDeleter;
+
 // An AppCacheService subclass used by the chrome. There is an instance
 // associated with each BrowserContext. This derivation adds refcounting
 // semantics since a browser context has multiple URLRequestContexts which refer
@@ -36,12 +38,13 @@
 // to worry about clients calling AppCacheService methods.
 class CONTENT_EXPORT ChromeAppCacheService
     : public base::RefCountedThreadSafe<
-          ChromeAppCacheService, content::BrowserThread::DeleteOnIOThread>,
+          ChromeAppCacheService, ChromeAppCacheServiceDeleter>,
       NON_EXPORTED_BASE(public appcache::AppCacheService),
       NON_EXPORTED_BASE(public appcache::AppCachePolicy),
       public content::NotificationObserver {
  public:
   explicit ChromeAppCacheService(quota::QuotaManagerProxy* proxy);
+  virtual ~ChromeAppCacheService();
 
   void InitializeOnIOThread(
       const FilePath& cache_path,  // may be empty to use in-memory structures
@@ -49,13 +52,9 @@
       scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
 
  private:
-  friend class base::RefCountedThreadSafe<
-      ChromeAppCacheService,
-      content::BrowserThread::DeleteOnIOThread>;
-  friend class content::BrowserThread;
-  friend class base::DeleteHelper<ChromeAppCacheService>;
+  friend struct ChromeAppCacheServiceDeleter;
 
-  virtual ~ChromeAppCacheService();
+  void DeleteOnCorrectThread() const;
 
   // AppCachePolicy overrides
   virtual bool CanLoadAppCache(const GURL& manifest_url,
@@ -75,4 +74,10 @@
   DISALLOW_COPY_AND_ASSIGN(ChromeAppCacheService);
 };
 
+struct ChromeAppCacheServiceDeleter {
+  static void Destruct(const ChromeAppCacheService* service) {
+    service->DeleteOnCorrectThread();
+  }
+};
+
 #endif  // CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_