Revert "cc: Don't record first two frames in CompositorTimingHistory"

cc/scheduler/compositor_timing_history.h

 // Copyright 2014 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_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_
 #define CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/rolling_time_delta_history.h"
 
@@ skipping 39 matching lines @@
   void ReadyToActivate();
   void WillActivate();
   void DidActivate();
   void WillDraw();
   void DidDraw();
 
  protected:
   static scoped_ptr<UMAReporter> CreateUMAReporter(UMACategory category);
   virtual base::TimeTicks Now() const;
 
-  bool AffectsEstimate() const;
-
   bool enabled_;
-  int draws_left_before_estimates_affected_;
 
   RollingTimeDeltaHistory begin_main_frame_to_commit_duration_history_;
   RollingTimeDeltaHistory commit_to_ready_to_activate_duration_history_;
   RollingTimeDeltaHistory prepare_tiles_duration_history_;
   RollingTimeDeltaHistory activate_duration_history_;
   RollingTimeDeltaHistory draw_duration_history_;
 
   base::TimeTicks begin_main_frame_sent_time_;
   base::TimeTicks commit_time_;
   base::TimeTicks start_prepare_tiles_time_;
   base::TimeTicks start_activate_time_;
   base::TimeTicks start_draw_time_;
 
   scoped_ptr<UMAReporter> uma_reporter_;
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CompositorTimingHistory);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_COMPOSITOR_TIMING_HISTORY_H_