Revert of cc: Measure compositor timing with finer granularity

cc/test/scheduler_test_common.cc

 // Copyright 2012 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/test/scheduler_test_common.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
@@ skipping 65 matching lines @@
 FakeCompositorTimingHistory::FakeCompositorTimingHistory(
     scoped_ptr<RenderingStatsInstrumentation> rendering_stats_instrumentation)
     : CompositorTimingHistory(rendering_stats_instrumentation.get()),
       rendering_stats_instrumentation_owned_(
           rendering_stats_instrumentation.Pass()) {
 }
 
 FakeCompositorTimingHistory::~FakeCompositorTimingHistory() {
 }
 
+void FakeCompositorTimingHistory::SetDrawDurationEstimate(
+    base::TimeDelta duration) {
+  draw_duration_ = duration;
+}
+
 void FakeCompositorTimingHistory::SetBeginMainFrameToCommitDurationEstimate(
     base::TimeDelta duration) {
   begin_main_frame_to_commit_duration_ = duration;
 }
 
-void FakeCompositorTimingHistory::SetCommitToReadyToActivateDurationEstimate(
+void FakeCompositorTimingHistory::SetCommitToActivateDurationEstimate(
     base::TimeDelta duration) {
-  commit_to_ready_to_activate_duration_ = duration;
+  commit_to_activate_duration_ = duration;
 }
 
-void FakeCompositorTimingHistory::SetPrepareTilesDurationEstimate(
-    base::TimeDelta duration) {
-  prepare_tiles_duration_ = duration;
-}
-
-void FakeCompositorTimingHistory::SetActivateDurationEstimate(
-    base::TimeDelta duration) {
-  activate_duration_ = duration;
-}
-
-void FakeCompositorTimingHistory::SetDrawDurationEstimate(
-    base::TimeDelta duration) {
-  draw_duration_ = duration;
+base::TimeDelta FakeCompositorTimingHistory::DrawDurationEstimate() const {
+  return draw_duration_;
 }
 
 base::TimeDelta
 FakeCompositorTimingHistory::BeginMainFrameToCommitDurationEstimate() const {
   return begin_main_frame_to_commit_duration_;
 }
 
-base::TimeDelta
-FakeCompositorTimingHistory::CommitToReadyToActivateDurationEstimate() const {
-  return commit_to_ready_to_activate_duration_;
-}
-
-base::TimeDelta FakeCompositorTimingHistory::PrepareTilesDurationEstimate()
+base::TimeDelta FakeCompositorTimingHistory::CommitToActivateDurationEstimate()
     const {
-  return prepare_tiles_duration_;
-}
-
-base::TimeDelta FakeCompositorTimingHistory::ActivateDurationEstimate() const {
-  return activate_duration_;
-}
-
-base::TimeDelta FakeCompositorTimingHistory::DrawDurationEstimate() const {
-  return draw_duration_;
+  return commit_to_activate_duration_;
 }
 
 scoped_ptr<TestScheduler> TestScheduler::Create(
     base::SimpleTestTickClock* now_src,
     SchedulerClient* client,
     const SchedulerSettings& settings,
     int layer_tree_host_id,
     OrderedSimpleTaskRunner* task_runner,
     BeginFrameSource* external_frame_source,
     scoped_ptr<CompositorTimingHistory> compositor_timing_history) {
@@ skipping 32 matching lines @@
 }
 
 base::TimeTicks TestScheduler::Now() const {
   return now_src_->NowTicks();
 }
 
 TestScheduler::~TestScheduler() {
 }
 
 }  // namespace cc