Revert 225751 "BitmapContentLayerUpdater shouldn't reallocate bi..."

trunk/src/ui/compositor/layer_unittest.cc

Index: trunk/src/ui/compositor/layer_unittest.cc
===================================================================
--- trunk/src/ui/compositor/layer_unittest.cc	(revision 238278)
+++ trunk/src/ui/compositor/layer_unittest.cc	(working copy)
@@ -180,9 +180,8 @@
 
   // Overridden from LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
-    SkIRect clip_bounds;
-    canvas->sk_canvas()->getClipDeviceBounds(&clip_bounds);
-    paint_size_ = gfx::Size(clip_bounds.width(), clip_bounds.height());
+    gfx::ImageSkiaRep contents = canvas->ExtractImageRep();
+    paint_size_ = gfx::Size(contents.pixel_width(), contents.pixel_height());
     canvas->FillRect(gfx::Rect(paint_size_), colors_[color_index_]);
     color_index_ = (color_index_ + 1) % static_cast<int>(colors_.size());
     const SkMatrix& matrix = canvas->sk_canvas()->getTotalMatrix();