cc: Measure compositor timing with finer granularity

cc/test/scheduler_test_common.cc

Index: cc/test/scheduler_test_common.cc
diff --git a/cc/test/scheduler_test_common.cc b/cc/test/scheduler_test_common.cc
index b0461ec3f86c6f9a8e629d399b3842e7232753d9..91d0952922aab2ded73b50dcc3f958d3271ac66f 100644
--- a/cc/test/scheduler_test_common.cc
+++ b/cc/test/scheduler_test_common.cc
@@ -83,23 +83,29 @@ FakeCompositorTimingHistory::FakeCompositorTimingHistory(
 FakeCompositorTimingHistory::~FakeCompositorTimingHistory() {
 }
 
-void FakeCompositorTimingHistory::SetDrawDurationEstimate(
+void FakeCompositorTimingHistory::SetBeginMainFrameToCommitDurationEstimate(
     base::TimeDelta duration) {
-  draw_duration_ = duration;
+  begin_main_frame_to_commit_duration_ = duration;
 }
 
-void FakeCompositorTimingHistory::SetBeginMainFrameToCommitDurationEstimate(
+void FakeCompositorTimingHistory::SetCommitToReadyToActivateDurationEstimate(
     base::TimeDelta duration) {
-  begin_main_frame_to_commit_duration_ = duration;
+  commit_to_ready_to_activate_duration_ = duration;
 }
 
-void FakeCompositorTimingHistory::SetCommitToActivateDurationEstimate(
+void FakeCompositorTimingHistory::SetPrepareTilesDurationEstimate(
     base::TimeDelta duration) {
-  commit_to_activate_duration_ = duration;
+  prepare_tiles_duration_ = duration;
 }
 
-base::TimeDelta FakeCompositorTimingHistory::DrawDurationEstimate() const {
-  return draw_duration_;
+void FakeCompositorTimingHistory::SetActivateDurationEstimate(
+    base::TimeDelta duration) {
+  activate_duration_ = duration;
+}
+
+void FakeCompositorTimingHistory::SetDrawDurationEstimate(
+    base::TimeDelta duration) {
+  draw_duration_ = duration;
 }
 
 base::TimeDelta
@@ -107,9 +113,22 @@ FakeCompositorTimingHistory::BeginMainFrameToCommitDurationEstimate() const {
   return begin_main_frame_to_commit_duration_;
 }
 
-base::TimeDelta FakeCompositorTimingHistory::CommitToActivateDurationEstimate()
+base::TimeDelta
+FakeCompositorTimingHistory::CommitToReadyToActivateDurationEstimate() const {
+  return commit_to_ready_to_activate_duration_;
+}
+
+base::TimeDelta FakeCompositorTimingHistory::PrepareTilesDurationEstimate()
     const {
-  return commit_to_activate_duration_;
+  return prepare_tiles_duration_;
+}
+
+base::TimeDelta FakeCompositorTimingHistory::ActivateDurationEstimate() const {
+  return activate_duration_;
+}
+
+base::TimeDelta FakeCompositorTimingHistory::DrawDurationEstimate() const {
+  return draw_duration_;
 }
 
 scoped_ptr<TestScheduler> TestScheduler::Create(