service worker scaffolding

content/browser/storage_partition_impl.cc

Index: content/browser/storage_partition_impl.cc
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index e984e617343d2e6c80ff3ef9cb44a4299d48a7ce..797e2364a907e963e4d395ab5beaaf7a709a7e00 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -284,7 +284,7 @@ StoragePartitionImpl::StoragePartitionImpl(
     webkit_database::DatabaseTracker* database_tracker,
     DOMStorageContextWrapper* dom_storage_context,
     IndexedDBContextImpl* indexed_db_context,
-    ServiceWorkerContext* service_worker_context,
+    ServiceWorkerContextWrapper* service_worker_context,
     WebRTCIdentityStore* webrtc_identity_store)
     : partition_path_(partition_path),
       quota_manager_(quota_manager),
@@ -311,6 +311,9 @@ StoragePartitionImpl::~StoragePartitionImpl() {
 
   if (GetDOMStorageContext())
     GetDOMStorageContext()->Shutdown();
+
+  if (GetServiceWorkerContext())
+    GetServiceWorkerContext()->Shutdown();
 }
 
 // TODO(ajwong): Break the direct dependency on |context|. We only
@@ -369,8 +372,8 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
                                quota_manager->proxy(),
                                idb_task_runner);
 
-  scoped_refptr<ServiceWorkerContext> service_worker_context =
-      new ServiceWorkerContext(path, quota_manager->proxy());
+  scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_wrapper =
+      new ServiceWorkerContextWrapper(path, quota_manager->proxy());
 
   scoped_refptr<ChromeAppCacheService> appcache_service =
       new ChromeAppCacheService(quota_manager->proxy());
@@ -385,7 +388,7 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
                                   database_tracker.get(),
                                   dom_storage_context.get(),
                                   indexed_db_context.get(),
-                                  service_worker_context.get(),
+                                  service_worker_context_wrapper.get(),
                                   webrtc_identity_store.get());
 }
 
@@ -426,7 +429,7 @@ IndexedDBContextImpl* StoragePartitionImpl::GetIndexedDBContext() {
   return indexed_db_context_.get();
 }
 
-ServiceWorkerContext* StoragePartitionImpl::GetServiceWorkerContext() {
+ServiceWorkerContextWrapper* StoragePartitionImpl::GetServiceWorkerContext() {
   return service_worker_context_.get();
 }