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

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

Issue 733703002: Make sure message ports that are transferred to a serviceworker end up in the right process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@service-worker-message-port-transfer
Patch Set: fix test compile Created 6 years, 1 month 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 <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 15 matching lines...) Expand all
26 scoped_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager( 26 scoped_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager(
27 new MockServiceWorkerDatabaseTaskManager( 27 new MockServiceWorkerDatabaseTaskManager(
28 base::MessageLoopProxy::current())); 28 base::MessageLoopProxy::current()));
29 wrapper_->InitInternal(base::FilePath(), 29 wrapper_->InitInternal(base::FilePath(),
30 base::MessageLoopProxy::current(), 30 base::MessageLoopProxy::current(),
31 database_task_manager.Pass(), 31 database_task_manager.Pass(),
32 base::MessageLoopProxy::current(), 32 base::MessageLoopProxy::current(),
33 NULL, 33 NULL,
34 NULL); 34 NULL);
35 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id); 35 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id);
36 registry()->AddChildProcessSender(mock_render_process_id, this); 36 registry()->AddChildProcessSender(mock_render_process_id, this, nullptr);
37 } 37 }
38 38
39 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() { 39 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
40 if (wrapper_.get()) 40 if (wrapper_.get())
41 wrapper_->Shutdown(); 41 wrapper_->Shutdown();
42 } 42 }
43 43
44 void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern( 44 void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern(
45 const GURL& pattern, 45 const GURL& pattern,
46 int process_id) { 46 int process_id) {
47 registry()->AddChildProcessSender(process_id, this); 47 registry()->AddChildProcessSender(process_id, this, nullptr);
48 wrapper_->process_manager()->AddProcessReferenceToPattern( 48 wrapper_->process_manager()->AddProcessReferenceToPattern(
49 pattern, process_id); 49 pattern, process_id);
50 } 50 }
51 51
52 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) { 52 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) {
53 OnMessageReceived(*message); 53 OnMessageReceived(*message);
54 delete message; 54 delete message;
55 return true; 55 return true;
56 } 56 }
57 57
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 request_id, 301 request_id,
302 request)); 302 request));
303 } 303 }
304 304
305 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() { 305 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
306 DCHECK(context()); 306 DCHECK(context());
307 return context()->embedded_worker_registry(); 307 return context()->embedded_worker_registry();
308 } 308 }
309 309
310 } // namespace content 310 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698