Create ServiceWorkerProviderHost before starting worker

content/browser/service_worker/embedded_worker_test_helper.h

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 c19b07738fd808078b82c12aef647f843581180b..bc148d2a5ba3030696bda36055e169c0405dc39e 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.h
+++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -83,7 +83,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
     void StartWorker(
         const EmbeddedWorkerStartParams& params,
         mojom::ServiceWorkerEventDispatcherRequest dispatcher_request,
-        mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host)
+        mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host,
+        mojom::ServiceWorkerProviderClientInfoPtr provider_client_info)
         override;
     void StopWorker() override;
     void ResumeAfterDownload() override;
@@ -114,11 +115,19 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& msg) override;
 
-  // Register a mojo endpoint object derived from
+  // Registers a mojo endpoint object derived from

[falken, 2017/06/06 14:06:33]

while you're here: Mojo.

[shimazu, 2017/06/12 06:08:12]

Done.

   // MockEmbeddedWorkerInstanceClient.
   void RegisterMockInstanceClient(
       std::unique_ptr<MockEmbeddedWorkerInstanceClient> client);
 
+  // Registers the dispatcher host for the process to a map managed by this test
+  // helper. If there is a existing dispatcher host, it'll removed before adding
+  // to the map. This should be called before ServiceWorkerDispatcher::Init

[falken, 2017/06/06 14:06:33]

ServiceWorkerDispatcherHost::Init?

[shimazu, 2017/06/12 06:08:12]

Done.

+  // because it internally calls ServiceWorkerContextCore::AddDispatcherHost.
+  void RegisterMockDispatcherHost(
+      int process_id,
+      scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host);
+
   template <typename MockType, typename... Args>
   MockType* CreateAndRegisterMockInstanceClient(Args&&... args);
 
@@ -137,7 +146,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   void ShutdownContext();
 
   int GetNextThreadId() { return next_thread_id_++; }
-  int GetNextProviderId() { return next_provider_id_++; }
 
   int mock_render_process_id() const { return mock_render_process_id_; }
   MockRenderProcessHost* mock_render_process_host() {
@@ -170,7 +178,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
       const GURL& script_url,
       bool pause_after_download,
       mojom::ServiceWorkerEventDispatcherRequest request,
-      mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host);
+      mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host,
+      mojom::ServiceWorkerProviderClientInfoPtr provider_client_info);
   virtual void OnResumeAfterDownload(int embedded_worker_id);
   // StopWorker IPC handler routed through MockEmbeddedWorkerInstanceClient.
   // This calls SimulateWorkerStopped() by default.
@@ -241,9 +250,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   void SimulateWorkerReadyForInspection(int embedded_worker_id);
   void SimulateWorkerScriptCached(int embedded_worker_id);
   void SimulateWorkerScriptLoaded(int embedded_worker_id);
-  void SimulateWorkerThreadStarted(int thread_id,
-                                   int embedded_worker_id,
-                                   int provider_id);
+  void SimulateWorkerThreadStarted(int thread_id, int embedded_worker_id);
   void SimulateWorkerScriptEvaluated(int embedded_worker_id, bool success);
   void SimulateWorkerStarted(int embedded_worker_id);
   void SimulateWorkerStopped(int embedded_worker_id);
@@ -257,7 +264,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   void OnStartWorkerStub(
       const EmbeddedWorkerStartParams& params,
       mojom::ServiceWorkerEventDispatcherRequest request,
-      mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host);
+      mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host,
+      mojom::ServiceWorkerProviderClientInfoPtr provider_client_info);
   void OnResumeAfterDownloadStub(int embedded_worker_id);
   void OnStopWorkerStub(int embedded_worker_id);
   void OnMessageToWorkerStub(int thread_id,
@@ -334,7 +342,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender,
   size_t mock_instance_clients_next_index_;
 
   int next_thread_id_;
-  int next_provider_id_;
   int mock_render_process_id_;
   int new_mock_render_process_id_;