Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore

content/browser/service_worker/service_worker_storage_unittest.cc

Index: content/browser/service_worker/service_worker_storage_unittest.cc
diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc
index 9598586c9d45b0b5ca2f51dd3ee6956dfcba0b3a..28ec71f2ae907b7cd14f7c11f25c9838226dac0d 100644
--- a/content/browser/service_worker/service_worker_storage_unittest.cc
+++ b/content/browser/service_worker/service_worker_storage_unittest.cc
@@ -1342,11 +1342,11 @@ TEST_F(ServiceWorkerResourceStorageTest, DeleteRegistration_ActiveVersion) {
   registration_->SetActiveVersion(registration_->waiting_version());
   storage()->UpdateToActiveState(
       registration_.get(), base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
-  std::unique_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(
-      33 /* dummy render process id */, MSG_ROUTING_NONE,
-      1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-      ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,
-      context()->AsWeakPtr(), NULL));
+  std::unique_ptr<ServiceWorkerProviderHost> host =
+      ServiceWorkerProviderHost::CreateForTesting(
+          33 /* dummy render process id */, 1 /* dummy provider_id */,
+          SERVICE_WORKER_PROVIDER_FOR_WINDOW, context()->AsWeakPtr());
+  host->set_parent_frame_secure(true);
   registration_->active_version()->AddControllee(host.get());
 
   bool was_called = false;
@@ -1394,11 +1394,11 @@ TEST_F(ServiceWorkerResourceStorageDiskTest, CleanupOnRestart) {
   registration_->SetWaitingVersion(NULL);
   storage()->UpdateToActiveState(
       registration_.get(), base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
-  std::unique_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(
-      33 /* dummy render process id */, MSG_ROUTING_NONE,
-      1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-      ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,
-      context()->AsWeakPtr(), NULL));
+  std::unique_ptr<ServiceWorkerProviderHost> host =
+      ServiceWorkerProviderHost::CreateForTesting(
+          33 /* dummy render process id */, 1 /* dummy provider_id */,
+          SERVICE_WORKER_PROVIDER_FOR_WINDOW, context()->AsWeakPtr());
+  host->set_parent_frame_secure(true);
   registration_->active_version()->AddControllee(host.get());
 
   bool was_called = false;
@@ -1554,11 +1554,11 @@ TEST_F(ServiceWorkerResourceStorageTest, UpdateRegistration) {
   registration_->SetActiveVersion(registration_->waiting_version());
   storage()->UpdateToActiveState(
       registration_.get(), base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
-  std::unique_ptr<ServiceWorkerProviderHost> host(new ServiceWorkerProviderHost(
-      33 /* dummy render process id */, MSG_ROUTING_NONE,
-      1 /* dummy provider_id */, SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-      ServiceWorkerProviderHost::FrameSecurityLevel::SECURE,
-      context()->AsWeakPtr(), NULL));
+  std::unique_ptr<ServiceWorkerProviderHost> host =
+      ServiceWorkerProviderHost::CreateForTesting(
+          33 /* dummy render process id */, 1 /* dummy provider_id */,
+          SERVICE_WORKER_PROVIDER_FOR_WINDOW, helper_->context()->AsWeakPtr());
+  host->set_parent_frame_secure(true);
   registration_->active_version()->AddControllee(host.get());
 
   bool was_called = false;