move SkImage::ColorType into SkColorType

tests/CachedDecodingPixelRefTest.cpp

Index: tests/CachedDecodingPixelRefTest.cpp
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index e3b249923eb98386d474734e395c38f4c55aa0fb..08d492cda1eee262746c4e77cb9a14267776f76e 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -55,7 +55,7 @@ static SkData* create_data_from_bitmap(const SkBitmap& bm,
 static bool simple_bitmap_factory(SkBitmapFactory::DecodeProc proc,
                                   SkData* data,
                                   SkBitmap* dst) {
-    SkImage::Info info;
+    SkImageInfo info;
     if (!proc(data->data(), data->size(), &info, NULL)) {
         return false;
     }