Revert of Add SkEncodedInfo to report properties of encoded image data

src/codec/SkJpegDecoderMgr.cpp

Index: src/codec/SkJpegDecoderMgr.cpp
diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp
index 8517e0dac2ec494315e67eacb8b532efe41655bb..63228bb58501000476f4888c01a4abe1656e09a2 100644
--- a/src/codec/SkJpegDecoderMgr.cpp
+++ b/src/codec/SkJpegDecoderMgr.cpp
@@ -35,20 +35,12 @@
     return result;
 }
 
-SkEncodedInfo::Color JpegDecoderMgr::getEncodedColor() {
+SkColorType JpegDecoderMgr::getColorType() {
     switch (fDInfo.jpeg_color_space) {
         case JCS_GRAYSCALE:
-            return SkEncodedInfo::kGray_Color;
-        case JCS_YCbCr:
-            return SkEncodedInfo::kYUV_Color;
-        case JCS_RGB:
-            return SkEncodedInfo::kRGB_Color;
-        case JCS_YCCK:
-            return SkEncodedInfo::kYCCK_Color;
-        case JCS_CMYK:
-            return SkEncodedInfo::kInvertedCMYK_Color;
+            return kGray_8_SkColorType;
         default:
-            return SkEncodedInfo::kUnknown_Color;
+            return kN32_SkColorType;
     }
 }