Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: content/browser/service_worker/embedded_worker_test_helper.cc

Issue 2638313002: Manage ServiceWorkerDispatcherHost in ServiceWorkerContextCore (Closed)
Patch Set: Fix an include guard Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/embedded_worker_test_helper.h" 5 #include "content/browser/service_worker/embedded_worker_test_helper.h"
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/atomic_sequence_num.h" 13 #include "base/atomic_sequence_num.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "content/browser/message_port_message_filter.h" 18 #include "content/browser/message_port_message_filter.h"
19 #include "content/browser/service_worker/embedded_worker_instance.h" 19 #include "content/browser/service_worker/embedded_worker_instance.h"
20 #include "content/browser/service_worker/embedded_worker_registry.h" 20 #include "content/browser/service_worker/embedded_worker_registry.h"
21 #include "content/browser/service_worker/embedded_worker_status.h" 21 #include "content/browser/service_worker/embedded_worker_status.h"
22 #include "content/browser/service_worker/service_worker_context_core.h" 22 #include "content/browser/service_worker/service_worker_context_core.h"
23 #include "content/browser/service_worker/service_worker_context_wrapper.h" 23 #include "content/browser/service_worker/service_worker_context_wrapper.h"
24 #include "content/browser/service_worker/service_worker_dispatcher_host.h"
24 #include "content/common/service_worker/embedded_worker_messages.h" 25 #include "content/common/service_worker/embedded_worker_messages.h"
25 #include "content/common/service_worker/embedded_worker_start_params.h" 26 #include "content/common/service_worker/embedded_worker_start_params.h"
26 #include "content/common/service_worker/service_worker_messages.h" 27 #include "content/common/service_worker/service_worker_messages.h"
27 #include "content/common/service_worker/service_worker_utils.h" 28 #include "content/common/service_worker/service_worker_utils.h"
28 #include "content/public/common/push_event_payload.h" 29 #include "content/public/common/push_event_payload.h"
29 #include "content/public/test/mock_render_process_host.h" 30 #include "content/public/test/mock_render_process_host.h"
30 #include "content/public/test/test_browser_context.h" 31 #include "content/public/test/test_browser_context.h"
31 #include "mojo/public/cpp/bindings/interface_request.h" 32 #include "mojo/public/cpp/bindings/interface_request.h"
32 #include "mojo/public/cpp/bindings/strong_binding.h" 33 #include "mojo/public/cpp/bindings/strong_binding.h"
33 #include "services/service_manager/public/cpp/interface_provider.h" 34 #include "services/service_manager/public/cpp/interface_provider.h"
(...skipping 16 matching lines...) Expand all
50 message_queue_.push_back(base::WrapUnique(message)); 51 message_queue_.push_back(base::WrapUnique(message));
51 return true; 52 return true;
52 } 53 }
53 54
54 private: 55 private:
55 ~MockMessagePortMessageFilter() override {} 56 ~MockMessagePortMessageFilter() override {}
56 base::AtomicSequenceNumber next_routing_id_; 57 base::AtomicSequenceNumber next_routing_id_;
57 std::vector<std::unique_ptr<IPC::Message>> message_queue_; 58 std::vector<std::unique_ptr<IPC::Message>> message_queue_;
58 }; 59 };
59 60
61 class MockServiceWorkerDispatcherHost : public ServiceWorkerDispatcherHost {
62 public:
63 MockServiceWorkerDispatcherHost(
64 int process_id,
65 MessagePortMessageFilter* message_port_message_filter,
66 ResourceContext* resource_context,
67 IPC::Sender* sender)
68 : ServiceWorkerDispatcherHost(process_id,
69 message_port_message_filter,
70 resource_context),
71 sender_(sender) {}
72
73 bool Send(IPC::Message* message) override { return sender_->Send(message); }
74
75 protected:
76 ~MockServiceWorkerDispatcherHost() override {}
77
78 private:
79 IPC::Sender* sender_;
80
81 DISALLOW_COPY_AND_ASSIGN(MockServiceWorkerDispatcherHost);
82 };
83
60 } // namespace 84 } // namespace
61 85
62 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient:: 86 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::
63 MockEmbeddedWorkerInstanceClient( 87 MockEmbeddedWorkerInstanceClient(
64 base::WeakPtr<EmbeddedWorkerTestHelper> helper) 88 base::WeakPtr<EmbeddedWorkerTestHelper> helper)
65 : helper_(helper), binding_(this) {} 89 : helper_(helper), binding_(this) {}
66 90
67 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient:: 91 EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient::
68 ~MockEmbeddedWorkerInstanceClient() {} 92 ~MockEmbeddedWorkerInstanceClient() {}
69 93
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 mock_render_process_id_(render_process_host_->GetID()), 230 mock_render_process_id_(render_process_host_->GetID()),
207 new_mock_render_process_id_(new_render_process_host_->GetID()), 231 new_mock_render_process_id_(new_render_process_host_->GetID()),
208 weak_factory_(this) { 232 weak_factory_(this) {
209 std::unique_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager( 233 std::unique_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager(
210 new MockServiceWorkerDatabaseTaskManager( 234 new MockServiceWorkerDatabaseTaskManager(
211 base::ThreadTaskRunnerHandle::Get())); 235 base::ThreadTaskRunnerHandle::Get()));
212 wrapper_->InitInternal(user_data_directory, std::move(database_task_manager), 236 wrapper_->InitInternal(user_data_directory, std::move(database_task_manager),
213 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr); 237 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr);
214 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id()); 238 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id());
215 wrapper_->process_manager()->SetNewProcessIdForTest(new_render_process_id()); 239 wrapper_->process_manager()->SetNewProcessIdForTest(new_render_process_id());
216 registry()->AddChildProcessSender(mock_render_process_id_, this, 240
217 NewMessagePortMessageFilter()); 241 scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host(
242 new MockServiceWorkerDispatcherHost(
243 mock_render_process_id_, NewMessagePortMessageFilter(),
244 browser_context_->GetResourceContext(), this));
245 wrapper_->context()->AddDispatcherHost(mock_render_process_id_,
246 dispatcher_host.get());
247 dispatcher_hosts_[mock_render_process_id_] = std::move(dispatcher_host);
218 248
219 // Setup process level interface registry. 249 // Setup process level interface registry.
220 render_process_interface_registry_ = 250 render_process_interface_registry_ =
221 CreateInterfaceRegistry(render_process_host_.get()); 251 CreateInterfaceRegistry(render_process_host_.get());
222 new_render_process_interface_registry_ = 252 new_render_process_interface_registry_ =
223 CreateInterfaceRegistry(new_render_process_host_.get()); 253 CreateInterfaceRegistry(new_render_process_host_.get());
224 } 254 }
225 255
226 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() { 256 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
227 if (wrapper_.get()) 257 if (wrapper_.get())
228 wrapper_->Shutdown(); 258 wrapper_->Shutdown();
229 } 259 }
230 260
231 void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern(const GURL& pattern, 261 void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern(const GURL& pattern,
232 int process_id) { 262 int process_id) {
233 registry()->AddChildProcessSender(process_id, this, 263 if (!context()->GetDispatcherHost(process_id)) {
234 NewMessagePortMessageFilter()); 264 scoped_refptr<ServiceWorkerDispatcherHost> dispatcher_host(
265 new MockServiceWorkerDispatcherHost(
266 process_id, NewMessagePortMessageFilter(),
267 browser_context_->GetResourceContext(), this));
268 wrapper_->context()->AddDispatcherHost(process_id, dispatcher_host.get());
269 dispatcher_hosts_[process_id] = std::move(dispatcher_host);
270 }
235 wrapper_->process_manager()->AddProcessReferenceToPattern(pattern, 271 wrapper_->process_manager()->AddProcessReferenceToPattern(pattern,
236 process_id); 272 process_id);
237 } 273 }
238 274
239 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) { 275 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) {
240 OnMessageReceived(*message); 276 OnMessageReceived(*message);
241 delete message; 277 delete message;
242 return true; 278 return true;
243 } 279 }
244 280
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 service_manager::InterfaceProviderSpec()); 622 service_manager::InterfaceProviderSpec());
587 623
588 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces( 624 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces(
589 new service_manager::InterfaceProvider); 625 new service_manager::InterfaceProvider);
590 remote_interfaces->Bind(std::move(interfaces)); 626 remote_interfaces->Bind(std::move(interfaces));
591 rph->SetRemoteInterfaces(std::move(remote_interfaces)); 627 rph->SetRemoteInterfaces(std::move(remote_interfaces));
592 return registry; 628 return registry;
593 } 629 }
594 630
595 } // namespace content 631 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698