| 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/service_worker_version.h" | 5 #include "content/browser/service_worker/service_worker_version.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <tuple> | 8 #include <tuple> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 version_->StartWorker(ServiceWorkerMetrics::EventType::UNKNOWN, | 620 version_->StartWorker(ServiceWorkerMetrics::EventType::UNKNOWN, |
| 621 CreateReceiverOnCurrentThread(&status)); | 621 CreateReceiverOnCurrentThread(&status)); |
| 622 base::RunLoop().RunUntilIdle(); | 622 base::RunLoop().RunUntilIdle(); |
| 623 EXPECT_EQ(SERVICE_WORKER_OK, status); | 623 EXPECT_EQ(SERVICE_WORKER_OK, status); |
| 624 EXPECT_TRUE(version_->timeout_timer_.IsRunning()); | 624 EXPECT_TRUE(version_->timeout_timer_.IsRunning()); |
| 625 EXPECT_LT(idle_time, version_->idle_time_); | 625 EXPECT_LT(idle_time, version_->idle_time_); |
| 626 | 626 |
| 627 // Adding a controllee resets the idle time. | 627 // Adding a controllee resets the idle time. |
| 628 version_->idle_time_ -= kOneSecond; | 628 version_->idle_time_ -= kOneSecond; |
| 629 idle_time = version_->idle_time_; | 629 idle_time = version_->idle_time_; |
| 630 ServiceWorkerRemoteProviderEndpoint remote_endpoint; |
| 630 std::unique_ptr<ServiceWorkerProviderHost> host = CreateProviderHostForWindow( | 631 std::unique_ptr<ServiceWorkerProviderHost> host = CreateProviderHostForWindow( |
| 631 33 /* dummy render process id */, 1 /* dummy provider_id */, | 632 33 /* dummy render process id */, 1 /* dummy provider_id */, |
| 632 true /* is_parent_frame_secure */, helper_->context()->AsWeakPtr()); | 633 true /* is_parent_frame_secure */, helper_->context()->AsWeakPtr(), |
| 634 &remote_endpoint); |
| 633 version_->AddControllee(host.get()); | 635 version_->AddControllee(host.get()); |
| 634 EXPECT_TRUE(version_->timeout_timer_.IsRunning()); | 636 EXPECT_TRUE(version_->timeout_timer_.IsRunning()); |
| 635 EXPECT_LT(idle_time, version_->idle_time_); | 637 EXPECT_LT(idle_time, version_->idle_time_); |
| 636 | 638 |
| 637 // Completing an event resets the idle time. | 639 // Completing an event resets the idle time. |
| 638 version_->idle_time_ -= kOneSecond; | 640 version_->idle_time_ -= kOneSecond; |
| 639 idle_time = version_->idle_time_; | 641 idle_time = version_->idle_time_; |
| 640 SimulateDispatchEvent(ServiceWorkerMetrics::EventType::FETCH_MAIN_FRAME); | 642 SimulateDispatchEvent(ServiceWorkerMetrics::EventType::FETCH_MAIN_FRAME); |
| 641 EXPECT_LT(idle_time, version_->idle_time_); | 643 EXPECT_LT(idle_time, version_->idle_time_); |
| 642 | 644 |
| (...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1440 // OnStarted. | 1442 // OnStarted. |
| 1441 version_->StopWorker(CreateReceiverOnCurrentThread(&status2)); | 1443 version_->StopWorker(CreateReceiverOnCurrentThread(&status2)); |
| 1442 base::RunLoop().RunUntilIdle(); | 1444 base::RunLoop().RunUntilIdle(); |
| 1443 | 1445 |
| 1444 EXPECT_EQ(SERVICE_WORKER_OK, status1); | 1446 EXPECT_EQ(SERVICE_WORKER_OK, status1); |
| 1445 EXPECT_EQ(SERVICE_WORKER_OK, status2); | 1447 EXPECT_EQ(SERVICE_WORKER_OK, status2); |
| 1446 EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version_->running_status()); | 1448 EXPECT_EQ(EmbeddedWorkerStatus::RUNNING, version_->running_status()); |
| 1447 } | 1449 } |
| 1448 | 1450 |
| 1449 } // namespace content | 1451 } // namespace content |
| OLD | NEW |