Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

gm/gammatext.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"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 22 matching lines @@
     }
     return false;
 }
 
 #ifdef SK_BUILD_FOR_MAC
 #import <ApplicationServices/ApplicationServices.h>
 #define BITMAP_INFO_RGB     (kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host)
 
 static CGContextRef makeCG(const SkImageInfo& info, const void* addr,
                            size_t rowBytes) {
-    if (kN32_SkColorType != info.colorType() || NULL == addr) {
+    if (kPMColor_SkColorType != info.colorType() || NULL == addr) {
         return NULL;
     }
     CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
     CGContextRef cg = CGBitmapContextCreate((void*)addr, info.width(), info.height(),
                                             8, rowBytes, space, BITMAP_INFO_RGB);
     CFRelease(space);
 
     CGContextSetAllowsFontSubpixelQuantization(cg, false);
     CGContextSetShouldSubpixelQuantizeFonts(cg, false);
 
@@ skipping 147 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new GammaTextGM; }
 static GMRegistry reg(MyFactory);
 
 }