cc: Switch RenderingStats collection in Layer::Update() to RenderingStatsInstrumentation

cc/layers/content_layer.cc

Index: cc/layers/content_layer.cc
diff --git a/cc/layers/content_layer.cc b/cc/layers/content_layer.cc
index 540f01f18dcab02f7742058ceb4c651d0ef26802..76b21d780f423fc8a237943b094c97022da522d5 100644
--- a/cc/layers/content_layer.cc
+++ b/cc/layers/content_layer.cc
@@ -66,8 +66,7 @@ void ContentLayer::SetTexturePriorities(
 }
 
 void ContentLayer::Update(ResourceUpdateQueue* queue,
-                          const OcclusionTracker* occlusion,
-                          RenderingStats* stats) {
+                          const OcclusionTracker* occlusion) {
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
@@ -75,7 +74,7 @@ void ContentLayer::Update(ResourceUpdateQueue* queue,
     CreateUpdaterIfNeeded();
   }
 
-  TiledLayer::Update(queue, occlusion, stats);
+  TiledLayer::Update(queue, occlusion);
   needs_display_ = false;
 }
 
@@ -93,11 +92,17 @@ void ContentLayer::CreateUpdaterIfNeeded() {
   scoped_ptr<LayerPainter> painter =
       ContentLayerPainter::Create(client_).PassAs<LayerPainter>();
   if (layer_tree_host()->settings().accelerate_painting)
-    updater_ = SkPictureContentLayerUpdater::Create(painter.Pass());
+    updater_ = SkPictureContentLayerUpdater::Create(
+        painter.Pass(),
+        rendering_stats_instrumentation());
   else if (layer_tree_host()->settings().per_tile_painting_enabled)
-    updater_ = BitmapSkPictureContentLayerUpdater::Create(painter.Pass());
+    updater_ = BitmapSkPictureContentLayerUpdater::Create(
+        painter.Pass(),
+        rendering_stats_instrumentation());
   else
-    updater_ = BitmapContentLayerUpdater::Create(painter.Pass());
+    updater_ = BitmapContentLayerUpdater::Create(
+        painter.Pass(),
+        rendering_stats_instrumentation());
   updater_->SetOpaque(contents_opaque());
 
   unsigned texture_format =