| 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 779db77272eab44163bf6c1bf2c96cbc27592945..96dacef717c04e671bb9b78405805413915311e3 100644
|
| --- a/content/browser/service_worker/embedded_worker_test_helper.h
|
| +++ b/content/browser/service_worker/embedded_worker_test_helper.h
|
| @@ -64,6 +64,7 @@ struct ServiceWorkerFetchRequest;
|
| class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| public IPC::Listener {
|
| public:
|
| + enum class Event { Activate };
|
| using FetchCallback =
|
| base::Callback<void(ServiceWorkerStatusCode,
|
| base::Time /* dispatch_event_time */)>;
|
| @@ -125,6 +126,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| // Inner IPC sink for script context messages sent via EmbeddedWorker.
|
| IPC::TestSink* inner_ipc_sink() { return &inner_sink_; }
|
|
|
| + std::vector<Event>* dispatched_events() { return &events_; }
|
| +
|
| std::vector<std::unique_ptr<MockEmbeddedWorkerInstanceClient>>*
|
| mock_instance_clients() {
|
| return &mock_instance_clients_;
|
| @@ -182,7 +185,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| // OnMessageToWorker when events are sent to the embedded
|
| // worker. By default they just return success via
|
| // SimulateSendReplyToBrowser.
|
| - virtual void OnActivateEvent(int embedded_worker_id, int request_id);
|
| + virtual void OnActivateEvent(
|
| + const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
|
| + callback);
|
| virtual void OnExtendableMessageEvent(
|
| mojom::ExtendableMessageEventPtr event,
|
| const mojom::ServiceWorkerEventDispatcher::
|
| @@ -238,7 +243,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| void OnMessageToWorkerStub(int thread_id,
|
| int embedded_worker_id,
|
| const IPC::Message& message);
|
| - void OnActivateEventStub(int request_id);
|
| + void OnActivateEventStub(
|
| + const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback&
|
| + callback);
|
| void OnExtendableMessageEventStub(
|
| mojom::ExtendableMessageEventPtr event,
|
| const mojom::ServiceWorkerEventDispatcher::
|
| @@ -302,6 +309,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
|
| // Updated each time MessageToWorker message is received.
|
| int current_embedded_worker_id_;
|
|
|
| + std::vector<Event> events_;
|
| +
|
| base::WeakPtrFactory<EmbeddedWorkerTestHelper> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerTestHelper);
|
|
|