Index: cc/scheduler/scheduler_unittest.cc |
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc |
index dacc03ce21ae118e553ad78b10324a5e45a3d9e9..78e89154919cea4da444586a85223dc8c79041f0 100644 |
--- a/cc/scheduler/scheduler_unittest.cc |
+++ b/cc/scheduler/scheduler_unittest.cc |
@@ -347,6 +347,7 @@ class SchedulerTest : public testing::Test { |
// it will be already in the task queue. |
if (scheduler_->settings().use_external_begin_frame_source && |
scheduler_->FrameProductionThrottled()) { |
+ EXPECT_TRUE(client_->needs_begin_frames()); |
SendNextBeginFrame(); |
EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending()); |
} |
@@ -2112,12 +2113,16 @@ TEST_F(SchedulerTest, ScheduledActionActivateAfterBecomingInvisible) { |
scheduler_->NotifyBeginMainFrameStarted(); |
scheduler_->NotifyReadyToCommit(); |
EXPECT_SINGLE_ACTION("ScheduledActionCommit", client_); |
+ EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending()); |
client_->Reset(); |
scheduler_->SetVisible(false); |
+ task_runner().RunPendingTasks(); // Run posted deadline. |
+ |
// Sync tree should be forced to activate. |
- EXPECT_ACTION("SetNeedsBeginFrames(false)", client_, 0, 2); |
- EXPECT_ACTION("ScheduledActionActivateSyncTree", client_, 1, 2); |
+ EXPECT_ACTION("ScheduledActionActivateSyncTree", client_, 0, 3); |
+ EXPECT_ACTION("SetNeedsBeginFrames(false)", client_, 1, 3); |
+ EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 2, 3); |
} |
// Tests to ensure frame sources can be successfully changed while drawing. |