Index: content/browser/service_worker/embedded_worker_instance.cc |
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc |
index e66f2d1e3503458566f2f475bb1176cd471b8ff6..a5051ac84eea0f22316cb3e4eb15358a08d04366 100644 |
--- a/content/browser/service_worker/embedded_worker_instance.cc |
+++ b/content/browser/service_worker/embedded_worker_instance.cc |
@@ -53,7 +53,8 @@ void NotifyWorkerDestroyed(int worker_process_id, int worker_route_id) { |
void RegisterToWorkerDevToolsManager( |
int process_id, |
- const ServiceWorkerContextCore* const service_worker_context, |
+ const ServiceWorkerContextCore* service_worker_context, |
+ base::WeakPtr<ServiceWorkerContextCore> service_worker_context_weak, |
int64 service_worker_version_id, |
const base::Callback<void(int worker_devtools_agent_route_id, |
bool wait_for_debugger)>& callback) { |
@@ -63,6 +64,7 @@ void RegisterToWorkerDevToolsManager( |
base::Bind(RegisterToWorkerDevToolsManager, |
process_id, |
service_worker_context, |
+ service_worker_context_weak, |
service_worker_version_id, |
callback)); |
return; |
@@ -77,7 +79,9 @@ void RegisterToWorkerDevToolsManager( |
process_id, |
worker_devtools_agent_route_id, |
EmbeddedWorkerDevToolsManager::ServiceWorkerIdentifier( |
- service_worker_context, service_worker_version_id)); |
+ service_worker_context, |
+ service_worker_context_weak, |
+ service_worker_version_id)); |
} |
BrowserThread::PostTask( |
BrowserThread::IO, |
@@ -223,6 +227,7 @@ void EmbeddedWorkerInstance::ProcessAllocated( |
RegisterToWorkerDevToolsManager( |
process_id, |
context_.get(), |
+ context_, |
service_worker_version_id, |
base::Bind(&EmbeddedWorkerInstance::SendStartWorker, |
weak_factory_.GetWeakPtr(), |