Update from https://crrev.com/304121

cc/layers/content_layer.cc

 // Copyright 2010 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/layers/content_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "cc/layers/content_layer_client.h"
@@ skipping 39 matching lines @@
 
 bool ContentLayer::HasDrawableContent() const {
   return client_ && TiledLayer::HasDrawableContent();
 }
 
 void ContentLayer::SetLayerTreeHost(LayerTreeHost* host) {
   TiledLayer::SetLayerTreeHost(host);
 
   if (!updater_.get())
     return;
-
-  if (host) {
-    updater_->set_rendering_stats_instrumentation(
-        host->rendering_stats_instrumentation());
-  } else {
-    updater_->set_rendering_stats_instrumentation(nullptr);
-  }
 }
 
 void ContentLayer::SetTexturePriorities(
     const PriorityCalculator& priority_calc) {
   // Update the tile data before creating all the layer's tiles.
   UpdateTileSizeAndTilingOption();
 
   TiledLayer::SetTexturePriorities(priority_calc);
 }
 
@@ skipping 24 matching lines @@
     return;
   scoped_ptr<LayerPainter> painter = ContentLayerPainter::Create(client_);
   if (layer_tree_host()->settings().per_tile_painting_enabled) {
     updater_ = BitmapSkPictureContentLayerUpdater::Create(
         painter.Pass(),
         rendering_stats_instrumentation(),
         id());
   } else {
     updater_ = BitmapContentLayerUpdater::Create(
         painter.Pass(),
-        rendering_stats_instrumentation(),
         id());
   }
   updater_->SetOpaque(contents_opaque());
   if (client_)
     updater_->SetFillsBoundsCompletely(client_->FillsBoundsCompletely());
   updater_->SetBackgroundColor(background_color());
 
   SetTextureFormat(
       layer_tree_host()->GetRendererCapabilities().best_texture_format);
 }
@@ skipping 33 matching lines @@
   return picture;
 }
 
 void ContentLayer::OnOutputSurfaceCreated() {
   SetTextureFormat(
       layer_tree_host()->GetRendererCapabilities().best_texture_format);
   TiledLayer::OnOutputSurfaceCreated();
 }
 
 }  // namespace cc