Decouple Cache Storage messaging from Service Worker/Embedded Worker

content/browser/storage_partition_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/storage_partition_impl.h"
 
 #include "base/sequenced_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
@@ skipping 351 matching lines @@
 
 StoragePartitionImpl::StoragePartitionImpl(
     BrowserContext* browser_context,
     const base::FilePath& partition_path,
     storage::QuotaManager* quota_manager,
     ChromeAppCacheService* appcache_service,
     storage::FileSystemContext* filesystem_context,
     storage::DatabaseTracker* database_tracker,
     DOMStorageContextWrapper* dom_storage_context,
     IndexedDBContextImpl* indexed_db_context,
+    CacheStorageContextImpl* cache_storage_context,
     ServiceWorkerContextWrapper* service_worker_context,
     WebRTCIdentityStore* webrtc_identity_store,
     storage::SpecialStoragePolicy* special_storage_policy,
     GeofencingManager* geofencing_manager,
     HostZoomLevelContext* host_zoom_level_context,
     NavigatorConnectContextImpl* navigator_connect_context)
     : partition_path_(partition_path),
       quota_manager_(quota_manager),
       appcache_service_(appcache_service),
       filesystem_context_(filesystem_context),
       database_tracker_(database_tracker),
       dom_storage_context_(dom_storage_context),
       indexed_db_context_(indexed_db_context),
+      cache_storage_context_(cache_storage_context),
       service_worker_context_(service_worker_context),
       webrtc_identity_store_(webrtc_identity_store),
       special_storage_policy_(special_storage_policy),
       geofencing_manager_(geofencing_manager),
       host_zoom_level_context_(host_zoom_level_context),
       navigator_connect_context_(navigator_connect_context),
       browser_context_(browser_context) {
 }
 
 StoragePartitionImpl::~StoragePartitionImpl() {
@@ skipping 10 matching lines @@
 
   if (GetFileSystemContext())
     GetFileSystemContext()->Shutdown();
 
   if (GetDOMStorageContext())
     GetDOMStorageContext()->Shutdown();
 
   if (GetServiceWorkerContext())
     GetServiceWorkerContext()->Shutdown();
 
+  if (GetCacheStorageContext())
+    GetCacheStorageContext()->Shutdown();
+
   if (GetGeofencingManager())
     GetGeofencingManager()->Shutdown();
 }
 
 StoragePartitionImpl* StoragePartitionImpl::Create(
     BrowserContext* context,
     bool in_memory,
     const base::FilePath& partition_path) {
   // Ensure that these methods are called on the UI thread, except for
   // unittests where a UI thread might not have been created.
@@ skipping 37 matching lines @@
               BrowserMainLoop::GetInstance()
           ? BrowserMainLoop::GetInstance()->indexed_db_thread()
                 ->message_loop_proxy().get()
           : NULL;
   scoped_refptr<IndexedDBContextImpl> indexed_db_context =
       new IndexedDBContextImpl(path,
                                context->GetSpecialStoragePolicy(),
                                quota_manager->proxy(),
                                idb_task_runner);
 
+  scoped_refptr<CacheStorageContextImpl> cache_storage_context =
+      new CacheStorageContextImpl(context);
+  cache_storage_context->Init(path, quota_manager->proxy(),
+                              context->GetSpecialStoragePolicy());
+
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context =
       new ServiceWorkerContextWrapper(context);
-  service_worker_context->Init(
-      path, quota_manager->proxy(), context->GetSpecialStoragePolicy());
+  service_worker_context->Init(path, quota_manager->proxy(),
+                               context->GetSpecialStoragePolicy());
 
   scoped_refptr<ChromeAppCacheService> appcache_service =
       new ChromeAppCacheService(quota_manager->proxy());
 
   scoped_refptr<WebRTCIdentityStore> webrtc_identity_store(
       new WebRTCIdentityStore(path, context->GetSpecialStoragePolicy()));
 
   scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy(
       context->GetSpecialStoragePolicy());
 
   scoped_refptr<GeofencingManager> geofencing_manager =
       new GeofencingManager(service_worker_context);
   geofencing_manager->Init();
 
   scoped_refptr<HostZoomLevelContext> host_zoom_level_context(
       new HostZoomLevelContext(
           context->CreateZoomLevelDelegate(partition_path)));
 
   scoped_refptr<NavigatorConnectContextImpl> navigator_connect_context =
       new NavigatorConnectContextImpl();
   navigator_connect_context->AddFactory(make_scoped_ptr(
       new NavigatorConnectServiceWorkerServiceFactory(service_worker_context)));
 
   StoragePartitionImpl* storage_partition = new StoragePartitionImpl(
       context, partition_path, quota_manager.get(), appcache_service.get(),
       filesystem_context.get(), database_tracker.get(),
       dom_storage_context.get(), indexed_db_context.get(),
-      service_worker_context.get(), webrtc_identity_store.get(),
-      special_storage_policy.get(), geofencing_manager.get(),
-      host_zoom_level_context.get(), navigator_connect_context.get());
+      cache_storage_context.get(), service_worker_context.get(),
+      webrtc_identity_store.get(), special_storage_policy.get(),
+      geofencing_manager.get(), host_zoom_level_context.get(),
+      navigator_connect_context.get());
 
   service_worker_context->set_storage_partition(storage_partition);
 
   return storage_partition;
 }
 
 base::FilePath StoragePartitionImpl::GetPath() {
   return partition_path_;
 }
 
@@ skipping 23 matching lines @@
 }
 
 DOMStorageContextWrapper* StoragePartitionImpl::GetDOMStorageContext() {
   return dom_storage_context_.get();
 }
 
 IndexedDBContextImpl* StoragePartitionImpl::GetIndexedDBContext() {
   return indexed_db_context_.get();
 }
 
+CacheStorageContextImpl* StoragePartitionImpl::GetCacheStorageContext() {
+  return cache_storage_context_.get();
+}
+
 ServiceWorkerContextWrapper* StoragePartitionImpl::GetServiceWorkerContext() {
   return service_worker_context_.get();
 }
 
 GeofencingManager* StoragePartitionImpl::GetGeofencingManager() {
   return geofencing_manager_.get();
 }
 
 HostZoomMap* StoragePartitionImpl::GetHostZoomMap() {
   DCHECK(host_zoom_level_context_.get());
@@ skipping 322 matching lines @@
     net::URLRequestContextGetter* url_request_context) {
   url_request_context_ = url_request_context;
 }
 
 void StoragePartitionImpl::SetMediaURLRequestContext(
     net::URLRequestContextGetter* media_url_request_context) {
   media_url_request_context_ = media_url_request_context;
 }
 
 }  // namespace content