Index: content/browser/service_worker/service_worker_version.cc |
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc |
index 60d70167be0bf719f8c6fa3c92d39f5129f5671a..829c6d9797e98e6ee77354caa968cc72e83407a8 100644 |
--- a/content/browser/service_worker/service_worker_version.cc |
+++ b/content/browser/service_worker/service_worker_version.cc |
@@ -1478,13 +1478,13 @@ void ServiceWorkerVersion::StartWorkerInternal() { |
StartTimeoutTimer(); |
- std::unique_ptr<EmbeddedWorkerStartParams> params( |
- new EmbeddedWorkerStartParams()); |
- params->service_worker_version_id = version_id_; |
- params->scope = scope_; |
- params->script_url = script_url_; |
- params->is_installed = IsInstalled(status_); |
- params->pause_after_download = pause_after_download_; |
+ auto params = base::MakeUnique<EmbeddedWorkerStartParams>(); |
+ params->internal.service_worker_version_id = version_id_; |
+ params->internal.scope = scope_; |
+ params->internal.script_url = script_url_; |
+ params->internal.is_installed = IsInstalled(status_); |
+ params->internal.pause_after_download = pause_after_download_; |
+ params->dispatcher_request = mojo::GetProxy(&event_dispatcher_); |
embedded_worker_->Start( |
std::move(params), |
@@ -1837,10 +1837,7 @@ void ServiceWorkerVersion::OnStoppedInternal(EmbeddedWorkerStatus old_status) { |
} |
pending_requests_.Clear(); |
external_request_uuid_to_request_id_.clear(); |
- |
- // Close all mojo services. This will also fire and clear all callbacks |
- // for messages that are still outstanding for those services. |
- mojo_services_.clear(); |
+ event_dispatcher_.reset(); |
// TODO(falken): Call SWURLRequestJob::ClearStream here? |
streaming_url_request_jobs_.clear(); |
@@ -1855,12 +1852,6 @@ void ServiceWorkerVersion::OnStoppedInternal(EmbeddedWorkerStatus old_status) { |
} |
} |
-void ServiceWorkerVersion::OnMojoConnectionError(const char* service_name) { |
- // Simply deleting the service will cause error callbacks to be called from |
- // the destructor of the MojoServiceWrapper instance. |
- mojo_services_.erase(service_name); |
-} |
- |
void ServiceWorkerVersion::OnBeginEvent() { |
if (should_exclude_from_uma_ || |
running_status() != EmbeddedWorkerStatus::RUNNING || |