cc: Implement unified BeginFrame on aura

cc/scheduler/scheduler_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scheduler/scheduler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 512 matching lines @@
   task_runner().RunPendingTasks();  // Run posted deadline.
   EXPECT_ACTION("SetNeedsBeginFrames(false)", client_, 0, 2);
   EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 1, 2);
   client_->Reset();
 }
 
 TEST_F(SchedulerTest, RequestCommitAfterSetDeferCommit) {
   scheduler_settings_.use_external_begin_frame_source = true;
   SetUpScheduler(true);
 
-  scheduler_->SetCanStart();
-  scheduler_->SetVisible(true);
-  scheduler_->SetCanDraw(true);

[brianderson, 2015/03/02 22:38:15]

Why was this block removed?

[simonhong, 2015/03/03 22:54:12]

This is just a clean up.
Above three function calls are already done by SetUpScheduler(true).

-
   scheduler_->SetDeferCommits(true);
 
   scheduler_->SetNeedsCommit();
   EXPECT_SINGLE_ACTION("SetNeedsBeginFrames(true)", client_);
 
   client_->Reset();
   AdvanceFrame();
   // BeginMainFrame is not sent during the defer commit is on.
   EXPECT_SINGLE_ACTION("WillBeginImplFrame", client_);
 
@@ skipping 12 matching lines @@
   AdvanceFrame();
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2);
   EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client_, 1, 2);
   EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending());
 }
 
 TEST_F(SchedulerTest, DeferCommitWithRedraw) {
   scheduler_settings_.use_external_begin_frame_source = true;
   SetUpScheduler(true);
 
-  scheduler_->SetCanStart();
-  scheduler_->SetVisible(true);
-  scheduler_->SetCanDraw(true);

[brianderson, 2015/03/02 22:38:16]

Why was this block removed?

[simonhong, 2015/03/03 22:54:12]

ditto.

-
   scheduler_->SetDeferCommits(true);
 
   scheduler_->SetNeedsCommit();
   EXPECT_SINGLE_ACTION("SetNeedsBeginFrames(true)", client_);
 
   client_->Reset();
   scheduler_->SetNeedsRedraw();
   EXPECT_NO_ACTION(client_);
 
   client_->Reset();
@@ skipping 1806 matching lines @@
   EXPECT_SINGLE_ACTION("WillBeginImplFrame", client_);
   EXPECT_TRUE(scheduler_->BeginImplFrameDeadlinePending());
   client_->Reset();
 
   task_runner().RunPendingTasks();  // Run posted deadline.
   EXPECT_ACTION("SetNeedsBeginFrames(false)", client_, 0, 2);
   EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 1, 2);
   client_->Reset();
 }
 
+TEST_F(SchedulerTest, AuthoritativeVSyncInterval) {
+  SetUpScheduler(true);
+
+  base::TimeDelta initial_interval =
+      scheduler_->begin_impl_frame_args().interval;
+  base::TimeDelta authoritative_interval =
+      base::TimeDelta::FromMilliseconds(33);
+
+  scheduler_->SetNeedsCommit();
+  EXPECT_SCOPED(AdvanceFrame());
+
+  EXPECT_EQ(initial_interval, scheduler_->begin_impl_frame_args().interval);
+
+  scheduler_->NotifyBeginMainFrameStarted();
+  scheduler_->NotifyReadyToCommit();
+  task_runner().RunTasksWhile(client_->ImplFrameDeadlinePending(true));
+
+  scheduler_->SetAuthoritativeVSyncInterval(authoritative_interval);
+
+  EXPECT_SCOPED(AdvanceFrame());
+
+  // At the next BeginFrame, authoritative interval is used.
+  EXPECT_EQ(authoritative_interval,

[brianderson, 2015/03/02 22:38:16]

Can you also EXPECT_NE to initial_interval so it's really clear this test is
testing what it thinks it's testing.

[simonhong, 2015/03/03 22:54:12]

Done.

+            scheduler_->begin_impl_frame_args().interval);
+}
+
 }  // namespace
 }  // namespace cc