Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

include/core/SkImageInfo.h

Index: include/core/SkImageInfo.h
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index 83919549d53e17f68856c5244ce26569dc7ddc9c..1c73d959af54d55852516ca369bd933591a22655 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -80,15 +80,11 @@
     kLastEnum_SkColorType = kIndex_8_SkColorType,
 
 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
-    kN32_SkColorType = kBGRA_8888_SkColorType,
+    kPMColor_SkColorType = kBGRA_8888_SkColorType
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
-    kN32_SkColorType = kRGBA_8888_SkColorType,
+    kPMColor_SkColorType = kRGBA_8888_SkColorType
 #else
 #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
-#endif
-
-#ifdef SK_SUPPORT_LEGACY_N32_NAME
-    kPMColor_SkColorType = kN32_SkColorType
 #endif
 };
 
@@ -140,7 +136,7 @@
      */
     static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
         SkImageInfo info = {
-            width, height, kN32_SkColorType, at
+            width, height, kPMColor_SkColorType, at
         };
         return info;
     }
@@ -150,7 +146,7 @@
      */
     static SkImageInfo MakeN32Premul(int width, int height) {
         SkImageInfo info = {
-            width, height, kN32_SkColorType, kPremul_SkAlphaType
+            width, height, kPMColor_SkColorType, kPremul_SkAlphaType
         };
         return info;
     }