move SkImage::ColorType into SkColorType

include/core/SkImageDecoder.h

Index: include/core/SkImageDecoder.h
diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h
index eac2157708354c80940a4d674b83b4811e410f6d..a7e36465539d7708c0eb8a411fba7ebb9980fd29 100644
--- a/include/core/SkImageDecoder.h
+++ b/include/core/SkImageDecoder.h
@@ -377,7 +377,7 @@ public:
      *  Sample usage:
      *  <code>
      *      // Determine the image's info: width/height/config
-     *      SkImage::Info info;
+     *      SkImageInfo info;
      *      bool success = DecodeMemoryToTarget(src, size, &info, NULL);
      *      if (!success) return;
      *      // Allocate space for the result:
@@ -389,7 +389,7 @@ public:
      *      success = DecodeMemoryToTarget(src, size, &info, &target);
      *  </code>
      */
-    static bool DecodeMemoryToTarget(const void* buffer, size_t size, SkImage::Info* info,
+    static bool DecodeMemoryToTarget(const void* buffer, size_t size, SkImageInfo* info,
                                      const SkBitmapFactory::Target* target);
 
     /** Decode the image stored in the specified SkStreamRewindable, and store the result