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..568aae4b9dfc7641147238dd21390300833548fc 100644 |
--- a/content/browser/service_worker/embedded_worker_test_helper.h |
+++ b/content/browser/service_worker/embedded_worker_test_helper.h |
@@ -66,7 +66,7 @@ struct ServiceWorkerFetchRequest; |
class EmbeddedWorkerTestHelper : public IPC::Sender, |
public IPC::Listener { |
public: |
- enum class Event { Activate }; |
+ enum class Event { Install, Activate }; |
using FetchCallback = |
base::Callback<void(ServiceWorkerStatusCode, |
base::Time /* dispatch_event_time */)>; |
@@ -213,7 +213,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, |
mojom::ExtendableMessageEventPtr event, |
const mojom::ServiceWorkerEventDispatcher:: |
DispatchExtendableMessageEventCallback& callback); |
- virtual void OnInstallEvent(int embedded_worker_id, int request_id); |
+ virtual void OnInstallEvent( |
+ const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback& |
+ callback); |
virtual void OnFetchEvent(int embedded_worker_id, |
int fetch_event_id, |
const ServiceWorkerFetchRequest& request, |
@@ -291,7 +293,9 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, |
mojom::ExtendableMessageEventPtr event, |
const mojom::ServiceWorkerEventDispatcher:: |
DispatchExtendableMessageEventCallback& callback); |
- void OnInstallEventStub(int request_id); |
+ void OnInstallEventStub( |
+ const mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback& |
+ callback); |
void OnFetchEventStub(int thread_id, |
int fetch_event_id, |
const ServiceWorkerFetchRequest& request, |
@@ -351,9 +355,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, |
std::map<int /* thread_id */, int /* embedded_worker_id */> |
thread_id_embedded_worker_id_map_; |
- // Updated each time MessageToWorker message is received. |
- int current_embedded_worker_id_; |
- |
std::vector<Event> events_; |
base::WeakPtrFactory<EmbeddedWorkerTestHelper> weak_factory_; |