Remove --enable-per-tile-painting and --ui-enable-per-tile-painting.

ui/compositor/layer_unittest.cc

Index: ui/compositor/layer_unittest.cc
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index a384f328a28eb847b498e5d6258850b6ae5387ce..339aaaaff3fd382a8ec5f3424ff4e4224dd0a425 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -234,8 +234,9 @@ class TestLayerDelegate : public LayerDelegate {
 
   // Overridden from LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
-    gfx::ImageSkiaRep contents = canvas->ExtractImageRep();
-    paint_size_ = gfx::Size(contents.pixel_width(), contents.pixel_height());
+    skia::RefPtr<SkBaseDevice> device =
+        skia::SharePtr(canvas->sk_canvas()->getTopDevice());
+    paint_size_ = gfx::Size(device->width(), device->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();