Cleanup gfx::Canvas now that 10562027 has landed

ui/base/native_theme/native_theme_android.cc

Index: ui/base/native_theme/native_theme_android.cc
diff --git a/ui/base/native_theme/native_theme_android.cc b/ui/base/native_theme/native_theme_android.cc
index a9165e877ddbdbe90b224b40920e265a98b9f67c..241d645063aa29cf215ee3ac60fba6a37888b876 100644
--- a/ui/base/native_theme/native_theme_android.cc
+++ b/ui/base/native_theme/native_theme_android.cc
@@ -8,6 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/layout.h"
@@ -670,8 +671,9 @@ void NativeThemeAndroid::DrawImageInt(SkCanvas* sk_canvas,
   SkMatrix m = sk_canvas->getTotalMatrix();
   ui::ScaleFactor device_scale_factor = ui::GetScaleFactorFromScale(
       SkScalarAbs(m.getScaleX()));
-  gfx::Canvas canvas(sk_canvas, device_scale_factor, false);
-  canvas.DrawImageInt(image, src_x, src_y, src_w, src_h,
+  scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
+      sk_canvas, device_scale_factor));
+  canvas->DrawImageInt(image, src_x, src_y, src_w, src_h,
       dest_x, dest_y, dest_w, dest_h, true);
 }
 
@@ -690,8 +692,9 @@ void NativeThemeAndroid::DrawTiledImage(SkCanvas* sk_canvas,
   SkMatrix m = sk_canvas->getTotalMatrix();
   ui::ScaleFactor device_scale_factor = ui::GetScaleFactorFromScale(
       SkScalarAbs(m.getScaleX()));
-  gfx::Canvas canvas(sk_canvas, device_scale_factor, false);
-  canvas.TileImageInt(image, src_x, src_y, tile_scale_x,
+  scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
+      sk_canvas, device_scale_factor));
+  canvas->TileImageInt(image, src_x, src_y, tile_scale_x,
       tile_scale_y, dest_x, dest_y, w, h);
 }