Reland kPMColor_SkColorType to kN32_SkColorType.

tests/BlitRowTest.cpp

Index: tests/BlitRowTest.cpp
diff --git a/tests/BlitRowTest.cpp b/tests/BlitRowTest.cpp
index b8ac0c06c79a1dc505baefb7ab86d30353089ad2..911f2a0f40a4ca5c2663ebc6bdf3f3cc5c031d89 100644
--- a/tests/BlitRowTest.cpp
+++ b/tests/BlitRowTest.cpp
@@ -63,7 +63,7 @@ static int proc_bad(const void*, int, uint32_t, uint32_t* bad) {
 static Proc find_proc(const SkBitmap& bm, SkPMColor expect32, uint16_t expect16,
                       uint8_t expect8, uint32_t* expect) {
     switch (bm.colorType()) {
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             *expect = expect32;
             return proc_32;
         case kARGB_4444_SkColorType:
@@ -101,7 +101,7 @@ static void test_00_FF(skiatest::Reporter* reporter) {
     static const int W = 256;
 
     static const SkColorType gDstColorType[] = {
-        kPMColor_SkColorType,
+        kN32_SkColorType,
         kRGB_565_SkColorType,
     };
 
@@ -192,7 +192,7 @@ static void test_diagonal(skiatest::Reporter* reporter) {
     static const int H = W;
 
     static const SkColorType gDstColorType[] = {
-        kPMColor_SkColorType,
+        kN32_SkColorType,
         kRGB_565_SkColorType,
     };