Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

tests/BlitRowTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 45 matching lines @@
 }
 
 static int proc_bad(const void*, int, uint32_t, uint32_t* bad) {
     *bad = 0;
     return 0;
 }
 
 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:
         case kRGB_565_SkColorType:
             *expect = expect16;
             return proc_16;
         case kAlpha_8_SkColorType:
             *expect = expect8;
             return proc_8;
         default:
@@ skipping 17 matching lines @@
         }
     }
     return true;
 }
 
 // Make sure our blits always map src==0 to a noop, and src==FF to full opaque
 static void test_00_FF(skiatest::Reporter* reporter) {
     static const int W = 256;
 
     static const SkColorType gDstColorType[] = {
-        kPMColor_SkColorType,
+        kN32_SkColorType,
         kRGB_565_SkColorType,
     };
 
     static const struct {
         SkColor     fSrc;
         SkColor     fDst;
         SkPMColor   fResult32;
         uint16_t    fResult16;
         uint8_t     fResult8;
     } gSrcRec[] = {
@@ skipping 70 matching lines @@
 
 static bool gOnce;
 
 // Make sure our blits are invariant with the width of the blit (i.e. that
 // special case for 8 at a time have the same results as narrower blits)
 static void test_diagonal(skiatest::Reporter* reporter) {
     static const int W = 64;
     static const int H = W;
 
     static const SkColorType gDstColorType[] = {
-        kPMColor_SkColorType,
+        kN32_SkColorType,
         kRGB_565_SkColorType,
     };
 
     static const SkColor gDstBG[] = { 0, 0xFFFFFFFF };
 
     SkPaint paint;
 
     SkBitmap srcBM;
     srcBM.allocN32Pixels(W, H);
     SkRect srcR = {
@@ skipping 49 matching lines @@
                 }
             }
         }
     }
 }
 
 DEF_TEST(BlitRow, reporter) {
     test_00_FF(reporter);
     test_diagonal(reporter);
 }