Begin kLegacyFontHost_InitType cleanup

tests/SkImageTest.cpp

Index: tests/SkImageTest.cpp
diff --git a/tests/SkImageTest.cpp b/tests/SkImageTest.cpp
index 3ba63b425891bcb237b8c0eb37375907ac1c75f9..c058ef062bf471dbb6a7df024934e114a2971e6a 100644
--- a/tests/SkImageTest.cpp
+++ b/tests/SkImageTest.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmapDevice.h"
+#include "SkCanvas.h"
 #include "SkImagePriv.h"
 #include "Test.h"
 
@@ -19,8 +19,7 @@ DEF_TEST(SkImageFromBitmap_extractSubset, reporter) {
         SkBitmap srcBitmap;
         srcBitmap.allocN32Pixels(gWidth, gHeight);
         srcBitmap.eraseColor(SK_ColorRED);
-        SkBitmapDevice dev(srcBitmap);
-        SkCanvas canvas(&dev);
+        SkCanvas canvas(srcBitmap);
         SkIRect r = SkIRect::MakeXYWH(5, 5, gWidth - 5, gWidth - 5);
         SkPaint p;
         p.setColor(SK_ColorGREEN);
@@ -32,8 +31,7 @@ DEF_TEST(SkImageFromBitmap_extractSubset, reporter) {
 
     SkBitmap tgt;
     tgt.allocN32Pixels(gWidth, gHeight);
-    SkBitmapDevice dev(tgt);
-    SkCanvas canvas(&dev);
+    SkCanvas canvas(tgt);
     canvas.clear(SK_ColorTRANSPARENT);
     canvas.drawImage(image, 0, 0, NULL);