move SkImage::ColorType into SkColorType

tests/SurfaceTest.cpp

Index: tests/SurfaceTest.cpp
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 61c1e2d6dd0a04d8ff1d2767984df8ac084400a8..1d713e780bf522c2b209a3fd2b0144c34b4c4406 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -24,10 +24,10 @@ enum SurfaceType {
 };
 
 static SkSurface* createSurface(SurfaceType surfaceType, GrContext* context) {
-    static const SkImage::Info imageSpec = {
+    static const SkImageInfo imageSpec = {
         10,  // width
         10,  // height
-        SkImage::kPMColor_ColorType,
+        kPMColor_SkColorType,
         kPremul_SkAlphaType
     };