Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore

content/browser/service_worker/service_worker_registration_unittest.cc

Index: content/browser/service_worker/service_worker_registration_unittest.cc
diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc
index 9e87cab6f1325d51b10ad488b8c087a5ad2fb70a..6e1b4442fb11e27c93e2c7c13d359d158c95d60e 100644
--- a/content/browser/service_worker/service_worker_registration_unittest.cc
+++ b/content/browser/service_worker/service_worker_registration_unittest.cc
@@ -256,12 +256,9 @@ class ServiceWorkerActivationTest : public ServiceWorkerRegistrationTest {
     ASSERT_EQ(SERVICE_WORKER_OK, status);
 
     // Give the active version a controllee.
-    host_.reset(new ServiceWorkerProviderHost(
-        33 /* dummy render process id */,
-        MSG_ROUTING_NONE /* render_frame_id */, 1 /* dummy provider_id */,
-        SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-        ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,
-        context()->AsWeakPtr(), nullptr));
+    host_ = CreateProviderHostForWindow(
+        33 /* dummy render process id */, 1 /* dummy provider_id */,
+        true /* is_parent_frame_secure */, context()->AsWeakPtr());
     version_1->AddControllee(host_.get());
 
     // Give the active version an in-flight request.