Update from https://crrev.com/304121

cc/resources/content_layer_updater.cc

 // 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.
 
 #include "cc/resources/content_layer_updater.h"
 
 #include "base/debug/trace_event.h"
-#include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/resources/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
-ContentLayerUpdater::ContentLayerUpdater(
-    scoped_ptr<LayerPainter> painter,
-    RenderingStatsInstrumentation* stats_instrumentation,
-    int layer_id)
-    : rendering_stats_instrumentation_(stats_instrumentation),
-      layer_id_(layer_id),
+ContentLayerUpdater::ContentLayerUpdater(scoped_ptr<LayerPainter> painter,
+                                         int layer_id)
+    : layer_id_(layer_id),
       layer_is_opaque_(false),
       layer_fills_bounds_completely_(false),
       painter_(painter.Pass()),
       background_color_(SK_ColorTRANSPARENT) {
 }
 
 ContentLayerUpdater::~ContentLayerUpdater() {}
 
-void ContentLayerUpdater::set_rendering_stats_instrumentation(
-    RenderingStatsInstrumentation* rsi) {
-  rendering_stats_instrumentation_ = rsi;
-}
-
 void ContentLayerUpdater::PaintContents(SkCanvas* canvas,
                                         const gfx::Size& layer_content_size,
                                         const gfx::Rect& paint_rect,
                                         float contents_width_scale,
                                         float contents_height_scale) {
   TRACE_EVENT0("cc", "ContentLayerUpdater::PaintContents");
   if (!canvas)
     return;
   canvas->save();
   canvas->translate(SkIntToScalar(-paint_rect.x()),
@@ skipping 70 matching lines @@
 
 void ContentLayerUpdater::SetFillsBoundsCompletely(bool fills_bounds) {
   layer_fills_bounds_completely_ = fills_bounds;
 }
 
 void ContentLayerUpdater::SetBackgroundColor(SkColor background_color) {
   background_color_ = background_color;
 }
 
 }  // namespace cc