Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

samplecode/SampleFilterFuzz.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkBicubicImageFilter.h"
 #include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
@@ skipping 98 matching lines @@
 
 static SkDisplacementMapEffect::ChannelSelectorType make_channel_selector_type() {
     return static_cast<SkDisplacementMapEffect::ChannelSelectorType>(R(4)+1);
 }
 
 static bool valid_for_raster_canvas(const SkImageInfo& info) {
     switch (info.colorType()) {
         case kAlpha_8_SkColorType:
         case kRGB_565_SkColorType:
             return true;
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             return kPremul_SkAlphaType == info.alphaType() ||
                    kOpaque_SkAlphaType == info.alphaType();
         default:
             break;
     }
     return false;
 }
 
 static SkColorType rand_colortype() {
     return (SkColorType)R(kLastEnum_SkColorType + 1);
@@ skipping 297 matching lines @@
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ImageFilterFuzzView; }
 static SkViewRegister reg(MyFactory);