Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore

content/browser/service_worker/link_header_support_unittest.cc

 // Copyright 2016 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 "content/browser/service_worker/link_header_support.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/browser/loader/resource_request_info_impl.h"
@@ skipping 49 matching lines @@
         resource_context_(&request_context_) {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExperimentalWebPlatformFeatures);
   }
   ~LinkHeaderServiceWorkerTest() override {}
 
   void SetUp() override {
     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));
   }
 
   void TearDown() override { helper_.reset(); }
 
   ServiceWorkerContextCore* context() { return helper_->context(); }
   ServiceWorkerContextWrapper* context_wrapper() {
     return helper_->context_wrapper();
   }
   ServiceWorkerProviderHost* provider_host() { return provider_host_.get(); }
   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));
 
     scoped_refptr<ServiceWorkerRegistration> registration =
         new ServiceWorkerRegistration(GURL("https://host/scope"), 1L,
                                       context()->AsWeakPtr());
     scoped_refptr<ServiceWorkerVersion> version = new ServiceWorkerVersion(
         registration.get(), GURL("https://host/script.js"), 1L,
         context()->AsWeakPtr());
@@ skipping 258 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(0u, registrations.size());
 }
 
 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(
       CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
       "<../foo.js>; rel=serviceworker", context_wrapper());
   base::RunLoop().RunUntilIdle();
 
   std::vector<ServiceWorkerRegistrationInfo> registrations = GetRegistrations();
   ASSERT_EQ(1u, registrations.size());
 }
 
 }  // namespace content