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

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

Issue 1675613002: service worker: use 200 OK for update requests even in the no update case (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: asan and fix win compile? Created 4 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 <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) { 123 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) {
124 OnMessageReceived(*message); 124 OnMessageReceived(*message);
125 delete message; 125 delete message;
126 return true; 126 return true;
127 } 127 }
128 128
129 bool EmbeddedWorkerTestHelper::OnMessageReceived(const IPC::Message& message) { 129 bool EmbeddedWorkerTestHelper::OnMessageReceived(const IPC::Message& message) {
130 bool handled = true; 130 bool handled = true;
131 IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerTestHelper, message) 131 IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerTestHelper, message)
132 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StartWorker, OnStartWorkerStub) 132 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StartWorker, OnStartWorkerStub)
133 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_ResumeAfterDownload,
134 OnResumeAfterDownloadStub)
133 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorkerStub) 135 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorkerStub)
134 IPC_MESSAGE_HANDLER(EmbeddedWorkerContextMsg_MessageToWorker, 136 IPC_MESSAGE_HANDLER(EmbeddedWorkerContextMsg_MessageToWorker,
135 OnMessageToWorkerStub) 137 OnMessageToWorkerStub)
136 IPC_MESSAGE_UNHANDLED(handled = false) 138 IPC_MESSAGE_UNHANDLED(handled = false)
137 IPC_END_MESSAGE_MAP() 139 IPC_END_MESSAGE_MAP()
138 140
139 // IPC::TestSink only records messages that are not handled by filters, 141 // IPC::TestSink only records messages that are not handled by filters,
140 // so we just forward all messages to the separate sink. 142 // so we just forward all messages to the separate sink.
141 sink_.OnMessageReceived(message); 143 sink_.OnMessageReceived(message);
142 144
143 return handled; 145 return handled;
144 } 146 }
145 147
146 ServiceWorkerContextCore* EmbeddedWorkerTestHelper::context() { 148 ServiceWorkerContextCore* EmbeddedWorkerTestHelper::context() {
147 return wrapper_->context(); 149 return wrapper_->context();
148 } 150 }
149 151
150 void EmbeddedWorkerTestHelper::ShutdownContext() { 152 void EmbeddedWorkerTestHelper::ShutdownContext() {
151 wrapper_->Shutdown(); 153 wrapper_->Shutdown();
152 wrapper_ = NULL; 154 wrapper_ = NULL;
153 } 155 }
154 156
155 void EmbeddedWorkerTestHelper::OnStartWorker(int embedded_worker_id, 157 void EmbeddedWorkerTestHelper::OnStartWorker(int embedded_worker_id,
156 int64_t service_worker_version_id, 158 int64_t service_worker_version_id,
157 const GURL& scope, 159 const GURL& scope,
158 const GURL& script_url) { 160 const GURL& script_url,
161 bool pause_after_download) {
159 embedded_worker_id_service_worker_version_id_map_[embedded_worker_id] = 162 embedded_worker_id_service_worker_version_id_map_[embedded_worker_id] =
160 service_worker_version_id; 163 service_worker_version_id;
161 SimulateWorkerReadyForInspection(embedded_worker_id); 164 SimulateWorkerReadyForInspection(embedded_worker_id);
162 SimulateWorkerScriptCached(embedded_worker_id); 165 SimulateWorkerScriptCached(embedded_worker_id);
163 SimulateWorkerScriptLoaded(embedded_worker_id); 166 SimulateWorkerScriptLoaded(embedded_worker_id);
167 if (!pause_after_download)
168 OnResumeAfterDownload(embedded_worker_id);
169 }
170
171 void EmbeddedWorkerTestHelper::OnResumeAfterDownload(int embedded_worker_id) {
164 SimulateWorkerThreadStarted(GetNextThreadId(), embedded_worker_id); 172 SimulateWorkerThreadStarted(GetNextThreadId(), embedded_worker_id);
165 SimulateWorkerScriptEvaluated(embedded_worker_id, true /* success */); 173 SimulateWorkerScriptEvaluated(embedded_worker_id, true /* success */);
166 SimulateWorkerStarted(embedded_worker_id); 174 SimulateWorkerStarted(embedded_worker_id);
167 } 175 }
168 176
169 void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) { 177 void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) {
170 // By default just notify the sender that the worker is stopped. 178 // By default just notify the sender that the worker is stopped.
171 SimulateWorkerStopped(embedded_worker_id); 179 SimulateWorkerStopped(embedded_worker_id);
172 } 180 }
173 181
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 const EmbeddedWorkerMsg_StartWorker_Params& params) { 314 const EmbeddedWorkerMsg_StartWorker_Params& params) {
307 EmbeddedWorkerInstance* worker = 315 EmbeddedWorkerInstance* worker =
308 registry()->GetWorker(params.embedded_worker_id); 316 registry()->GetWorker(params.embedded_worker_id);
309 ASSERT_TRUE(worker != NULL); 317 ASSERT_TRUE(worker != NULL);
310 EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status()); 318 EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status());
311 base::ThreadTaskRunnerHandle::Get()->PostTask( 319 base::ThreadTaskRunnerHandle::Get()->PostTask(
312 FROM_HERE, 320 FROM_HERE,
313 base::Bind(&EmbeddedWorkerTestHelper::OnStartWorker, 321 base::Bind(&EmbeddedWorkerTestHelper::OnStartWorker,
314 weak_factory_.GetWeakPtr(), params.embedded_worker_id, 322 weak_factory_.GetWeakPtr(), params.embedded_worker_id,
315 params.service_worker_version_id, params.scope, 323 params.service_worker_version_id, params.scope,
316 params.script_url)); 324 params.script_url, params.pause_after_download));
325 }
326
327 void EmbeddedWorkerTestHelper::OnResumeAfterDownloadStub(
328 int embedded_worker_id) {
329 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
330 ASSERT_TRUE(worker);
331 base::ThreadTaskRunnerHandle::Get()->PostTask(
332 FROM_HERE, base::Bind(&EmbeddedWorkerTestHelper::OnResumeAfterDownload,
333 weak_factory_.GetWeakPtr(), embedded_worker_id));
317 } 334 }
318 335
319 void EmbeddedWorkerTestHelper::OnStopWorkerStub(int embedded_worker_id) { 336 void EmbeddedWorkerTestHelper::OnStopWorkerStub(int embedded_worker_id) {
320 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id); 337 EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
321 ASSERT_TRUE(worker != NULL); 338 ASSERT_TRUE(worker != NULL);
322 base::ThreadTaskRunnerHandle::Get()->PostTask( 339 base::ThreadTaskRunnerHandle::Get()->PostTask(
323 FROM_HERE, 340 FROM_HERE,
324 base::Bind(&EmbeddedWorkerTestHelper::OnStopWorker, 341 base::Bind(&EmbeddedWorkerTestHelper::OnStopWorker,
325 weak_factory_.GetWeakPtr(), 342 weak_factory_.GetWeakPtr(),
326 embedded_worker_id)); 343 embedded_worker_id));
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 417
401 MessagePortMessageFilter* 418 MessagePortMessageFilter*
402 EmbeddedWorkerTestHelper::NewMessagePortMessageFilter() { 419 EmbeddedWorkerTestHelper::NewMessagePortMessageFilter() {
403 scoped_refptr<MessagePortMessageFilter> filter( 420 scoped_refptr<MessagePortMessageFilter> filter(
404 new MockMessagePortMessageFilter); 421 new MockMessagePortMessageFilter);
405 message_port_message_filters_.push_back(filter); 422 message_port_message_filters_.push_back(filter);
406 return filter.get(); 423 return filter.get();
407 } 424 }
408 425
409 } // namespace content 426 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698