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

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

Issue 2490623005: Remove InterfaceRegistry/Provider from service workers (Closed)
Patch Set: review Created 4 years, 1 month 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_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 60d70167be0bf719f8c6fa3c92d39f5129f5671a..14d1419e9f639bf0eef316a2d8800e63e8414218 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -1478,8 +1478,7 @@ void ServiceWorkerVersion::StartWorkerInternal() {
StartTimeoutTimer();
- std::unique_ptr<EmbeddedWorkerStartParams> params(
- new EmbeddedWorkerStartParams());
+ auto params = base::MakeUnique<EmbeddedWorkerStartParams>();
params->service_worker_version_id = version_id_;
params->scope = scope_;
params->script_url = script_url_;
@@ -1487,7 +1486,7 @@ void ServiceWorkerVersion::StartWorkerInternal() {
params->pause_after_download = pause_after_download_;
embedded_worker_->Start(
- std::move(params),
+ std::move(params), mojo::GetProxy(&event_dispatcher_),
base::Bind(&ServiceWorkerVersion::OnStartSentAndScriptEvaluated,
weak_factory_.GetWeakPtr()));
}
@@ -1837,10 +1836,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 +1851,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 ||

Powered by Google App Engine
This is Rietveld 408576698