Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

tests/ImageDecodingTest.cpp

Index: tests/ImageDecodingTest.cpp
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 7b2f988ffc9e806a91badeaa833fcbc4feb6852d..5d52f906b25f97b25532f269eb5354360576c128 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -395,7 +395,7 @@
         case kAlpha_8_SkColorType:   return "Alpha_8";
         case kRGB_565_SkColorType:   return "RGB_565";
         case kARGB_4444_SkColorType: return "ARGB_4444";
-        case kPMColor_SkColorType:   return "PMColor";
+        case kN32_SkColorType:       return "N32";
         case kBackwards_SkColorType: return "Backwards";
         case kIndex_8_SkColorType:   return "Index_8";
         default:                     return "ERROR";
@@ -537,7 +537,7 @@
         kAlpha_8_SkColorType,
         kRGB_565_SkColorType,
         kARGB_4444_SkColorType,  // Most decoders will fail on 4444.
-        kPMColor_SkColorType
+        kN32_SkColorType
         // Note that indexed color is left out of the list.  Lazy
         // decoding doesn't do indexed color.
     };