Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1693)

Unified Diff: content/browser/service_worker/service_worker_context_core.cc

Issue 303733002: Reparent SWProcessManager onto SWContextWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make sure the ContextCore is destroyed before checking that messages fail Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 cbd6ce62bdd8db98b1bbe881fb7351f5f643336a..586c9ad9ce06c58caf1790e28dfc6698eb1aac1d 100644
--- a/content/browser/service_worker/service_worker_context_core.cc
+++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -82,14 +82,16 @@ ServiceWorkerContextCore::ServiceWorkerContextCore(
base::MessageLoopProxy* disk_cache_thread,
quota::QuotaManagerProxy* quota_manager_proxy,
ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,
- scoped_ptr<ServiceWorkerProcessManager> process_manager)
+ ServiceWorkerContextWrapper* wrapper)
: weak_factory_(this),
- storage_(new ServiceWorkerStorage(
- path, AsWeakPtr(), database_task_runner, disk_cache_thread,
- quota_manager_proxy)),
+ wrapper_(wrapper),
+ 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) {
}
@@ -307,4 +309,8 @@ void ServiceWorkerContextCore::OnReportConsoleMessage(
source_identifier, message_level, message, line_number, source_url));
}
+ServiceWorkerProcessManager* ServiceWorkerContextCore::process_manager() {
+ return wrapper_->process_manager();
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698