Index: content/renderer/service_worker/service_worker_context_client.cc |
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc |
index 352b1eb2d18548de6a9647e4a429a75a2fc4d3f5..9a1d4db3a5c28c0fd2ffa86db474c9a92b60e367 100644 |
--- a/content/renderer/service_worker/service_worker_context_client.cc |
+++ b/content/renderer/service_worker/service_worker_context_client.cc |
@@ -398,21 +398,6 @@ ServiceWorkerContextClient::ServiceWorkerContextClient( |
"PrepareWorker"); |
} |
-ServiceWorkerContextClient::ServiceWorkerContextClient( |
- int embedded_worker_id, |
- int64_t service_worker_version_id, |
- const GURL& service_worker_scope, |
- const GURL& script_url, |
- int worker_devtools_agent_route_id) |
- : ServiceWorkerContextClient::ServiceWorkerContextClient( |
- embedded_worker_id, |
- service_worker_version_id, |
- service_worker_scope, |
- script_url, |
- worker_devtools_agent_route_id, |
- mojom::ServiceWorkerEventDispatcherRequest(), |
- nullptr) {} |
- |
ServiceWorkerContextClient::~ServiceWorkerContextClient() {} |
void ServiceWorkerContextClient::OnMessageReceived( |
@@ -544,10 +529,10 @@ void ServiceWorkerContextClient::workerContextStarted( |
DCHECK_NE(registration_info.registration_id, |
kInvalidServiceWorkerRegistrationId); |
- if (ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) { |
- DCHECK(pending_dispatcher_request_.is_pending()); |
- BindEventDispatcher(std::move(pending_dispatcher_request_)); |
- } |
+ DCHECK(pending_dispatcher_request_.is_pending()); |
+ DCHECK(!context_->event_dispatcher_binding.is_bound()); |
+ context_->event_dispatcher_binding.Bind( |
+ std::move(pending_dispatcher_request_)); |
SetRegistrationInServiceWorkerGlobalScope(registration_info, version_attrs); |
@@ -1275,13 +1260,6 @@ void ServiceWorkerContextClient::OnNavigationPreloadError( |
proxy_->onNavigationPreloadError(fetch_event_id, std::move(error)); |
} |
-void ServiceWorkerContextClient::BindEventDispatcher( |
- mojom::ServiceWorkerEventDispatcherRequest request) { |
- DCHECK(context_); |
- DCHECK(!context_->event_dispatcher_binding.is_bound()); |
- context_->event_dispatcher_binding.Bind(std::move(request)); |
-} |
- |
base::WeakPtr<ServiceWorkerContextClient> |
ServiceWorkerContextClient::GetWeakPtr() { |
DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |