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 "base/location.h" | 5 #include "base/location.h" |
6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
8 #include "base/thread_task_runner_handle.h" | 8 #include "base/thread_task_runner_handle.h" |
9 #include "content/browser/fileapi/mock_url_request_delegate.h" | 9 #include "content/browser/fileapi/mock_url_request_delegate.h" |
10 #include "content/browser/service_worker/embedded_worker_test_helper.h" | 10 #include "content/browser/service_worker/embedded_worker_test_helper.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 net::URLRequestJob* CreateNormalURLRequestJob( | 53 net::URLRequestJob* CreateNormalURLRequestJob( |
54 net::URLRequest* request, | 54 net::URLRequest* request, |
55 net::NetworkDelegate* network_delegate) { | 55 net::NetworkDelegate* network_delegate) { |
56 return new net::URLRequestTestJob(request, | 56 return new net::URLRequestTestJob(request, |
57 network_delegate, | 57 network_delegate, |
58 std::string(kHeaders, arraysize(kHeaders)), | 58 std::string(kHeaders, arraysize(kHeaders)), |
59 kScriptCode, | 59 kScriptCode, |
60 true); | 60 true); |
61 } | 61 } |
62 | 62 |
63 net::URLRequestJob* CreateResponseJob(const std::string& response_data, | 63 net::URLRequestJob* CreateCachedResponseJob( |
64 net::URLRequest* request, | 64 const std::string& response_data, |
65 net::NetworkDelegate* network_delegate) { | 65 net::URLRequest* request, |
| 66 net::NetworkDelegate* network_delegate) { |
66 return new net::URLRequestTestJob(request, network_delegate, | 67 return new net::URLRequestTestJob(request, network_delegate, |
67 std::string(kHeaders, arraysize(kHeaders)), | 68 std::string(kHeaders, arraysize(kHeaders)), |
68 response_data, true); | 69 response_data, true); |
69 } | 70 } |
70 | 71 |
| 72 class NetworkResponseJob : public net::URLRequestTestJob { |
| 73 public: |
| 74 NetworkResponseJob(net::URLRequest* request, |
| 75 net::NetworkDelegate* network_delegate, |
| 76 const std::string& response_headers, |
| 77 const std::string& response_data, |
| 78 bool auto_advance) |
| 79 : net::URLRequestTestJob(request, |
| 80 network_delegate, |
| 81 response_headers, |
| 82 response_data, |
| 83 auto_advance) {} |
| 84 void GetResponseInfo(net::HttpResponseInfo* info) override { |
| 85 URLRequestTestJob::GetResponseInfo(info); |
| 86 info->network_accessed = true; |
| 87 } |
| 88 |
| 89 protected: |
| 90 ~NetworkResponseJob() override {} |
| 91 }; |
| 92 |
| 93 net::URLRequestJob* CreateNetworkResponseJob( |
| 94 const std::string& response_data, |
| 95 net::URLRequest* request, |
| 96 net::NetworkDelegate* network_delegate) { |
| 97 return new NetworkResponseJob(request, network_delegate, |
| 98 std::string(kHeaders, arraysize(kHeaders)), |
| 99 response_data, true); |
| 100 } |
| 101 |
71 net::URLRequestJob* CreateInvalidMimeTypeJob( | 102 net::URLRequestJob* CreateInvalidMimeTypeJob( |
72 net::URLRequest* request, | 103 net::URLRequest* request, |
73 net::NetworkDelegate* network_delegate) { | 104 net::NetworkDelegate* network_delegate) { |
74 const char kPlainTextHeaders[] = | 105 const char kPlainTextHeaders[] = |
75 "HTTP/1.1 200 OK\0" | 106 "HTTP/1.1 200 OK\0" |
76 "Content-Type: text/plain\0" | 107 "Content-Type: text/plain\0" |
77 "Expires: Thu, 1 Jan 2100 20:00:00 GMT\0" | 108 "Expires: Thu, 1 Jan 2100 20:00:00 GMT\0" |
78 "\0"; | 109 "\0"; |
79 return new net::URLRequestTestJob( | 110 return new net::URLRequestTestJob( |
80 request, | 111 request, |
81 network_delegate, | 112 network_delegate, |
82 std::string(kPlainTextHeaders, arraysize(kPlainTextHeaders)), | 113 std::string(kPlainTextHeaders, arraysize(kPlainTextHeaders)), |
83 kScriptCode, | 114 kScriptCode, |
84 true); | 115 true); |
85 } | 116 } |
86 | 117 |
| 118 net::URLRequestJob* CreateErrorReponseJob( |
| 119 net::URLRequest* request, |
| 120 net::NetworkDelegate* network_delegate) { |
| 121 const char kErrorHeaders[] = "HTTP/1.1 404 Not Found\0\0"; |
| 122 return new net::URLRequestTestJob( |
| 123 request, network_delegate, |
| 124 std::string(kErrorHeaders, arraysize(kErrorHeaders)), kScriptCode, true); |
| 125 } |
| 126 |
87 class SSLCertificateErrorJob : public net::URLRequestTestJob { | 127 class SSLCertificateErrorJob : public net::URLRequestTestJob { |
88 public: | 128 public: |
89 SSLCertificateErrorJob(net::URLRequest* request, | 129 SSLCertificateErrorJob(net::URLRequest* request, |
90 net::NetworkDelegate* network_delegate, | 130 net::NetworkDelegate* network_delegate, |
91 const std::string& response_headers, | 131 const std::string& response_headers, |
92 const std::string& response_data, | 132 const std::string& response_data, |
93 bool auto_advance) | 133 bool auto_advance) |
94 : net::URLRequestTestJob(request, | 134 : net::URLRequestTestJob(request, |
95 network_delegate, | 135 network_delegate, |
96 response_headers, | 136 response_headers, |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 mock_protocol_handler_ = nullptr; | 366 mock_protocol_handler_ = nullptr; |
327 version_ = nullptr; | 367 version_ = nullptr; |
328 registration_ = nullptr; | 368 registration_ = nullptr; |
329 helper_.reset(); | 369 helper_.reset(); |
330 // URLRequestJobs may post clean-up tasks on destruction. | 370 // URLRequestJobs may post clean-up tasks on destruction. |
331 base::RunLoop().RunUntilIdle(); | 371 base::RunLoop().RunUntilIdle(); |
332 } | 372 } |
333 | 373 |
334 int CreateIncumbent(const std::string& response) { | 374 int CreateIncumbent(const std::string& response) { |
335 mock_protocol_handler_->SetCreateJobCallback( | 375 mock_protocol_handler_->SetCreateJobCallback( |
336 base::Bind(&CreateResponseJob, response)); | 376 base::Bind(&CreateNetworkResponseJob, response)); |
337 request_->Start(); | 377 request_->Start(); |
338 base::RunLoop().RunUntilIdle(); | 378 base::RunLoop().RunUntilIdle(); |
339 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request_->status().status()); | 379 EXPECT_EQ(net::URLRequestStatus::SUCCESS, request_->status().status()); |
340 int incumbent_resource_id = | 380 int incumbent_resource_id = |
341 version_->script_cache_map()->LookupResourceId(script_url_); | 381 version_->script_cache_map()->LookupResourceId(script_url_); |
342 EXPECT_NE(kInvalidServiceWorkerResponseId, incumbent_resource_id); | 382 EXPECT_NE(kInvalidServiceWorkerResponseId, incumbent_resource_id); |
343 | 383 |
344 registration_->SetActiveVersion(version_); | 384 registration_->SetActiveVersion(version_); |
345 | 385 |
346 // Teardown the request. | 386 // Teardown the request. |
347 request_.reset(); | 387 request_.reset(); |
348 url_request_context_.reset(); | 388 url_request_context_.reset(); |
349 url_request_job_factory_.reset(); | 389 url_request_job_factory_.reset(); |
350 mock_protocol_handler_ = nullptr; | 390 mock_protocol_handler_ = nullptr; |
351 base::RunLoop().RunUntilIdle(); | 391 base::RunLoop().RunUntilIdle(); |
352 | 392 |
353 return incumbent_resource_id; | 393 return incumbent_resource_id; |
354 } | 394 } |
355 | 395 |
356 int GetResourceId(ServiceWorkerVersion* version) { | 396 int GetResourceId(ServiceWorkerVersion* version) { |
357 return version->script_cache_map()->LookupResourceId(script_url_); | 397 return version->script_cache_map()->LookupResourceId(script_url_); |
358 } | 398 } |
359 | 399 |
360 // Performs the net request for an update of |registration_|'s incumbent | 400 // Performs the net request for an update of |registration_|'s incumbent to |
361 // to the script |response|. Returns the new version. | 401 // the script |response|. Returns the new version. |
| 402 // The types of the callbacks used for |callback|: |
| 403 // - CreateNetworkResponseJob: Network accessed, 200 OK |
| 404 // - CreateCachedResponseJob: Served from HTTP cache |
| 405 // - CreateErrorReponseJob: Network accessed, Non-2xx |
362 scoped_refptr<ServiceWorkerVersion> UpdateScript( | 406 scoped_refptr<ServiceWorkerVersion> UpdateScript( |
363 const std::string& response) { | 407 const MockHttpProtocolHandler::JobCallback& callback) { |
364 int render_process_id = NextRenderProcessId(); | 408 int render_process_id = NextRenderProcessId(); |
365 int provider_id = NextProviderId(); | 409 int provider_id = NextProviderId(); |
366 scoped_refptr<ServiceWorkerVersion> new_version = | 410 scoped_refptr<ServiceWorkerVersion> new_version = |
367 new ServiceWorkerVersion(registration_.get(), script_url_, | 411 new ServiceWorkerVersion(registration_.get(), script_url_, |
368 NextVersionId(), context()->AsWeakPtr()); | 412 NextVersionId(), context()->AsWeakPtr()); |
369 CreateHostForVersion(render_process_id, provider_id, new_version); | 413 CreateHostForVersion(render_process_id, provider_id, new_version); |
370 | 414 |
371 SetUpScriptRequest(render_process_id, provider_id); | 415 SetUpScriptRequest(render_process_id, provider_id); |
372 mock_protocol_handler_->SetCreateJobCallback( | 416 mock_protocol_handler_->SetCreateJobCallback(callback); |
373 base::Bind(&CreateResponseJob, response)); | |
374 request_->Start(); | 417 request_->Start(); |
375 base::RunLoop().RunUntilIdle(); | 418 base::RunLoop().RunUntilIdle(); |
376 return new_version; | 419 return new_version; |
377 } | 420 } |
378 | 421 |
379 void VerifyResource(int id, const std::string& expected) { | 422 void VerifyResource(int id, const std::string& expected) { |
380 ASSERT_NE(kInvalidServiceWorkerResourceId, id); | 423 ASSERT_NE(kInvalidServiceWorkerResourceId, id); |
381 bool is_equal = false; | 424 bool is_equal = false; |
382 scoped_ptr<ServiceWorkerResponseReader> reader = | 425 scoped_ptr<ServiceWorkerResponseReader> reader = |
383 context()->storage()->CreateResponseReader(id); | 426 context()->storage()->CreateResponseReader(id); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 base::RunLoop().RunUntilIdle(); | 498 base::RunLoop().RunUntilIdle(); |
456 EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status()); | 499 EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status()); |
457 EXPECT_EQ(net::ERR_INSECURE_RESPONSE, request_->status().error()); | 500 EXPECT_EQ(net::ERR_INSECURE_RESPONSE, request_->status().error()); |
458 EXPECT_EQ(kInvalidServiceWorkerResponseId, | 501 EXPECT_EQ(kInvalidServiceWorkerResponseId, |
459 version_->script_cache_map()->LookupResourceId(script_url_)); | 502 version_->script_cache_map()->LookupResourceId(script_url_)); |
460 } | 503 } |
461 | 504 |
462 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_SameScript) { | 505 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_SameScript) { |
463 std::string response = GenerateLongResponse(); | 506 std::string response = GenerateLongResponse(); |
464 CreateIncumbent(response); | 507 CreateIncumbent(response); |
465 scoped_refptr<ServiceWorkerVersion> version = UpdateScript(response); | 508 scoped_refptr<ServiceWorkerVersion> version = |
| 509 UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
466 EXPECT_EQ(kInvalidServiceWorkerResponseId, GetResourceId(version.get())); | 510 EXPECT_EQ(kInvalidServiceWorkerResponseId, GetResourceId(version.get())); |
467 } | 511 } |
468 | 512 |
469 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_SameSizeScript) { | 513 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_SameSizeScript) { |
470 std::string response = GenerateLongResponse(); | 514 std::string response = GenerateLongResponse(); |
471 CreateIncumbent(response); | 515 CreateIncumbent(response); |
472 | 516 |
473 // Change the first byte. | 517 // Change the first byte. |
474 response[0] = 'x'; | 518 response[0] = 'x'; |
475 scoped_refptr<ServiceWorkerVersion> version = UpdateScript(response); | 519 scoped_refptr<ServiceWorkerVersion> version = |
| 520 UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
476 VerifyResource(GetResourceId(version.get()), response); | 521 VerifyResource(GetResourceId(version.get()), response); |
477 registration_->SetWaitingVersion(version); | 522 registration_->SetWaitingVersion(version); |
478 | 523 |
479 // Change something within the first block. | 524 // Change something within the first block. |
480 response[5555] = 'x'; | 525 response[5555] = 'x'; |
481 version = UpdateScript(response); | 526 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
482 VerifyResource(GetResourceId(version.get()), response); | 527 VerifyResource(GetResourceId(version.get()), response); |
483 registration_->SetWaitingVersion(version); | 528 registration_->SetWaitingVersion(version); |
484 | 529 |
485 // Change something in a middle block. | 530 // Change something in a middle block. |
486 response[kMiddleBlock * kBlockSize + 111] = 'x'; | 531 response[kMiddleBlock * kBlockSize + 111] = 'x'; |
487 version = UpdateScript(response); | 532 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
488 VerifyResource(GetResourceId(version.get()), response); | 533 VerifyResource(GetResourceId(version.get()), response); |
489 registration_->SetWaitingVersion(version); | 534 registration_->SetWaitingVersion(version); |
490 | 535 |
491 // Change something within the last block. | 536 // Change something within the last block. |
492 response[(kNumBlocks - 1) * kBlockSize] = 'x'; | 537 response[(kNumBlocks - 1) * kBlockSize] = 'x'; |
493 version = UpdateScript(response); | 538 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
494 VerifyResource(GetResourceId(version.get()), response); | 539 VerifyResource(GetResourceId(version.get()), response); |
495 registration_->SetWaitingVersion(version); | 540 registration_->SetWaitingVersion(version); |
496 | 541 |
497 // Change the last byte. | 542 // Change the last byte. |
498 response[(kNumBlocks * kBlockSize) - 1] = 'x'; | 543 response[(kNumBlocks * kBlockSize) - 1] = 'x'; |
499 version = UpdateScript(response); | 544 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
500 VerifyResource(GetResourceId(version.get()), response); | 545 VerifyResource(GetResourceId(version.get()), response); |
501 registration_->SetWaitingVersion(version); | 546 registration_->SetWaitingVersion(version); |
502 } | 547 } |
503 | 548 |
504 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_TruncatedScript) { | 549 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_TruncatedScript) { |
505 std::string response = GenerateLongResponse(); | 550 std::string response = GenerateLongResponse(); |
506 CreateIncumbent(response); | 551 CreateIncumbent(response); |
507 | 552 |
508 // Truncate a single byte. | 553 // Truncate a single byte. |
509 response.resize(response.size() - 1); | 554 response.resize(response.size() - 1); |
510 scoped_refptr<ServiceWorkerVersion> version = UpdateScript(response); | 555 scoped_refptr<ServiceWorkerVersion> version = |
| 556 UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
511 VerifyResource(GetResourceId(version.get()), response); | 557 VerifyResource(GetResourceId(version.get()), response); |
512 registration_->SetWaitingVersion(version); | 558 registration_->SetWaitingVersion(version); |
513 | 559 |
514 // Truncate to a middle block. | 560 // Truncate to a middle block. |
515 response.resize((kMiddleBlock + 1) * kBlockSize + 111); | 561 response.resize((kMiddleBlock + 1) * kBlockSize + 111); |
516 version = UpdateScript(response); | 562 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
517 VerifyResource(GetResourceId(version.get()), response); | 563 VerifyResource(GetResourceId(version.get()), response); |
518 registration_->SetWaitingVersion(version); | 564 registration_->SetWaitingVersion(version); |
519 | 565 |
520 // Truncate to a block boundary. | 566 // Truncate to a block boundary. |
521 response.resize((kMiddleBlock - 1) * kBlockSize); | 567 response.resize((kMiddleBlock - 1) * kBlockSize); |
522 version = UpdateScript(response); | 568 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
523 VerifyResource(GetResourceId(version.get()), response); | 569 VerifyResource(GetResourceId(version.get()), response); |
524 registration_->SetWaitingVersion(version); | 570 registration_->SetWaitingVersion(version); |
525 | 571 |
526 // Truncate to a single byte. | 572 // Truncate to a single byte. |
527 response.resize(1); | 573 response.resize(1); |
528 version = UpdateScript(response); | 574 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
529 VerifyResource(GetResourceId(version.get()), response); | 575 VerifyResource(GetResourceId(version.get()), response); |
530 registration_->SetWaitingVersion(version); | 576 registration_->SetWaitingVersion(version); |
531 } | 577 } |
532 | 578 |
533 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_ElongatedScript) { | 579 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_ElongatedScript) { |
534 std::string original_response = GenerateLongResponse(); | 580 std::string original_response = GenerateLongResponse(); |
535 CreateIncumbent(original_response); | 581 CreateIncumbent(original_response); |
536 | 582 |
537 // Extend a single byte. | 583 // Extend a single byte. |
538 std::string new_response = original_response + 'a'; | 584 std::string new_response = original_response + 'a'; |
539 scoped_refptr<ServiceWorkerVersion> version = UpdateScript(new_response); | 585 scoped_refptr<ServiceWorkerVersion> version = |
| 586 UpdateScript(base::Bind(&CreateNetworkResponseJob, new_response)); |
540 VerifyResource(GetResourceId(version.get()), new_response); | 587 VerifyResource(GetResourceId(version.get()), new_response); |
541 registration_->SetWaitingVersion(version); | 588 registration_->SetWaitingVersion(version); |
542 | 589 |
543 // Extend multiple blocks. | 590 // Extend multiple blocks. |
544 new_response = original_response + std::string(3 * kBlockSize, 'a'); | 591 new_response = original_response + std::string(3 * kBlockSize, 'a'); |
545 version = UpdateScript(new_response); | 592 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, new_response)); |
546 VerifyResource(GetResourceId(version.get()), new_response); | 593 VerifyResource(GetResourceId(version.get()), new_response); |
547 registration_->SetWaitingVersion(version); | 594 registration_->SetWaitingVersion(version); |
548 | 595 |
549 // Extend multiple blocks and bytes. | 596 // Extend multiple blocks and bytes. |
550 new_response = original_response + std::string(7 * kBlockSize + 777, 'a'); | 597 new_response = original_response + std::string(7 * kBlockSize + 777, 'a'); |
551 version = UpdateScript(new_response); | 598 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, new_response)); |
552 VerifyResource(GetResourceId(version.get()), new_response); | 599 VerifyResource(GetResourceId(version.get()), new_response); |
553 registration_->SetWaitingVersion(version); | 600 registration_->SetWaitingVersion(version); |
554 } | 601 } |
555 | 602 |
556 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_EmptyScript) { | 603 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_EmptyScript) { |
557 // Create empty incumbent. | 604 // Create empty incumbent. |
558 CreateIncumbent(std::string()); | 605 CreateIncumbent(std::string()); |
559 | 606 |
560 // Update from empty to non-empty. | 607 // Update from empty to non-empty. |
561 std::string response = GenerateLongResponse(); | 608 std::string response = GenerateLongResponse(); |
562 scoped_refptr<ServiceWorkerVersion> version = UpdateScript(response); | 609 scoped_refptr<ServiceWorkerVersion> version = |
| 610 UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
563 VerifyResource(GetResourceId(version.get()), response); | 611 VerifyResource(GetResourceId(version.get()), response); |
564 registration_->SetWaitingVersion(version); | 612 registration_->SetWaitingVersion(version); |
565 | 613 |
566 // Update from non-empty to empty. | 614 // Update from non-empty to empty. |
567 version = UpdateScript(std::string()); | 615 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, std::string())); |
568 VerifyResource(GetResourceId(version.get()), std::string()); | 616 VerifyResource(GetResourceId(version.get()), std::string()); |
569 registration_->SetWaitingVersion(version); | 617 registration_->SetWaitingVersion(version); |
570 | 618 |
571 // Update from empty to empty. | 619 // Update from empty to empty. |
572 version = UpdateScript(std::string()); | 620 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, std::string())); |
573 EXPECT_EQ(kInvalidServiceWorkerResponseId, GetResourceId(version.get())); | 621 EXPECT_EQ(kInvalidServiceWorkerResponseId, GetResourceId(version.get())); |
574 } | 622 } |
575 | 623 |
| 624 TEST_F(ServiceWorkerWriteToCacheJobTest, Update_BumpLastUpdateCheckTime) { |
| 625 std::string response = GenerateLongResponse(); |
| 626 CreateIncumbent(response); |
| 627 |
| 628 // Script was served from HTTPCache. |
| 629 base::Time current = base::Time::Now(); |
| 630 registration_->set_last_update_check(current); |
| 631 scoped_refptr<ServiceWorkerVersion> version = |
| 632 UpdateScript(base::Bind(&CreateCachedResponseJob, response)); |
| 633 EXPECT_EQ(current, registration_->last_update_check()); |
| 634 |
| 635 // Same script but the request accessed the network. |
| 636 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
| 637 EXPECT_LT(current, registration_->last_update_check()); |
| 638 |
| 639 // Changed the first byte and the request accessed the network. |
| 640 response[0] = 'x'; |
| 641 current = base::Time::Now(); |
| 642 registration_->set_last_update_check(current); |
| 643 version = UpdateScript(base::Bind(&CreateNetworkResponseJob, response)); |
| 644 VerifyResource(GetResourceId(version.get()), response); |
| 645 registration_->SetWaitingVersion(version); |
| 646 EXPECT_LT(current, registration_->last_update_check()); |
| 647 |
| 648 // The request accessed the network but received a non-2xx error. |
| 649 current = base::Time::Now(); |
| 650 registration_->set_last_update_check(current); |
| 651 version = UpdateScript(base::Bind(&CreateErrorReponseJob)); |
| 652 EXPECT_EQ(current, registration_->last_update_check()); |
| 653 } |
| 654 |
576 } // namespace content | 655 } // namespace content |
OLD | NEW |