OLD | NEW |
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" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 } | 72 } |
73 | 73 |
74 void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) { | 74 void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) { |
75 // By default just notify the sender that the worker is stopped. | 75 // By default just notify the sender that the worker is stopped. |
76 SimulateWorkerStopped(embedded_worker_id); | 76 SimulateWorkerStopped(embedded_worker_id); |
77 } | 77 } |
78 | 78 |
79 void EmbeddedWorkerTestHelper::OnSendMessageToWorker( | 79 void EmbeddedWorkerTestHelper::OnSendMessageToWorker( |
80 int thread_id, | 80 int thread_id, |
81 int embedded_worker_id, | 81 int embedded_worker_id, |
| 82 int request_id, |
82 const IPC::Message& message) { | 83 const IPC::Message& message) { |
83 // Do nothing on the message by default. | 84 // Do nothing on the message by default. |
84 } | 85 } |
85 | 86 |
86 void EmbeddedWorkerTestHelper::SimulateWorkerStarted( | 87 void EmbeddedWorkerTestHelper::SimulateWorkerStarted( |
87 int thread_id, int embedded_worker_id) { | 88 int thread_id, int embedded_worker_id) { |
88 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 89 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
89 ASSERT_TRUE(worker != NULL); | 90 ASSERT_TRUE(worker != NULL); |
90 registry()->OnWorkerStarted( | 91 registry()->OnWorkerStarted( |
91 worker->process_id(), | 92 worker->process_id(), |
92 thread_id, | 93 thread_id, |
93 embedded_worker_id); | 94 embedded_worker_id); |
94 } | 95 } |
95 | 96 |
96 void EmbeddedWorkerTestHelper::SimulateWorkerStopped( | 97 void EmbeddedWorkerTestHelper::SimulateWorkerStopped( |
97 int embedded_worker_id) { | 98 int embedded_worker_id) { |
98 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 99 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
99 ASSERT_TRUE(worker != NULL); | 100 ASSERT_TRUE(worker != NULL); |
100 registry()->OnWorkerStopped(worker->process_id(), embedded_worker_id); | 101 registry()->OnWorkerStopped(worker->process_id(), embedded_worker_id); |
101 } | 102 } |
102 | 103 |
103 void EmbeddedWorkerTestHelper::SimulateSendMessageToBrowser( | 104 void EmbeddedWorkerTestHelper::SimulateSendMessageToBrowser( |
104 int embedded_worker_id, const IPC::Message& message) { | 105 int embedded_worker_id, int request_id, const IPC::Message& message) { |
105 registry()->OnSendMessageToBrowser(embedded_worker_id, message); | 106 registry()->OnSendMessageToBrowser(embedded_worker_id, request_id, message); |
106 } | 107 } |
107 | 108 |
108 void EmbeddedWorkerTestHelper::OnStartWorkerStub( | 109 void EmbeddedWorkerTestHelper::OnStartWorkerStub( |
109 int embedded_worker_id, | 110 int embedded_worker_id, |
110 int64 service_worker_version_id, | 111 int64 service_worker_version_id, |
111 const GURL& script_url) { | 112 const GURL& script_url) { |
112 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 113 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
113 ASSERT_TRUE(worker != NULL); | 114 ASSERT_TRUE(worker != NULL); |
114 EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status()); | 115 EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status()); |
115 base::MessageLoopProxy::current()->PostTask( | 116 base::MessageLoopProxy::current()->PostTask( |
(...skipping 11 matching lines...) Expand all Loading... |
127 base::MessageLoopProxy::current()->PostTask( | 128 base::MessageLoopProxy::current()->PostTask( |
128 FROM_HERE, | 129 FROM_HERE, |
129 base::Bind(&EmbeddedWorkerTestHelper::OnStopWorker, | 130 base::Bind(&EmbeddedWorkerTestHelper::OnStopWorker, |
130 weak_factory_.GetWeakPtr(), | 131 weak_factory_.GetWeakPtr(), |
131 embedded_worker_id)); | 132 embedded_worker_id)); |
132 } | 133 } |
133 | 134 |
134 void EmbeddedWorkerTestHelper::OnSendMessageToWorkerStub( | 135 void EmbeddedWorkerTestHelper::OnSendMessageToWorkerStub( |
135 int thread_id, | 136 int thread_id, |
136 int embedded_worker_id, | 137 int embedded_worker_id, |
| 138 int request_id, |
137 const IPC::Message& message) { | 139 const IPC::Message& message) { |
138 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); | 140 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); |
139 ASSERT_TRUE(worker != NULL); | 141 ASSERT_TRUE(worker != NULL); |
140 EXPECT_EQ(worker->thread_id(), thread_id); | 142 EXPECT_EQ(worker->thread_id(), thread_id); |
141 base::MessageLoopProxy::current()->PostTask( | 143 base::MessageLoopProxy::current()->PostTask( |
142 FROM_HERE, | 144 FROM_HERE, |
143 base::Bind(&EmbeddedWorkerTestHelper::OnSendMessageToWorker, | 145 base::Bind(&EmbeddedWorkerTestHelper::OnSendMessageToWorker, |
144 weak_factory_.GetWeakPtr(), | 146 weak_factory_.GetWeakPtr(), |
145 thread_id, | 147 thread_id, |
146 embedded_worker_id, | 148 embedded_worker_id, |
| 149 request_id, |
147 message)); | 150 message)); |
148 } | 151 } |
149 | 152 |
150 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() { | 153 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() { |
151 DCHECK(context_); | 154 DCHECK(context_); |
152 return context_->embedded_worker_registry(); | 155 return context_->embedded_worker_registry(); |
153 } | 156 } |
154 | 157 |
155 } // namespace content | 158 } // namespace content |
OLD | NEW |