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

Unified Diff: content/renderer/service_worker/embedded_worker_instance_client_impl.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/renderer/service_worker/embedded_worker_instance_client_impl.cc
diff --git a/content/renderer/service_worker/embedded_worker_instance_client_impl.cc b/content/renderer/service_worker/embedded_worker_instance_client_impl.cc
index 8bea7d38ed6d24fc45cc24fa3cb41febd92f4e94..8b509787f1063911979ba846e548180d61deab81 100644
--- a/content/renderer/service_worker/embedded_worker_instance_client_impl.cc
+++ b/content/renderer/service_worker/embedded_worker_instance_client_impl.cc
@@ -12,7 +12,6 @@
#include "content/public/common/content_client.h"
#include "content/renderer/service_worker/embedded_worker_devtools_agent.h"
#include "content/renderer/service_worker/service_worker_context_client.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/web/WebEmbeddedWorker.h"
#include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h"
@@ -26,15 +25,6 @@ void EmbeddedWorkerInstanceClientImpl::Create(
new EmbeddedWorkerInstanceClientImpl(dispatcher, std::move(request));
}
-void EmbeddedWorkerInstanceClientImpl::ExposeInterfacesToBrowser(
- service_manager::InterfaceRegistry* interface_registry) {
- DCHECK(renderer_request_.is_pending());
- interface_registry->Bind(
- std::move(renderer_request_), service_manager::Identity(),
- service_manager::InterfaceProviderSpec(), service_manager::Identity(),
- service_manager::InterfaceProviderSpec());
-}
-
void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() {
DCHECK(embedded_worker_id_);
DCHECK(stop_callback_);
@@ -48,22 +38,20 @@ void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() {
void EmbeddedWorkerInstanceClientImpl::StartWorker(
const EmbeddedWorkerStartParams& params,
- service_manager::mojom::InterfaceProviderPtr browser_interfaces,
- service_manager::mojom::InterfaceProviderRequest renderer_request) {
+ mojom::ServiceWorkerEventDispatcherRequest dispatcher_request) {
DCHECK(ChildThreadImpl::current());
TRACE_EVENT0("ServiceWorker",
"EmbeddedWorkerInstanceClientImpl::StartWorker");
embedded_worker_id_ = params.embedded_worker_id;
- remote_interfaces_.Bind(std::move(browser_interfaces));
- renderer_request_ = std::move(renderer_request);
std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> wrapper =
dispatcher_->StartWorkerContext(
- params, base::MakeUnique<ServiceWorkerContextClient>(
- params.embedded_worker_id,
- params.service_worker_version_id, params.scope,
- params.script_url, params.worker_devtools_agent_route_id,
- std::move(temporal_self_)));
+ params,
+ base::MakeUnique<ServiceWorkerContextClient>(
+ params.embedded_worker_id, params.service_worker_version_id,
+ params.scope, params.script_url,
+ params.worker_devtools_agent_route_id,
+ std::move(dispatcher_request), std::move(temporal_self_)));
wrapper_ = wrapper.get();
dispatcher_->RegisterWorker(params.embedded_worker_id, std::move(wrapper));
}

Powered by Google App Engine
This is Rietveld 408576698