Index: content/browser/service_worker/service_worker_context_core.cc |
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc |
index 586c9ad9ce06c58caf1790e28dfc6698eb1aac1d..cbd6ce62bdd8db98b1bbe881fb7351f5f643336a 100644 |
--- a/content/browser/service_worker/service_worker_context_core.cc |
+++ b/content/browser/service_worker/service_worker_context_core.cc |
@@ -82,16 +82,14 @@ |
base::MessageLoopProxy* disk_cache_thread, |
quota::QuotaManagerProxy* quota_manager_proxy, |
ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list, |
- ServiceWorkerContextWrapper* wrapper) |
+ scoped_ptr<ServiceWorkerProcessManager> process_manager) |
: weak_factory_(this), |
- wrapper_(wrapper), |
- storage_(new ServiceWorkerStorage(path, |
- AsWeakPtr(), |
- database_task_runner, |
- disk_cache_thread, |
- quota_manager_proxy)), |
+ storage_(new ServiceWorkerStorage( |
+ path, AsWeakPtr(), database_task_runner, disk_cache_thread, |
+ quota_manager_proxy)), |
embedded_worker_registry_(new EmbeddedWorkerRegistry(AsWeakPtr())), |
job_coordinator_(new ServiceWorkerJobCoordinator(AsWeakPtr())), |
+ process_manager_(process_manager.Pass()), |
next_handle_id_(0), |
observer_list_(observer_list) { |
} |
@@ -309,8 +307,4 @@ |
source_identifier, message_level, message, line_number, source_url)); |
} |
-ServiceWorkerProcessManager* ServiceWorkerContextCore::process_manager() { |
- return wrapper_->process_manager(); |
-} |
- |
} // namespace content |