Revert 254567 "don't create SkDevice directly, use SkBitmap or (..."

trunk/src/skia/ext/benchmarking_canvas.cc

Index: trunk/src/skia/ext/benchmarking_canvas.cc
===================================================================
--- trunk/src/skia/ext/benchmarking_canvas.cc	(revision 254711)
+++ trunk/src/skia/ext/benchmarking_canvas.cc	(working copy)
@@ -6,6 +6,7 @@
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "skia/ext/benchmarking_canvas.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/utils/SkProxyCanvas.h"
 
 namespace skia {
@@ -24,7 +25,9 @@
 public:
   TimingCanvas(int width, int height, const BenchmarkingCanvas* track_canvas)
       : tracking_canvas_(track_canvas) {
-    canvas_ = skia::AdoptRef(SkCanvas::NewRasterN32(width, height));
+    skia::RefPtr<SkBaseDevice> device = skia::AdoptRef(
+        SkNEW_ARGS(SkBitmapDevice, (SkBitmap::kARGB_8888_Config, width, height)));
+    canvas_ = skia::AdoptRef(SkNEW_ARGS(SkCanvas, (device.get())));
 
     setProxy(canvas_.get());
   }