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 <stdint.h> | 5 #include <stdint.h> |
6 #include <tuple> | 6 #include <tuple> |
7 | 7 |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "base/test/test_simple_task_runner.h" | 12 #include "base/test/test_simple_task_runner.h" |
| 13 #include "base/time/time.h" |
13 #include "content/browser/browser_thread_impl.h" | 14 #include "content/browser/browser_thread_impl.h" |
14 #include "content/browser/service_worker/embedded_worker_registry.h" | 15 #include "content/browser/service_worker/embedded_worker_registry.h" |
15 #include "content/browser/service_worker/embedded_worker_status.h" | 16 #include "content/browser/service_worker/embedded_worker_status.h" |
16 #include "content/browser/service_worker/embedded_worker_test_helper.h" | 17 #include "content/browser/service_worker/embedded_worker_test_helper.h" |
17 #include "content/browser/service_worker/service_worker_context_core.h" | 18 #include "content/browser/service_worker/service_worker_context_core.h" |
18 #include "content/browser/service_worker/service_worker_context_wrapper.h" | 19 #include "content/browser/service_worker/service_worker_context_wrapper.h" |
19 #include "content/browser/service_worker/service_worker_disk_cache.h" | 20 #include "content/browser/service_worker/service_worker_disk_cache.h" |
20 #include "content/browser/service_worker/service_worker_job_coordinator.h" | 21 #include "content/browser/service_worker/service_worker_job_coordinator.h" |
21 #include "content/browser/service_worker/service_worker_registration.h" | 22 #include "content/browser/service_worker/service_worker_registration.h" |
22 #include "content/browser/service_worker/service_worker_registration_status.h" | 23 #include "content/browser/service_worker/service_worker_registration_status.h" |
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1437 : EmbeddedWorkerTestHelper(base::FilePath()), | 1438 : EmbeddedWorkerTestHelper(base::FilePath()), |
1438 install_event_result_(blink::WebServiceWorkerEventResultCompleted), | 1439 install_event_result_(blink::WebServiceWorkerEventResultCompleted), |
1439 activate_event_result_(blink::WebServiceWorkerEventResultCompleted) {} | 1440 activate_event_result_(blink::WebServiceWorkerEventResultCompleted) {} |
1440 | 1441 |
1441 void OnInstallEvent(int embedded_worker_id, | 1442 void OnInstallEvent(int embedded_worker_id, |
1442 int request_id) override { | 1443 int request_id) override { |
1443 if (!install_callback_.is_null()) | 1444 if (!install_callback_.is_null()) |
1444 install_callback_.Run(); | 1445 install_callback_.Run(); |
1445 SimulateSend(new ServiceWorkerHostMsg_InstallEventFinished( | 1446 SimulateSend(new ServiceWorkerHostMsg_InstallEventFinished( |
1446 embedded_worker_id, request_id, install_event_result_, | 1447 embedded_worker_id, request_id, install_event_result_, |
1447 has_fetch_handler_)); | 1448 has_fetch_handler_, base::Time::Now())); |
1448 } | 1449 } |
1449 void OnActivateEvent(int embedded_worker_id, int request_id) override { | 1450 void OnActivateEvent(int embedded_worker_id, int request_id) override { |
1450 SimulateSend( | 1451 SimulateSend(new ServiceWorkerHostMsg_ActivateEventFinished( |
1451 new ServiceWorkerHostMsg_ActivateEventFinished( | 1452 embedded_worker_id, request_id, activate_event_result_, |
1452 embedded_worker_id, request_id, activate_event_result_)); | 1453 base::Time::Now())); |
1453 } | 1454 } |
1454 | 1455 |
1455 void set_install_callback(const base::Closure& callback) { | 1456 void set_install_callback(const base::Closure& callback) { |
1456 install_callback_ = callback; | 1457 install_callback_ = callback; |
1457 } | 1458 } |
1458 void set_install_event_result(blink::WebServiceWorkerEventResult result) { | 1459 void set_install_event_result(blink::WebServiceWorkerEventResult result) { |
1459 install_event_result_ = result; | 1460 install_event_result_ = result; |
1460 } | 1461 } |
1461 void set_activate_event_result(blink::WebServiceWorkerEventResult result) { | 1462 void set_activate_event_result(blink::WebServiceWorkerEventResult result) { |
1462 activate_event_result_ = result; | 1463 activate_event_result_ = result; |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1693 // should not be promoted to ACTIVATED because failure occur | 1694 // should not be promoted to ACTIVATED because failure occur |
1694 // during shutdown. | 1695 // during shutdown. |
1695 runner->RunUntilIdle(); | 1696 runner->RunUntilIdle(); |
1696 base::RunLoop().RunUntilIdle(); | 1697 base::RunLoop().RunUntilIdle(); |
1697 EXPECT_EQ(new_version.get(), registration->active_version()); | 1698 EXPECT_EQ(new_version.get(), registration->active_version()); |
1698 EXPECT_EQ(ServiceWorkerVersion::ACTIVATING, new_version->status()); | 1699 EXPECT_EQ(ServiceWorkerVersion::ACTIVATING, new_version->status()); |
1699 registration->RemoveListener(update_helper); | 1700 registration->RemoveListener(update_helper); |
1700 } | 1701 } |
1701 | 1702 |
1702 } // namespace content | 1703 } // namespace content |
OLD | NEW |