| Index: content/renderer/service_worker/embedded_worker_instance_client_impl.h
|
| diff --git a/content/renderer/service_worker/embedded_worker_instance_client_impl.h b/content/renderer/service_worker/embedded_worker_instance_client_impl.h
|
| index 9cae1fe11877d9d99ffc40cbe18928e383365305..1b3d27d99457acdfe6444299d42c946c811eb963 100644
|
| --- a/content/renderer/service_worker/embedded_worker_instance_client_impl.h
|
| +++ b/content/renderer/service_worker/embedded_worker_instance_client_impl.h
|
| @@ -12,7 +12,6 @@
|
| #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| #include "mojo/public/cpp/bindings/interface_ptr.h"
|
| -#include "services/service_manager/public/cpp/interface_provider.h"
|
|
|
| namespace content {
|
|
|
| @@ -27,10 +26,6 @@ class EmbeddedWorkerInstanceClientImpl
|
|
|
| ~EmbeddedWorkerInstanceClientImpl() override;
|
|
|
| - // This method can be called from any threads.
|
| - void ExposeInterfacesToBrowser(
|
| - service_manager::InterfaceRegistry* interface_registry);
|
| -
|
| // Called from ServiceWorkerContextClient.
|
| void StopWorkerCompleted();
|
|
|
| @@ -42,9 +37,7 @@ class EmbeddedWorkerInstanceClientImpl
|
| // mojom::EmbeddedWorkerInstanceClient implementation
|
| void StartWorker(
|
| const EmbeddedWorkerStartParams& params,
|
| - service_manager::mojom::InterfaceProviderPtr browser_interfaces,
|
| - service_manager::mojom::InterfaceProviderRequest renderer_request)
|
| - override;
|
| + mojom::ServiceWorkerEventDispatcherRequest dispatcher_request) override;
|
| void StopWorker(const StopWorkerCallback& callback) override;
|
|
|
| // Handler of connection error bound to |binding_|
|
| @@ -52,16 +45,11 @@ class EmbeddedWorkerInstanceClientImpl
|
|
|
| EmbeddedWorkerDispatcher* dispatcher_;
|
| mojo::Binding<mojom::EmbeddedWorkerInstanceClient> binding_;
|
| - service_manager::InterfaceProvider remote_interfaces_;
|
|
|
| // This is valid before StartWorker is called. After that, this object
|
| // will be passed to ServiceWorkerContextClient.
|
| std::unique_ptr<EmbeddedWorkerInstanceClientImpl> temporal_self_;
|
|
|
| - // This is drained by ServiceWorkerContextClient after the worker thread is
|
| - // launched.
|
| - service_manager::mojom::InterfaceProviderRequest renderer_request_;
|
| -
|
| base::Optional<int> embedded_worker_id_;
|
|
|
| // Owned by EmbeddedWorkerDispatcher. This can be nullptr while a worker is
|
|
|