Revert 191086 "cc: Switch RenderingStats collection in Layer::Up..."

Looks like its DCHECKing on Win Aura interactive_ui_tests again. Same
error as before.

http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20Aura%20Tests%20%283%29&number=2148

> cc: Switch RenderingStats collection in Layer::Update() to RenderingStatsInstrumentation
> 
> This change switches all of the remaining RenderingStats collection in
> composited mode to use RenderinStatsInstrumentation.
> 
> BUG=181319
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/12426024

TBR=egraether@chromium.org
Review URL: https://codereview.chromium.org/13145002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191101 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/cc/resources/content_layer_updater.h b/cc/resources/content_layer_updater.h
index ca1f6e4..80b8a48 100644
--- a/cc/resources/content_layer_updater.h
+++ b/cc/resources/content_layer_updater.h
@@ -14,26 +14,23 @@ class SkCanvas;
 namespace cc {
 
 class LayerPainter;
-class RenderingStatsInstrumentation;
 
 // Base class for BitmapContentLayerUpdater and
 // SkPictureContentLayerUpdater that reduces code duplication between
 // their respective PaintContents implementations.
 class CC_EXPORT ContentLayerUpdater : public LayerUpdater {
  protected:
-  ContentLayerUpdater(scoped_ptr<LayerPainter> painter,
-                      RenderingStatsInstrumentation* stats_instrumentation);
+  explicit ContentLayerUpdater(scoped_ptr<LayerPainter> painter);
   virtual ~ContentLayerUpdater();
 
   void PaintContents(SkCanvas* canvas,
                      gfx::Rect content_rect,
                      float contents_width_scale,
                      float contents_height_scale,
-                     gfx::Rect* resulting_opaque_rect);
+                     gfx::Rect* resulting_opaque_rect,
+                     RenderingStats* stats);
   gfx::Rect content_rect() const { return content_rect_; }
 
-  RenderingStatsInstrumentation* rendering_stats_instrumentation_;
-
  private:
   gfx::Rect content_rect_;
   scoped_ptr<LayerPainter> painter_;