cc: Allow sending BeginMainFrame before draw or activation

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 2099b8a26cfb11e2f4998603191e741aec7685b6..4531121e082b19598152d86f3f794900562c49e5 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -333,18 +333,18 @@ void RequestCommitAfterBeginMainFrameSent(
 
   // Finish the first commit.
   scheduler->FinishCommit();
-  EXPECT_ACTION("ScheduledActionCommit", client, 0, 2);
-  EXPECT_ACTION("PostBeginImplFrameDeadlineTask", client, 1, 2);
-  client.Reset();
-  scheduler->OnBeginImplFrameDeadline();
   if (deadline_scheduling_enabled) {
-    EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
-    EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
+    EXPECT_ACTION("ScheduledActionCommit", client, 0, 2);
+    EXPECT_ACTION("PostBeginImplFrameDeadlineTask", client, 1, 2);
   } else {
-    EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 3);
+    EXPECT_ACTION("ScheduledActionCommit", client, 0, 3);
     EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client, 1, 3);
-    EXPECT_ACTION("SetNeedsBeginImplFrame", client, 2, 3);
+    EXPECT_ACTION("PostBeginImplFrameDeadlineTask", client, 2, 3);
   }
+  client.Reset();
+  scheduler->OnBeginImplFrameDeadline();
+  EXPECT_ACTION("ScheduledActionDrawAndSwapIfPossible", client, 0, 2);
+  EXPECT_ACTION("SetNeedsBeginImplFrame", client, 1, 2);
 
   // Because we just swapped, the Scheduler should also request the next
   // BeginImplFrame from the OutputSurface.