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

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

Issue 252633003: Introduce worker_devtools_agent_route_id for EmbeddedWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests failure Created 6 years, 7 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "content/browser/service_worker/embedded_worker_instance.h" 8 #include "content/browser/service_worker/embedded_worker_instance.h"
9 #include "content/browser/service_worker/embedded_worker_registry.h" 9 #include "content/browser/service_worker/embedded_worker_registry.h"
10 #include "content/browser/service_worker/service_worker_context_core.h" 10 #include "content/browser/service_worker/service_worker_context_core.h"
11 #include "content/common/service_worker/embedded_worker_messages.h" 11 #include "content/common/service_worker/embedded_worker_messages.h"
12 #include "content/common/service_worker/service_worker_messages.h" 12 #include "content/common/service_worker/service_worker_messages.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper( 17 EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(
18 ServiceWorkerContextCore* context, 18 ServiceWorkerContextCore* context,
19 int mock_render_process_id) 19 int mock_render_process_id)
20 : context_(context->AsWeakPtr()), 20 : context_(context->AsWeakPtr()),
21 next_thread_id_(0), 21 next_thread_id_(0),
22 next_routing_id_(new NextRoutingId()),
22 weak_factory_(this) { 23 weak_factory_(this) {
23 registry()->AddChildProcessSender(mock_render_process_id, this); 24 registry()->AddChildProcessSender(mock_render_process_id, this);
25 registry()->AddChildProcessNextRoutingIDCallback(
26 mock_render_process_id,
27 base::Bind(&NextRoutingId::GetNext, next_routing_id_));
24 } 28 }
25 29
26 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() { 30 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
27 } 31 }
28 32
29 void EmbeddedWorkerTestHelper::SimulateAddProcessToWorker( 33 void EmbeddedWorkerTestHelper::SimulateAddProcessToWorker(
30 int embedded_worker_id, 34 int embedded_worker_id,
31 int process_id) { 35 int process_id) {
32 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); 36 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
33 ASSERT_TRUE(worker); 37 ASSERT_TRUE(worker);
34 registry()->AddChildProcessSender(process_id, this); 38 registry()->AddChildProcessSender(process_id, this);
39 registry()->AddChildProcessNextRoutingIDCallback(
40 process_id, base::Bind(&NextRoutingId::GetNext, next_routing_id_));
35 worker->AddProcessReference(process_id); 41 worker->AddProcessReference(process_id);
36 } 42 }
37 43
38 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) { 44 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) {
39 OnMessageReceived(*message); 45 OnMessageReceived(*message);
40 delete message; 46 delete message;
41 return true; 47 return true;
42 } 48 }
43 49
44 bool EmbeddedWorkerTestHelper::OnMessageReceived(const IPC::Message& message) { 50 bool EmbeddedWorkerTestHelper::OnMessageReceived(const IPC::Message& message) {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 void EmbeddedWorkerTestHelper::SimulateSend( 144 void EmbeddedWorkerTestHelper::SimulateSend(
139 IPC::Message* message) { 145 IPC::Message* message) {
140 registry()->OnMessageReceived(*message); 146 registry()->OnMessageReceived(*message);
141 delete message; 147 delete message;
142 } 148 }
143 149
144 void EmbeddedWorkerTestHelper::OnStartWorkerStub( 150 void EmbeddedWorkerTestHelper::OnStartWorkerStub(
145 int embedded_worker_id, 151 int embedded_worker_id,
146 int64 service_worker_version_id, 152 int64 service_worker_version_id,
147 const GURL& scope, 153 const GURL& scope,
148 const GURL& script_url) { 154 const GURL& script_url,
155 int worker_devtools_agent_route_id) {
149 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); 156 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
150 ASSERT_TRUE(worker != NULL); 157 ASSERT_TRUE(worker != NULL);
151 EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status()); 158 EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status());
152 base::MessageLoopProxy::current()->PostTask( 159 base::MessageLoopProxy::current()->PostTask(
153 FROM_HERE, 160 FROM_HERE,
154 base::Bind(&EmbeddedWorkerTestHelper::OnStartWorker, 161 base::Bind(&EmbeddedWorkerTestHelper::OnStartWorker,
155 weak_factory_.GetWeakPtr(), 162 weak_factory_.GetWeakPtr(),
156 embedded_worker_id, 163 embedded_worker_id,
157 service_worker_version_id, 164 service_worker_version_id,
158 scope, 165 scope,
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 request_id, 224 request_id,
218 request)); 225 request));
219 } 226 }
220 227
221 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() { 228 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
222 DCHECK(context_); 229 DCHECK(context_);
223 return context_->embedded_worker_registry(); 230 return context_->embedded_worker_registry();
224 } 231 }
225 232
226 } // namespace content 233 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698