| Index: content/browser/url_loader_factory_getter.h
|
| diff --git a/content/browser/url_loader_factory_getter.h b/content/browser/url_loader_factory_getter.h
|
| index 327629c63a58e2e7e5a084a3c98ab02d6849ae16..d8d6972aacb17355f1c22d7860f7fccad4e2f92a 100644
|
| --- a/content/browser/url_loader_factory_getter.h
|
| +++ b/content/browser/url_loader_factory_getter.h
|
| @@ -13,6 +13,8 @@
|
|
|
| namespace content {
|
|
|
| +class ChromeAppCacheService;
|
| +
|
| // Holds on to URLLoaderFactory for a given StoragePartition and allows code
|
| // running on the IO thread to access them. Note these are the factories used by
|
| // the browser process for frame requests.
|
| @@ -22,8 +24,11 @@ class URLLoaderFactoryGetter
|
| public:
|
| URLLoaderFactoryGetter();
|
|
|
| - // Initializes this object on the UI thread.
|
| - void Initialize(mojom::URLLoaderFactoryPtr network_factory);
|
| + // Initializes this object on the UI thread. The |appcache_service|
|
| + // parameter is used to initialize the AppCache URLLoaderFactory. This is
|
| + // owned by the storage partition.
|
| + void Initialize(mojom::URLLoaderFactoryPtr network_factory,
|
| + ChromeAppCacheService* appcache_service);
|
|
|
| // Called on the IO thread to get the URLLoaderFactory to the network service.
|
| // The pointer shouldn't be cached.
|
| @@ -35,18 +40,24 @@ class URLLoaderFactoryGetter
|
| CONTENT_EXPORT void SetNetworkFactoryForTesting(
|
| mojom::URLLoaderFactoryPtr test_factory);
|
|
|
| + // Called on the IO thread to get the URLLoaderFactory for AppCache. The
|
| + // pointer should not be cached.
|
| + mojom::URLLoaderFactoryPtr* GetAppCacheFactory();
|
| +
|
| private:
|
| friend class base::DeleteHelper<URLLoaderFactoryGetter>;
|
| friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
|
|
|
| CONTENT_EXPORT ~URLLoaderFactoryGetter();
|
| - void InitializeOnIOThread(mojom::URLLoaderFactoryPtrInfo network_factory);
|
| + void InitializeOnIOThread(mojom::URLLoaderFactoryPtrInfo network_factory,
|
| + ChromeAppCacheService* appcache_service);
|
| void SetTestNetworkFactoryOnIOThread(
|
| mojom::URLLoaderFactoryPtrInfo test_factory);
|
|
|
| // Only accessed on IO thread.
|
| mojom::URLLoaderFactoryPtr network_factory_;
|
| mojom::URLLoaderFactoryPtr test_factory_;
|
| + mojom::URLLoaderFactoryPtr appcache_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(URLLoaderFactoryGetter);
|
| };
|
|
|