Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

tests/ImageDecodingTest.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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ skipping 377 matching lines @@
     #define kBackwards_SkColorType kBGRA_8888_SkColorType
 #else
     #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
 #endif
 
 static inline const char* SkColorType_to_string(SkColorType colorType) {
     switch(colorType) {
         case kAlpha_8_SkColorType:   return "Alpha_8";
         case kRGB_565_SkColorType:   return "RGB_565";
         case kARGB_4444_SkColorType: return "ARGB_4444";
-        case kPMColor_SkColorType:   return "PMColor";
+        case kN32_SkColorType:       return "N32";
         case kBackwards_SkColorType: return "Backwards";
         case kIndex_8_SkColorType:   return "Index_8";
         default:                     return "ERROR";
     }
 }
 
 static inline const char* options_colorType(
         const SkDecodingImageGenerator::Options& opts) {
     if (opts.fUseRequestedColorType) {
         return SkColorType_to_string(opts.fRequestedColorType);
@@ skipping 121 matching lines @@
     if (!sk_exists(directory.c_str())) {
         return;
     }
 
     int scaleList[] = {1, 2, 3, 4};
     bool ditherList[] = {true, false};
     SkColorType colorList[] = {
         kAlpha_8_SkColorType,
         kRGB_565_SkColorType,
         kARGB_4444_SkColorType,  // Most decoders will fail on 4444.
-        kPMColor_SkColorType
+        kN32_SkColorType
         // Note that indexed color is left out of the list.  Lazy
         // decoding doesn't do indexed color.
     };
     const bool useDataList[] = {true, false};
 
     for (size_t fidx = 0; fidx < SK_ARRAY_COUNT(files); ++fidx) {
         SkString path = SkOSPath::SkPathJoin(directory.c_str(), files[fidx]);
         if (!sk_exists(path.c_str())) {
             continue;
         }
@@ skipping 17 matching lines @@
                     }
                     SkDecodingImageGenerator::Options options(scaleList[i],
                                                               ditherList[j]);
                     test_options(reporter, options, encodedStream, encodedData,
                                  useDataList[m], path);
                 }
             }
         }
     }
 }