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

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

Issue 188283003: Add ServiceWorkerVersion::status() (which is to be persisted unlike running status) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "content/browser/service_worker/embedded_worker_instance.h" 9 #include "content/browser/service_worker/embedded_worker_instance.h"
10 #include "content/browser/service_worker/embedded_worker_registry.h" 10 #include "content/browser/service_worker/embedded_worker_registry.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 void SetUpRegistrationOnIOThread(const std::string& worker_url) { 235 void SetUpRegistrationOnIOThread(const std::string& worker_url) {
236 const int64 version_id = 1L; 236 const int64 version_id = 1L;
237 registration_ = new ServiceWorkerRegistration( 237 registration_ = new ServiceWorkerRegistration(
238 embedded_test_server()->GetURL("/*"), 238 embedded_test_server()->GetURL("/*"),
239 embedded_test_server()->GetURL(worker_url), 239 embedded_test_server()->GetURL(worker_url),
240 next_registration_id_++); 240 next_registration_id_++);
241 version_ = new ServiceWorkerVersion( 241 version_ = new ServiceWorkerVersion(
242 registration_, 242 registration_,
243 wrapper()->context()->embedded_worker_registry(), 243 wrapper()->context()->embedded_worker_registry(),
244 version_id); 244 version_id,
245 ServiceWorkerVersion::NEW);
245 AssociateRendererProcessToWorker(version_->embedded_worker()); 246 AssociateRendererProcessToWorker(version_->embedded_worker());
246 } 247 }
247 248
248 void StartOnIOThread(const base::Closure& done, 249 void StartOnIOThread(const base::Closure& done,
249 ServiceWorkerStatusCode* result) { 250 ServiceWorkerStatusCode* result) {
250 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); 251 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
251 version_->StartWorker(CreateReceiver(BrowserThread::UI, done, result)); 252 version_->StartWorker(CreateReceiver(BrowserThread::UI, done, result));
252 } 253 }
253 254
254 void InstallOnIOThread(const base::Closure& done, 255 void InstallOnIOThread(const base::Closure& done,
255 ServiceWorkerStatusCode* result) { 256 ServiceWorkerStatusCode* result) {
256 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); 257 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
257 version_->DispatchInstallEvent( 258 version_->DispatchInstallEvent(
258 -1, CreateReceiver(BrowserThread::UI, done, result)); 259 -1, CreateReceiver(BrowserThread::UI, done, result));
259 } 260 }
260 261
261 void FetchOnIOThread(const base::Closure& done, 262 void FetchOnIOThread(const base::Closure& done,
262 ServiceWorkerStatusCode* result, 263 ServiceWorkerStatusCode* result,
263 ServiceWorkerFetchResponse* message) { 264 ServiceWorkerFetchResponse* message) {
264 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); 265 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
265 ServiceWorkerFetchRequest request( 266 ServiceWorkerFetchRequest request(
266 embedded_test_server()->GetURL("/service_worker/empty.html"), 267 embedded_test_server()->GetURL("/service_worker/empty.html"),
267 "GET", 268 "GET",
268 std::map<std::string, std::string>()); 269 std::map<std::string, std::string>());
270 version_->set_status(ServiceWorkerVersion::ACTIVE);
269 version_->DispatchFetchEvent( 271 version_->DispatchFetchEvent(
270 request, 272 request,
271 CreateFetchResponseReceiver(BrowserThread::UI, done, result, message)); 273 CreateFetchResponseReceiver(BrowserThread::UI, done, result, message));
272 } 274 }
273 275
274 276
275 void StopOnIOThread(const base::Closure& done, 277 void StopOnIOThread(const base::Closure& done,
276 ServiceWorkerStatusCode* result) { 278 ServiceWorkerStatusCode* result) {
277 ASSERT_TRUE(version_); 279 ASSERT_TRUE(version_);
278 version_->StopWorker(CreateReceiver(BrowserThread::UI, done, result)); 280 version_->StopWorker(CreateReceiver(BrowserThread::UI, done, result));
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 fetch_run_loop.Run(); 376 fetch_run_loop.Run();
375 ASSERT_EQ(SERVICE_WORKER_OK, status); 377 ASSERT_EQ(SERVICE_WORKER_OK, status);
376 ASSERT_EQ(200, response.status_code); 378 ASSERT_EQ(200, response.status_code);
377 ASSERT_EQ("OK", response.status_text); 379 ASSERT_EQ("OK", response.status_text);
378 ASSERT_EQ("GET", response.method); 380 ASSERT_EQ("GET", response.method);
379 std::map<std::string, std::string> expected_headers; 381 std::map<std::string, std::string> expected_headers;
380 ASSERT_EQ(expected_headers, response.headers); 382 ASSERT_EQ(expected_headers, response.headers);
381 } 383 }
382 384
383 } // namespace content 385 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698