cc: Track BeginMainFrame more precisely in CompositorTimingHistory.

cc/scheduler/compositor_timing_history_unittest.cc

Index: cc/scheduler/compositor_timing_history_unittest.cc
diff --git a/cc/scheduler/compositor_timing_history_unittest.cc b/cc/scheduler/compositor_timing_history_unittest.cc
index 5ffd68e95d2a3ce3ee4faf6dd36191ffcd08da43..6306f29a5a9df0e0f1f1bb0e8c0d79c222b38392 100644
--- a/cc/scheduler/compositor_timing_history_unittest.cc
+++ b/cc/scheduler/compositor_timing_history_unittest.cc
@@ -50,10 +50,12 @@ base::TimeTicks TestCompositorTimingHistory::Now() const {
   return test_->Now();
 }
 
-TEST_F(CompositorTimingHistoryTest, AllSequentialCommit) {
+TEST_F(CompositorTimingHistoryTest, AllSequentialCommit_Critical) {
   base::TimeDelta one_second = base::TimeDelta::FromSeconds(1);
 
-  base::TimeDelta begin_main_frame_to_commit_duration =
+  base::TimeDelta begin_main_frame_queue_duration =
+      base::TimeDelta::FromMilliseconds(1);
+  base::TimeDelta begin_main_frame_start_to_commit_duration =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta prepare_tiles_duration = base::TimeDelta::FromMilliseconds(2);
   base::TimeDelta prepare_tiles_end_to_ready_to_activate_duration =
@@ -63,9 +65,10 @@ TEST_F(CompositorTimingHistoryTest, AllSequentialCommit) {
   base::TimeDelta activate_duration = base::TimeDelta::FromMilliseconds(4);
   base::TimeDelta draw_duration = base::TimeDelta::FromMilliseconds(5);
 
-  timing_history_.WillBeginMainFrame();
-  AdvanceNowBy(begin_main_frame_to_commit_duration);
-  // timing_history_.BeginMainFrameAborted();
+  timing_history_.WillBeginMainFrame(true);
+  AdvanceNowBy(begin_main_frame_queue_duration);
+  timing_history_.BeginMainFrameStarted(Now());
+  AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   timing_history_.DidCommit();
   timing_history_.WillPrepareTiles();
   AdvanceNowBy(prepare_tiles_duration);
@@ -83,8 +86,19 @@ TEST_F(CompositorTimingHistoryTest, AllSequentialCommit) {
   AdvanceNowBy(draw_duration);
   timing_history_.DidDraw();
 
-  EXPECT_EQ(begin_main_frame_to_commit_duration,
+  EXPECT_EQ(begin_main_frame_queue_duration,
+            timing_history_.BeginMainFrameQueueDurationCriticalEstimate());
+  EXPECT_EQ(base::TimeDelta(),
+            timing_history_.BeginMainFrameQueueDurationNotCriticalEstimate());
+  EXPECT_EQ(begin_main_frame_start_to_commit_duration,
+            timing_history_.BeginMainFrameStartToCommitDurationEstimate());
+
+  base::TimeDelta begin_main_frame_to_commit_duration_expected_ =
+      begin_main_frame_queue_duration +
+      begin_main_frame_start_to_commit_duration;
+  EXPECT_EQ(begin_main_frame_to_commit_duration_expected_,
             timing_history_.BeginMainFrameToCommitDurationEstimate());
+
   EXPECT_EQ(commit_to_ready_to_activate_duration,
             timing_history_.CommitToReadyToActivateDurationEstimate());
   EXPECT_EQ(prepare_tiles_duration,
@@ -93,10 +107,13 @@ TEST_F(CompositorTimingHistoryTest, AllSequentialCommit) {
   EXPECT_EQ(draw_duration, timing_history_.DrawDurationEstimate());
 }
 
-TEST_F(CompositorTimingHistoryTest, AllSequentialBeginMainFrameAborted) {
+TEST_F(CompositorTimingHistoryTest,
+       AllSequentialBeginMainFrameAborted_NotCritical) {
   base::TimeDelta one_second = base::TimeDelta::FromSeconds(1);
 
-  base::TimeDelta begin_main_frame_to_commit_duration =
+  base::TimeDelta begin_main_frame_queue_duration =
+      base::TimeDelta::FromMilliseconds(1);
+  base::TimeDelta begin_main_frame_start_to_commit_duration =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta prepare_tiles_duration = base::TimeDelta::FromMilliseconds(2);
   base::TimeDelta prepare_tiles_end_to_ready_to_activate_duration =
@@ -106,8 +123,10 @@ TEST_F(CompositorTimingHistoryTest, AllSequentialBeginMainFrameAborted) {
   base::TimeDelta activate_duration = base::TimeDelta::FromMilliseconds(4);
   base::TimeDelta draw_duration = base::TimeDelta::FromMilliseconds(5);
 
-  timing_history_.WillBeginMainFrame();
-  AdvanceNowBy(begin_main_frame_to_commit_duration);
+  timing_history_.WillBeginMainFrame(false);
+  AdvanceNowBy(begin_main_frame_queue_duration);
+  timing_history_.BeginMainFrameStarted(Now());
+  AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   // BeginMainFrameAborted counts as a commit complete.
   timing_history_.BeginMainFrameAborted();
   timing_history_.WillPrepareTiles();
@@ -126,8 +145,19 @@ TEST_F(CompositorTimingHistoryTest, AllSequentialBeginMainFrameAborted) {
   AdvanceNowBy(draw_duration);
   timing_history_.DidDraw();
 
-  EXPECT_EQ(begin_main_frame_to_commit_duration,
+  EXPECT_EQ(base::TimeDelta(),
+            timing_history_.BeginMainFrameQueueDurationCriticalEstimate());
+  EXPECT_EQ(begin_main_frame_queue_duration,
+            timing_history_.BeginMainFrameQueueDurationNotCriticalEstimate());
+  EXPECT_EQ(begin_main_frame_start_to_commit_duration,
+            timing_history_.BeginMainFrameStartToCommitDurationEstimate());
+
+  base::TimeDelta begin_main_frame_to_commit_duration_expected_ =
+      begin_main_frame_queue_duration +
+      begin_main_frame_start_to_commit_duration;
+  EXPECT_EQ(begin_main_frame_to_commit_duration_expected_,
             timing_history_.BeginMainFrameToCommitDurationEstimate());
+
   EXPECT_EQ(commit_to_ready_to_activate_duration,
             timing_history_.CommitToReadyToActivateDurationEstimate());
   EXPECT_EQ(prepare_tiles_duration,