Chromium Code Reviews| Index: components/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
| diff --git a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
| index 1a8944443ae6c699d3cef55ec96911ca2136af1f..fc8be8cc56b5a30b3bd2908c650c6ebb7175e1f3 100644 |
| --- a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
| +++ b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
| @@ -2672,6 +2672,9 @@ TEST_F(RendererSchedulerImplTest, |
| SYNCHRONIZED_GESTURE_TimerTaskThrottling_task_expensive) { |
| SimulateCompositorGestureStart(TouchEventPolicy::SEND_TOUCH_START); |
| + base::TimeTicks first_throttled_run_time = |
| + ThrottlingHelper::ThrottledRunTime(clock_->NowTicks()); |
| + |
| size_t count = 0; |
| // With the compositor task taking 10ms, there is not enough time to run this |
| // 7ms timer task in the 16ms frame. |
| @@ -2700,11 +2703,18 @@ TEST_F(RendererSchedulerImplTest, |
| base::Bind(&RendererSchedulerImplTest::SimulatedCompositorTaskPending, |
| base::Unretained(this))); |
| EXPECT_EQ(UseCase::SYNCHRONIZED_GESTURE, CurrentUseCase()) << "i = " << i; |
| - EXPECT_TRUE(scheduler_->TimerTaskRunner()->IsQueueEnabled()) << "i = " << i; |
| + |
| + // Before the policy is updated the queue will be enabled. Subsequently it |
| + // will be disabled until the thottled queue is pumped. |
|
Sami
2016/05/10 14:28:56
typo: throttled
alex clarke (OOO till 29th)
2016/05/10 14:35:33
Done.
|
| + bool expect_queue_enabled = |
| + (i == 0) || (clock_->NowTicks() > first_throttled_run_time); |
| + EXPECT_EQ(expect_queue_enabled, |
| + scheduler_->TimerTaskRunner()->IsQueueEnabled()) |
| + << "i = " << i; |
| } |
| // Task is throttled but not completely blocked. |
| - EXPECT_EQ(13u, count); |
| + EXPECT_EQ(12u, count); |
| } |
| TEST_F(RendererSchedulerImplTest, |