Chromium Code Reviews| Index: components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
| diff --git a/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc b/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
| index 8ccc4dfc83c3f6cf88bdc0c7af2830582c23619f..c922fa451aa8821480c265d06f6b2909920b5fbb 100644 |
| --- a/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
| +++ b/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
| @@ -20,6 +20,7 @@ |
| #include "third_party/WebKit/public/platform/WebTraceLocation.h" |
| using testing::ElementsAre; |
| +using VirtualTimePolicy = blink::WebViewScheduler::VirtualTimePolicy; |
| namespace scheduler { |
| @@ -335,7 +336,8 @@ class DelayedRunOrderTask : public blink::WebTaskRunner::Task { |
| TEST_F(WebViewSchedulerImplTest, VirtualTime_NotAllowedToAdvance) { |
| std::vector<int> run_order; |
| - web_view_scheduler_->setAllowVirtualTimeToAdvance(false); |
| + web_view_scheduler_->setVirtualTimePolicy( |
| + blink::WebViewScheduler::VirtualTimePolicy::PAUSE); |
|
Sami
2016/07/05 10:26:55
nit: no need for the namespace prefix with the 'us
alex clarke (OOO till 29th)
2016/07/05 13:08:13
Done.
|
| web_view_scheduler_->enableVirtualTime(); |
| web_frame_scheduler_->timerTaskRunner()->postTask( |
| @@ -362,7 +364,8 @@ TEST_F(WebViewSchedulerImplTest, VirtualTime_NotAllowedToAdvance) { |
| TEST_F(WebViewSchedulerImplTest, VirtualTime_AllowedToAdvance) { |
| std::vector<int> run_order; |
| - web_view_scheduler_->setAllowVirtualTimeToAdvance(true); |
| + web_view_scheduler_->setVirtualTimePolicy( |
| + blink::WebViewScheduler::VirtualTimePolicy::ADVANCE); |
| web_view_scheduler_->enableVirtualTime(); |
| web_frame_scheduler_->timerTaskRunner()->postTask( |
| @@ -411,7 +414,7 @@ TEST_F(WebViewSchedulerImplTestWithDisabledBackgroundTimerThrottling, |
| TEST_F(WebViewSchedulerImplTest, VirtualTimeSettings_NewWebFrameScheduler) { |
| std::vector<int> run_order; |
| - web_view_scheduler_->setAllowVirtualTimeToAdvance(false); |
| + web_view_scheduler_->setVirtualTimePolicy(VirtualTimePolicy::PAUSE); |
| web_view_scheduler_->enableVirtualTime(); |
| std::unique_ptr<WebFrameSchedulerImpl> web_frame_scheduler = |
| @@ -423,7 +426,7 @@ TEST_F(WebViewSchedulerImplTest, VirtualTimeSettings_NewWebFrameScheduler) { |
| mock_task_runner_->RunUntilIdle(); |
| EXPECT_TRUE(run_order.empty()); |
| - web_view_scheduler_->setAllowVirtualTimeToAdvance(true); |
| + web_view_scheduler_->setVirtualTimePolicy(VirtualTimePolicy::ADVANCE); |
| mock_task_runner_->RunUntilIdle(); |
| EXPECT_THAT(run_order, ElementsAre(1)); |
| @@ -501,4 +504,29 @@ TEST_F(WebViewSchedulerImplTest, DeleteThrottledQueue_InTask) { |
| EXPECT_EQ(10, run_count); |
| } |
| +TEST_F(WebViewSchedulerImplTest, |
| + VirtualTimePolicy_PAUSE_IF_NETWORK_FETCHES_PENDING) { |
| + web_view_scheduler_->setVirtualTimePolicy( |
| + VirtualTimePolicy::PAUSE_IF_NETWORK_FETCHES_PENDING); |
| + EXPECT_TRUE(web_view_scheduler_->virtualTimeAllowedToAdvance()); |
| + |
| + web_view_scheduler_->incrementPendingResourceLoadCount(); |
| + EXPECT_FALSE(web_view_scheduler_->virtualTimeAllowedToAdvance()); |
| + |
| + web_view_scheduler_->incrementPendingResourceLoadCount(); |
| + EXPECT_FALSE(web_view_scheduler_->virtualTimeAllowedToAdvance()); |
| + |
| + web_view_scheduler_->decrementPendingResourceLoadCount(); |
| + EXPECT_FALSE(web_view_scheduler_->virtualTimeAllowedToAdvance()); |
| + |
| + web_view_scheduler_->incrementPendingResourceLoadCount(); |
| + EXPECT_FALSE(web_view_scheduler_->virtualTimeAllowedToAdvance()); |
| + |
| + web_view_scheduler_->decrementPendingResourceLoadCount(); |
| + EXPECT_FALSE(web_view_scheduler_->virtualTimeAllowedToAdvance()); |
| + |
| + web_view_scheduler_->decrementPendingResourceLoadCount(); |
| + EXPECT_TRUE(web_view_scheduler_->virtualTimeAllowedToAdvance()); |
| +} |
| + |
| } // namespace scheduler |