Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

ui/compositor/layer_unittest.cc

Index: ui/compositor/layer_unittest.cc
===================================================================
--- ui/compositor/layer_unittest.cc	(revision 147935)
+++ ui/compositor/layer_unittest.cc	(working copy)
@@ -238,8 +238,8 @@
 
   // Overridden from LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
-    gfx::ImageSkiaRep contents = canvas->ExtractImageRep();
-    paint_size_ = gfx::Size(contents.GetWidth(), contents.GetHeight());
+    SkBitmap contents = canvas->ExtractBitmap();
+    paint_size_ = gfx::Size(contents.width(), contents.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();