Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

tests/WritePixelsTest.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 "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 195 matching lines @@
     canvasInfo = secretDevBitmap.info();
     canvasRowBytes = secretDevBitmap.rowBytes();
     canvasPixels = static_cast<const uint32_t*>(secretDevBitmap.getPixels());
 
     if (NULL == canvasPixels) {
         return false;
     }
 
     if (canvasInfo.width() != DEV_W ||
         canvasInfo.height() != DEV_H ||
-        canvasInfo.colorType() != kPMColor_SkColorType) {
+        canvasInfo.colorType() != kN32_SkColorType) {
         return false;
     }
 
     const SkImageInfo bmInfo = bitmap.info();
 
     SkIRect writeRect = SkIRect::MakeXYWH(writeX, writeY, bitmap.width(), bitmap.height());
     for (int cy = 0; cy < DEV_H; ++cy) {
         for (int cx = 0; cx < DEV_W; ++cx) {
             SkPMColor canvasPixel = canvasPixels[cx];
             if (writeRect.contains(cx, cy)) {
@@ skipping 235 matching lines @@
                         SkIRect writeRect = SkIRect::MakeXYWH(rect.fLeft, rect.fTop,
                                                               bmp.width(), bmp.height());
                         bool intersects = SkIRect::Intersects(canvasRect, writeRect) ;
                         REPORTER_ASSERT(reporter, intersects == (idBefore != idAfter));
                     }
                 }
             }
         }
     }
 }