ServiceWorker: keep dispatcher hosts for unittests in the test helper

content/browser/service_worker/embedded_worker_test_helper.cc

 // Copyright 2014 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/embedded_worker_test_helper.h"
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 288 matching lines @@
           base::ThreadTaskRunnerHandle::Get()));
   wrapper_->InitInternal(user_data_directory, std::move(database_task_manager),
                          base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr);
   wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id());
   wrapper_->process_manager()->SetNewProcessIdForTest(new_render_process_id());
 
   scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host(
       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(
       mojom::EmbeddedWorkerInstanceClient::Name_,
       base::Bind(&MockEmbeddedWorkerInstanceClient::Bind, AsWeakPtr()));
   new_render_process_host_->OverrideBinderForTesting(
       mojom::EmbeddedWorkerInstanceClient::Name_,
       base::Bind(&MockEmbeddedWorkerInstanceClient::Bind, AsWeakPtr()));
 }
 
 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
   if (wrapper_.get())
     wrapper_->Shutdown();
 }
 
 void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern(const GURL& pattern,
                                                            int process_id) {
   if (!context()->GetDispatcherHost(process_id)) {
     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,
                                                             process_id);
 }
 
 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) {
   OnMessageReceived(*message);
   delete message;
   return true;
@@ skipping 12 matching lines @@
   sink_.OnMessageReceived(message);
 
   return handled;
 }
 
 void EmbeddedWorkerTestHelper::RegisterMockInstanceClient(
     std::unique_ptr<MockEmbeddedWorkerInstanceClient> client) {
   mock_instance_clients_.push_back(std::move(client));
 }
 
+void EmbeddedWorkerTestHelper::RegisterDispatcherHost(
+    int process_id,
+    scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host) {
+  dispatcher_hosts_[process_id] = std::move(dispatcher_host);
+}
+
 ServiceWorkerContextCore* EmbeddedWorkerTestHelper::context() {
   return wrapper_->context();
 }
 
 void EmbeddedWorkerTestHelper::ShutdownContext() {
   wrapper_->Shutdown();
   wrapper_ = NULL;
 }
 
 // static
@@ skipping 418 matching lines @@
                  base::Passed(&event_data), base::Passed(&response_callback),
                  base::Passed(&callback)));
 }
 
 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
   DCHECK(context());
   return context()->embedded_worker_registry();
 }
 
 }  // namespace content