Update from https://crrev.com/304121

cc/debug/rendering_stats_instrumentation.cc

 // Copyright 2013 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/debug/rendering_stats_instrumentation.h"
 
 namespace cc {
 
 // static
 scoped_ptr<RenderingStatsInstrumentation>
     RenderingStatsInstrumentation::Create() {
   return make_scoped_ptr(new RenderingStatsInstrumentation());
 }
 
 RenderingStatsInstrumentation::RenderingStatsInstrumentation()
     : record_rendering_stats_(false) {
 }
 
 RenderingStatsInstrumentation::~RenderingStatsInstrumentation() {}
 
-RenderingStats::MainThreadRenderingStats
-RenderingStatsInstrumentation::main_thread_rendering_stats() {
-  base::AutoLock scoped_lock(lock_);
-  return main_thread_rendering_stats_;
-}
-
-RenderingStats::ImplThreadRenderingStats
-RenderingStatsInstrumentation::impl_thread_rendering_stats() {
+RenderingStats RenderingStatsInstrumentation::impl_thread_rendering_stats() {
   base::AutoLock scoped_lock(lock_);
   return impl_thread_rendering_stats_;
 }
 
 RenderingStats RenderingStatsInstrumentation::GetRenderingStats() {
   base::AutoLock scoped_lock(lock_);
   RenderingStats rendering_stats;
-  rendering_stats.main_stats = main_thread_rendering_stats_accu_;
-  rendering_stats.main_stats.Add(main_thread_rendering_stats_);
-  rendering_stats.impl_stats = impl_thread_rendering_stats_accu_;
-  rendering_stats.impl_stats.Add(impl_thread_rendering_stats_);
+  rendering_stats = impl_thread_rendering_stats_accu_;
+  rendering_stats.Add(impl_thread_rendering_stats_);
   return rendering_stats;
 }
 
-void RenderingStatsInstrumentation::AccumulateAndClearMainThreadStats() {
-  base::AutoLock scoped_lock(lock_);
-  main_thread_rendering_stats_accu_.Add(main_thread_rendering_stats_);
-  main_thread_rendering_stats_ = RenderingStats::MainThreadRenderingStats();
-}
-
 void RenderingStatsInstrumentation::AccumulateAndClearImplThreadStats() {
   base::AutoLock scoped_lock(lock_);
   impl_thread_rendering_stats_accu_.Add(impl_thread_rendering_stats_);
-  impl_thread_rendering_stats_ = RenderingStats::ImplThreadRenderingStats();
+  impl_thread_rendering_stats_ = RenderingStats();
 }
 
 base::TimeTicks RenderingStatsInstrumentation::StartRecording() const {
   if (record_rendering_stats_) {
     if (base::TimeTicks::IsThreadNowSupported())
       return base::TimeTicks::ThreadNow();
     return base::TimeTicks::HighResNow();
   }
   return base::TimeTicks();
 }
 
 base::TimeDelta RenderingStatsInstrumentation::EndRecording(
     base::TimeTicks start_time) const {
   if (!start_time.is_null()) {
     if (base::TimeTicks::IsThreadNowSupported())
       return base::TimeTicks::ThreadNow() - start_time;
     return base::TimeTicks::HighResNow() - start_time;
   }
   return base::TimeDelta();
 }
 
 void RenderingStatsInstrumentation::IncrementFrameCount(int64 count) {
   if (!record_rendering_stats_)
     return;
 
   base::AutoLock scoped_lock(lock_);
   impl_thread_rendering_stats_.frame_count += count;
 }
 
-void RenderingStatsInstrumentation::AddPaint(base::TimeDelta duration,
-                                             int64 pixels) {
-  if (!record_rendering_stats_)
-    return;
-
-  base::AutoLock scoped_lock(lock_);
-  main_thread_rendering_stats_.paint_time += duration;
-  main_thread_rendering_stats_.painted_pixel_count += pixels;
-}
-
-void RenderingStatsInstrumentation::AddRecord(base::TimeDelta duration,
-                                              int64 pixels) {
-  if (!record_rendering_stats_)
-    return;
-
-  base::AutoLock scoped_lock(lock_);
-  main_thread_rendering_stats_.record_time += duration;
-  main_thread_rendering_stats_.recorded_pixel_count += pixels;
-}
-
 void RenderingStatsInstrumentation::AddVisibleContentArea(int64 area) {
   if (!record_rendering_stats_)
     return;
 
   base::AutoLock scoped_lock(lock_);
   impl_thread_rendering_stats_.visible_content_area += area;
 }
 
 void RenderingStatsInstrumentation::AddApproximatedVisibleContentArea(
     int64 area) {
@@ skipping 36 matching lines @@
     return;
 
   base::AutoLock scoped_lock(lock_);
   impl_thread_rendering_stats_.commit_to_activate_duration.Append(
       commit_to_activate_duration);
   impl_thread_rendering_stats_.commit_to_activate_duration_estimate.Append(
       commit_to_activate_duration_estimate);
 }
 
 }  // namespace cc