| Index: content/browser/service_worker/embedded_worker_test_helper.h
|
| diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h
|
| index f48c6b433d812baaed24743e4592b46b2c4bd9e8..94e16703700b199d9f9aaeaf3952c6ce944c175b 100644
|
| --- a/content/browser/service_worker/embedded_worker_test_helper.h
|
| +++ b/content/browser/service_worker/embedded_worker_test_helper.h
|
| @@ -85,7 +85,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| // Implementation of mojo interfaces.
|
| void StartWorker(
|
| const EmbeddedWorkerStartParams& params,
|
| - mojom::ServiceWorkerEventDispatcherRequest dispatcher_request) override;
|
| + mojom::ServiceWorkerEventDispatcherRequest dispatcher_request,
|
| + mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host)
|
| + override;
|
| void StopWorker(const StopWorkerCallback& callback) override;
|
| void ResumeAfterDownload() override;
|
| void AddMessageToConsole(blink::WebConsoleMessage::Level level,
|
| @@ -171,7 +173,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| const GURL& scope,
|
| const GURL& script_url,
|
| bool pause_after_download,
|
| - mojom::ServiceWorkerEventDispatcherRequest request);
|
| + mojom::ServiceWorkerEventDispatcherRequest request,
|
| + mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host);
|
| virtual void OnResumeAfterDownload(int embedded_worker_id);
|
| // StopWorker IPC handler routed through MockEmbeddedWorkerInstanceClient.
|
| // This calls StopWorkerCallback by default.
|
| @@ -257,8 +260,10 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| private:
|
| class MockServiceWorkerEventDispatcher;
|
|
|
| - void OnStartWorkerStub(const EmbeddedWorkerStartParams& params,
|
| - mojom::ServiceWorkerEventDispatcherRequest request);
|
| + void OnStartWorkerStub(
|
| + const EmbeddedWorkerStartParams& params,
|
| + mojom::ServiceWorkerEventDispatcherRequest request,
|
| + mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host);
|
| void OnResumeAfterDownloadStub(int embedded_worker_id);
|
| void OnStopWorkerStub(
|
| const mojom::EmbeddedWorkerInstanceClient::StopWorkerCallback& callback);
|
| @@ -351,6 +356,11 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| std::map<int /* thread_id */, int /* embedded_worker_id */>
|
| thread_id_embedded_worker_id_map_;
|
|
|
| + std::map<
|
| + int /* embedded_worker_id */,
|
| + mojom::EmbeddedWorkerInstanceHostAssociatedPtr /* instance_host_ptr */>
|
| + embedded_worker_id_instance_host_ptr_map_;
|
| +
|
| // Updated each time MessageToWorker message is received.
|
| int current_embedded_worker_id_;
|
|
|
|
|