Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

gm/bitmapcopy.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 "gm.h"
 
 namespace skiagm {
 
 static const char* gColorTypeNames[] = {
     "unknown",
     "A8",
     "565",
     "4444",
     "8888",
     "8888",
     "Index8",
 };
 
 static const SkColorType gColorTypes[] = {
     kRGB_565_SkColorType,
     kARGB_4444_SkColorType,
-    kN32_SkColorType,
+    kPMColor_SkColorType,
 };
 
 #define NUM_CONFIGS SK_ARRAY_COUNT(gColorTypes)
 
 static void draw_checks(SkCanvas* canvas, int width, int height) {
     SkPaint paint;
     paint.setColor(SK_ColorRED);
     canvas->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
         SkIntToScalar(width / 2), SkIntToScalar(height / 2), paint);
     paint.setColor(SK_ColorGREEN);
@@ skipping 81 matching lines @@
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new BitmapCopyGM; }
 static GMRegistry reg(MyFactory);
 }