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

content/browser/appcache/chrome_appcache_service.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 #define CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_helpers.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "webkit/appcache/appcache_policy.h"
 #include "webkit/appcache/appcache_service.h"
 #include "webkit/quota/special_storage_policy.h"
 
 class FilePath;
 
 namespace content {
 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
 // to the same object, and those URLRequestContexts are refcounted independently
 // of the owning browser context.
 //
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
 //
 // TODO(dpranke): Fix dependencies on AppCacheService so that we don't have
 // 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
       content::ResourceContext* resource_context,
       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,
                                const GURL& first_party) OVERRIDE;
   virtual bool CanCreateAppCache(const GURL& manifest_url,
                                  const GURL& first_party) OVERRIDE;
 
   // content::NotificationObserver override
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   content::ResourceContext* resource_context_;
   content::NotificationRegistrar registrar_;
   FilePath cache_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAppCacheService);
 };
 
+struct ChromeAppCacheServiceDeleter {
+  static void Destruct(const ChromeAppCacheService* service) {
+    service->DeleteOnCorrectThread();
+  }
+};
+
 #endif  // CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_