cc: Rename VSync to BeginFrame

cc/scheduler/scheduler_unittest.cc

Index: cc/scheduler/scheduler_unittest.cc
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index 3a8e8e3d1b893c7260579e9ed9dee5361fb1db54..132eca1a9461ad1514c37eeba402cc2cbcdacc3b 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -43,8 +43,8 @@ class FakeSchedulerClient : public SchedulerClient {
   }
 
   // Scheduler Implementation.
-  virtual void ScheduledActionBeginFrame() OVERRIDE {
-    actions_.push_back("ScheduledActionBeginFrame");
+  virtual void ScheduledActionBeginMainFrame() OVERRIDE {
+    actions_.push_back("ScheduledActionBeginMainFrame");
   }
   virtual ScheduledActionDrawAndSwapResult
   ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
@@ -104,12 +104,12 @@ TEST(SchedulerTest, RequestCommit) {
   // SetNeedsCommit should begin the frame.
   scheduler->SetNeedsCommit();
   EXPECT_EQ(1, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   EXPECT_FALSE(time_source->Active());
   client.Reset();
 
-  // BeginFrameComplete should commit
-  scheduler->BeginFrameComplete();
+  // BeginMainFrameComplete should commit
+  scheduler->BeginMainFrameComplete();
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionCommit", client.Action(0));
   EXPECT_TRUE(time_source->Active());
@@ -126,7 +126,7 @@ TEST(SchedulerTest, RequestCommit) {
   EXPECT_FALSE(time_source->Active());
 }
 
-TEST(SchedulerTest, RequestCommitAfterBeginFrame) {
+TEST(SchedulerTest, RequestCommitAfterBeginMainFrame) {
   FakeSchedulerClient client;
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   SchedulerSettings default_scheduler_settings;
@@ -146,15 +146,15 @@ TEST(SchedulerTest, RequestCommitAfterBeginFrame) {
   // SetNedsCommit should begin the frame.
   scheduler->SetNeedsCommit();
   EXPECT_EQ(1, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   client.Reset();
 
   // Now SetNeedsCommit again. Calling here means we need a second frame.
   scheduler->SetNeedsCommit();
 
-  // Since, another commit is needed, BeginFrameComplete should commit,
+  // Since, another commit is needed, BeginMainFrameComplete should commit,
   // then begin another frame.
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionCommit", client.Action(0));
   client.Reset();
@@ -164,7 +164,7 @@ TEST(SchedulerTest, RequestCommitAfterBeginFrame) {
   EXPECT_FALSE(time_source->Active());
   EXPECT_EQ(2, client.num_actions_());
   EXPECT_STREQ("ScheduledActionDrawAndSwapIfPossible", client.Action(0));
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(1));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(1));
   client.Reset();
 }
 
@@ -188,7 +188,7 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
   scheduler->SetNeedsCommit();
   scheduler->SetMainThreadNeedsLayerTextures();
   EXPECT_EQ(2, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   EXPECT_STREQ("ScheduledActionAcquireLayerTexturesForMainThread",
                client.Action(1));
   client.Reset();
@@ -197,7 +197,7 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
   EXPECT_FALSE(time_source->Active());
 
   // Trigger the commit
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
   EXPECT_TRUE(time_source->Active());
   client.Reset();
 
@@ -213,7 +213,7 @@ TEST(SchedulerTest, TextureAcquisitionCollision) {
   EXPECT_STREQ("ScheduledActionDrawAndSwapIfPossible", client.Action(0));
   EXPECT_STREQ("ScheduledActionAcquireLayerTexturesForMainThread",
                client.Action(1));
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(2));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(2));
   client.Reset();
 }
 
@@ -235,7 +235,7 @@ TEST(SchedulerTest, VisibilitySwitchWithTextureAcquisition) {
   scheduler->DidCreateAndInitializeOutputSurface();
 
   scheduler->SetNeedsCommit();
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
   scheduler->SetMainThreadNeedsLayerTextures();
   client.Reset();
   // Verify that pending texture acquisition fires when visibility
@@ -251,7 +251,7 @@ TEST(SchedulerTest, VisibilitySwitchWithTextureAcquisition) {
   // for a new frame in order to escape a deadlock.
   scheduler->SetVisible(true);
   EXPECT_EQ(1, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   client.Reset();
 }
 
@@ -261,7 +261,7 @@ class SchedulerClientThatsetNeedsDrawInsideDraw : public FakeSchedulerClient {
 
   void SetScheduler(Scheduler* scheduler) { scheduler_ = scheduler; }
 
-  virtual void ScheduledActionBeginFrame() OVERRIDE {}
+  virtual void ScheduledActionBeginMainFrame() OVERRIDE {}
   virtual ScheduledActionDrawAndSwapResult
   ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
     // Only SetNeedsRedraw the first time this is called
@@ -372,7 +372,7 @@ class SchedulerClientThatsetNeedsCommitInsideDraw : public FakeSchedulerClient {
 
   void SetScheduler(Scheduler* scheduler) { scheduler_ = scheduler; }
 
-  virtual void ScheduledActionBeginFrame() OVERRIDE {}
+  virtual void ScheduledActionBeginMainFrame() OVERRIDE {}
   virtual ScheduledActionDrawAndSwapResult
   ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
     // Only SetNeedsCommit the first time this is called
@@ -420,7 +420,7 @@ TEST(SchedulerTest, RequestCommitInsideDraw) {
   EXPECT_FALSE(time_source->Active());
   EXPECT_EQ(1, client.num_draws());
   EXPECT_TRUE(scheduler->CommitPending());
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
 
   time_source->Tick();
   EXPECT_EQ(2, client.num_draws());
@@ -476,7 +476,7 @@ TEST(SchedulerTest, RequestCommitInsideFailedDraw) {
   EXPECT_FALSE(time_source->Active());
 }
 
-TEST(SchedulerTest, NoBeginFrameWhenDrawFails) {
+TEST(SchedulerTest, NoSwapWhenDrawFails) {
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   SchedulerClientThatsetNeedsCommitInsideDraw client;
   scoped_ptr<FakeFrameRateController> controller(
@@ -518,7 +518,7 @@ TEST(SchedulerTest, NoBeginFrameWhenDrawFails) {
   EXPECT_EQ(0, controller_ptr->NumFramesPending());
 }
 
-TEST(SchedulerTest, NoBeginFrameWhenSwapFailsDuringForcedCommit) {
+TEST(SchedulerTest, NoSwapWhenSwapFailsDuringForcedCommit) {
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   FakeSchedulerClient client;
   scoped_ptr<FakeFrameRateController> controller(