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 96dacef717c04e671bb9b78405805413915311e3..779db77272eab44163bf6c1bf2c96cbc27592945 100644 |
--- a/content/browser/service_worker/embedded_worker_test_helper.h |
+++ b/content/browser/service_worker/embedded_worker_test_helper.h |
@@ -64,7 +64,6 @@ |
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,8 +124,6 @@ |
IPC::TestSink* ipc_sink() { return &sink_; } |
// 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() { |
@@ -185,9 +182,7 @@ |
// OnMessageToWorker when events are sent to the embedded |
// worker. By default they just return success via |
// SimulateSendReplyToBrowser. |
- virtual void OnActivateEvent( |
- const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback& |
- callback); |
+ virtual void OnActivateEvent(int embedded_worker_id, int request_id); |
virtual void OnExtendableMessageEvent( |
mojom::ExtendableMessageEventPtr event, |
const mojom::ServiceWorkerEventDispatcher:: |
@@ -243,9 +238,7 @@ |
void OnMessageToWorkerStub(int thread_id, |
int embedded_worker_id, |
const IPC::Message& message); |
- void OnActivateEventStub( |
- const mojom::ServiceWorkerEventDispatcher::DispatchActivateEventCallback& |
- callback); |
+ void OnActivateEventStub(int request_id); |
void OnExtendableMessageEventStub( |
mojom::ExtendableMessageEventPtr event, |
const mojom::ServiceWorkerEventDispatcher:: |
@@ -309,8 +302,6 @@ |
// 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); |