Revert of cc: Measure compositor timing with finer granularity

cc/test/scheduler_test_common.h

 // Copyright 2011 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.
 
 #ifndef CC_TEST_SCHEDULER_TEST_COMMON_H_
 #define CC_TEST_SCHEDULER_TEST_COMMON_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 148 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestSyntheticBeginFrameSource);
 };
 
 class FakeCompositorTimingHistory : public CompositorTimingHistory {
  public:
   static scoped_ptr<FakeCompositorTimingHistory> Create();
   ~FakeCompositorTimingHistory() override;
 
+  void SetDrawDurationEstimate(base::TimeDelta duration);
   void SetBeginMainFrameToCommitDurationEstimate(base::TimeDelta duration);
-  void SetCommitToReadyToActivateDurationEstimate(base::TimeDelta duration);
-  void SetPrepareTilesDurationEstimate(base::TimeDelta duration);
-  void SetActivateDurationEstimate(base::TimeDelta duration);
-  void SetDrawDurationEstimate(base::TimeDelta duration);
+  void SetCommitToActivateDurationEstimate(base::TimeDelta duration);
 
+  base::TimeDelta DrawDurationEstimate() const override;
   base::TimeDelta BeginMainFrameToCommitDurationEstimate() const override;
-  base::TimeDelta CommitToReadyToActivateDurationEstimate() const override;
-  base::TimeDelta PrepareTilesDurationEstimate() const override;
-  base::TimeDelta ActivateDurationEstimate() const override;
-  base::TimeDelta DrawDurationEstimate() const override;
+  base::TimeDelta CommitToActivateDurationEstimate() const override;
 
  protected:
   FakeCompositorTimingHistory(scoped_ptr<RenderingStatsInstrumentation>
                                   rendering_stats_instrumentation_owned);
 
   scoped_ptr<RenderingStatsInstrumentation>
       rendering_stats_instrumentation_owned_;
 
+  base::TimeDelta draw_duration_;
   base::TimeDelta begin_main_frame_to_commit_duration_;
-  base::TimeDelta commit_to_ready_to_activate_duration_;
-  base::TimeDelta prepare_tiles_duration_;
-  base::TimeDelta activate_duration_;
-  base::TimeDelta draw_duration_;
+  base::TimeDelta commit_to_activate_duration_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeCompositorTimingHistory);
 };
 
 class TestScheduler : public Scheduler {
  public:
   static scoped_ptr<TestScheduler> Create(
       base::SimpleTestTickClock* now_src,
       SchedulerClient* client,
@@ skipping 36 matching lines @@
       scoped_ptr<CompositorTimingHistory> compositor_timing_history);
 
   base::SimpleTestTickClock* now_src_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_SCHEDULER_TEST_COMMON_H_