Create ServiceWorkerProviderHost before starting worker

content/browser/service_worker/service_worker_handle_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <tuple>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
@@ skipping 28 matching lines @@
   ASSERT_TRUE(ServiceWorkerMsg_ServiceWorkerStateChanged::Read(
       message, &param));
   EXPECT_EQ(expected_handle_id, std::get<1>(param));
   EXPECT_EQ(expected_state, std::get<2>(param));
 }
 
 }  // namespace
 
 class TestingServiceWorkerDispatcherHost : public ServiceWorkerDispatcherHost {
  public:
-  TestingServiceWorkerDispatcherHost(
-      int process_id,
-      ServiceWorkerContextWrapper* context_wrapper,
-      ResourceContext* resource_context,
-      EmbeddedWorkerTestHelper* helper)
+  TestingServiceWorkerDispatcherHost(int process_id,
+                                     ResourceContext* resource_context,
+                                     EmbeddedWorkerTestHelper* helper)
       : ServiceWorkerDispatcherHost(process_id, resource_context),
         bad_message_received_count_(0),
-        helper_(helper) {
-    Init(context_wrapper);
-  }
+        helper_(helper) {}
 
   bool Send(IPC::Message* message) override { return helper_->Send(message); }
 
   void ShutdownForBadMessage() override { ++bad_message_received_count_; }
 
   int bad_message_received_count_;
 
  protected:
   EmbeddedWorkerTestHelper* helper_;
   ~TestingServiceWorkerDispatcherHost() override {}
 };
 
 class ServiceWorkerHandleTest : public testing::Test {
  public:
   ServiceWorkerHandleTest()
       : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   void SetUp() override {
     helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));
 
-    helper_->context()->RemoveDispatcherHost(helper_->mock_render_process_id());
     dispatcher_host_ = new TestingServiceWorkerDispatcherHost(
-        helper_->mock_render_process_id(), helper_->context_wrapper(),
-        &resource_context_, helper_.get());
+        helper_->mock_render_process_id(), &resource_context_, helper_.get());
+    helper_->RegisterMockDispatcherHost(helper_->mock_render_process_id(),
+                                        dispatcher_host_);
+    dispatcher_host_->Init(helper_->context_wrapper());
 
     const GURL pattern("http://www.example.com/");
     registration_ = new ServiceWorkerRegistration(
         pattern,
         1L,
         helper_->context()->AsWeakPtr());
     version_ = new ServiceWorkerVersion(
         registration_.get(),
         GURL("http://www.example.com/service_worker.js"),
         1L,
@@ skipping 71 matching lines @@
   // StartWorker shouldn't be recorded here.
   ASSERT_EQ(1UL, ipc_sink()->message_count());
   message = ipc_sink()->GetMessageAt(0);
 
   // StateChanged (state == Installed).
   VerifyStateChangedMessage(handle->handle_id(),
                             blink::kWebServiceWorkerStateInstalled, message);
 }
 
 }  // namespace content