Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore

content/browser/service_worker/link_header_support_unittest.cc

Index: content/browser/service_worker/link_header_support_unittest.cc
diff --git a/content/browser/service_worker/link_header_support_unittest.cc b/content/browser/service_worker/link_header_support_unittest.cc
index ba66b30d0f34a6176ea9e0f5e6883965cfb2597b..9d65dec74559cbcda724cd28a823e978012cfd51 100644
--- a/content/browser/service_worker/link_header_support_unittest.cc
+++ b/content/browser/service_worker/link_header_support_unittest.cc
@@ -67,12 +67,10 @@ class LinkHeaderServiceWorkerTest : public ::testing::Test {
     helper_.reset(new EmbeddedWorkerTestHelper(base::FilePath()));
 
     // An empty host.
-    std::unique_ptr<ServiceWorkerProviderHost> host(
-        new ServiceWorkerProviderHost(
-            render_process_id(), MSG_ROUTING_NONE, kMockProviderId,
-            SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-            ServiceWorkerProviderHost::FrameSecurityLevel::UNINITIALIZED,
-            context()->AsWeakPtr(), nullptr));
+    std::unique_ptr<ServiceWorkerProviderHost> host =
+        ServiceWorkerProviderHost::CreateForTesting(
+            render_process_id(), kMockProviderId,
+            SERVICE_WORKER_PROVIDER_FOR_WINDOW, context()->AsWeakPtr());
     provider_host_ = host->AsWeakPtr();
     context()->AddProviderHost(std::move(host));
   }
@@ -87,12 +85,10 @@ class LinkHeaderServiceWorkerTest : public ::testing::Test {
   int render_process_id() const { return helper_->mock_render_process_id(); }
 
   void CreateServiceWorkerProviderHost() {
-    std::unique_ptr<ServiceWorkerProviderHost> host(
-        new ServiceWorkerProviderHost(
-            render_process_id(), MSG_ROUTING_NONE, kMockProviderId,
-            SERVICE_WORKER_PROVIDER_FOR_CONTROLLER,
-            ServiceWorkerProviderHost::FrameSecurityLevel::UNINITIALIZED,
-            context()->AsWeakPtr(), nullptr));
+    std::unique_ptr<ServiceWorkerProviderHost> host =
+        ServiceWorkerProviderHost::CreateForTesting(
+            render_process_id(), kMockProviderId,
+            SERVICE_WORKER_PROVIDER_FOR_CONTROLLER, context()->AsWeakPtr());
     provider_host_ = host->AsWeakPtr();
     context()->RemoveProviderHost(host->process_id(), host->provider_id());
     context()->AddProviderHost(std::move(host));
@@ -371,12 +367,10 @@ TEST_F(LinkHeaderServiceWorkerTest,
        InstallServiceWorker_FromWorkerWithControllees) {
   CreateServiceWorkerProviderHost();
 
-  std::unique_ptr<ServiceWorkerProviderHost> controllee(
-      new ServiceWorkerProviderHost(
-          render_process_id(), MSG_ROUTING_NONE, kMockProviderId,
-          SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-          ServiceWorkerProviderHost::FrameSecurityLevel::UNINITIALIZED,
-          context()->AsWeakPtr(), nullptr));
+  std::unique_ptr<ServiceWorkerProviderHost> controllee =
+      ServiceWorkerProviderHost::CreateForTesting(
+          render_process_id(), kMockProviderId,
+          SERVICE_WORKER_PROVIDER_FOR_WINDOW, context()->AsWeakPtr());
   provider_host()->running_hosted_version()->AddControllee(controllee.get());
 
   ProcessLinkHeaderForRequest(