ServiceWorker: keep dispatcher hosts for unittests in the test helper

content/browser/service_worker/embedded_worker_test_helper.cc

Index: content/browser/service_worker/embedded_worker_test_helper.cc
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc
index 13945c584f19c79d6e29b9c631a9869cb93762d0..d6a40533dea8f78e04256f671cc62bc1b6ccdbb0 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -306,8 +306,7 @@ EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(
       new MockServiceWorkerDispatcherHost(
           mock_render_process_id_, browser_context_->GetResourceContext(),
           this));
-  wrapper_->context()->AddDispatcherHost(mock_render_process_id_,
-                                         dispatcher_host.get());
+  dispatcher_host->Init(wrapper_.get());
   dispatcher_hosts_[mock_render_process_id_] = std::move(dispatcher_host);
 
   render_process_host_->OverrideBinderForTesting(
@@ -329,7 +328,7 @@ void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern(const GURL& pattern,
     scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host(
         new MockServiceWorkerDispatcherHost(
             process_id, browser_context_->GetResourceContext(), this));
-    wrapper_->context()->AddDispatcherHost(process_id, dispatcher_host.get());
+    dispatcher_host->Init(wrapper_.get());
     dispatcher_hosts_[process_id] = std::move(dispatcher_host);
   }
   wrapper_->process_manager()->AddProcessReferenceToPattern(pattern,
@@ -362,6 +361,12 @@ void EmbeddedWorkerTestHelper::RegisterMockInstanceClient(
   mock_instance_clients_.push_back(std::move(client));
 }
 
+void EmbeddedWorkerTestHelper::RegisterMockDispatcherHost(
+    int process_id,
+    scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host) {
+  dispatcher_hosts_[process_id] = std::move(dispatcher_host);
+}
+
 ServiceWorkerContextCore* EmbeddedWorkerTestHelper::context() {
   return wrapper_->context();
 }