Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "SkBenchmark.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkString.h"
 #include "Test.h"
 #include "gm.h"
@@ skipping 70 matching lines @@
                          DM::Reporter* reporter,
                          DM::TaskRunner* tasks) {
 #define START(name, type, ...)                                                        \
     if (lowercase(configs[j]).equals(name)) {                                         \
         tasks->add(SkNEW_ARGS(DM::type,                                               \
                     (name, reporter, tasks, expectations, gms[i], ## __VA_ARGS__)));  \
     }
     for (int i = 0; i < gms.count(); i++) {
         for (int j = 0; j < configs.count(); j++) {
             START("565",      CpuGMTask, kRGB_565_SkColorType);
-            START("8888",     CpuGMTask, kPMColor_SkColorType);
+            START("8888",     CpuGMTask, kN32_SkColorType);
             START("gpu",      GpuGMTask, native, 0);
             START("msaa4",    GpuGMTask, native, 4);
             START("msaa16",   GpuGMTask, native, 16);
             START("nvprmsaa4", GpuGMTask, nvpr,  4);
             START("nvprmsaa16", GpuGMTask, nvpr, 16);
             START("gpunull",  GpuGMTask, null,   0);
             START("gpudebug", GpuGMTask, debug,  0);
             START("angle",    GpuGMTask, angle,  0);
             START("mesa",     GpuGMTask, mesa,   0);
         }
     }
 #undef START
 }
 
 static void kick_off_benches(const SkTDArray<BenchRegistry::Factory>& benches,
                              const SkTArray<SkString>& configs,
                              DM::Reporter* reporter,
                              DM::TaskRunner* tasks) {
 #define START(name, type, ...)                                                                 \
     if (lowercase(configs[j]).equals(name)) {                                                  \
         tasks->add(SkNEW_ARGS(DM::type, (name, reporter, tasks, benches[i], ## __VA_ARGS__))); \
     }
     for (int i = 0; i < benches.count(); i++) {
         for (int j = 0; j < configs.count(); j++) {
             START("nonrendering", NonRenderingBenchTask);
             START("565",          CpuBenchTask, kRGB_565_SkColorType);
-            START("8888",         CpuBenchTask, kPMColor_SkColorType);
+            START("8888",         CpuBenchTask, kN32_SkColorType);
             START("gpu",          GpuBenchTask, native, 0);
             START("msaa4",        GpuBenchTask, native, 4);
             START("msaa16",       GpuBenchTask, native, 16);
             START("nvprmsaa4",    GpuBenchTask, nvpr,   4);
             START("nvprmsaa16",   GpuBenchTask, nvpr,   16);
             START("gpunull",      GpuBenchTask, null,   0);
             START("gpudebug",     GpuBenchTask, debug,  0);
             START("angle",        GpuBenchTask, angle,  0);
             START("mesa",         GpuBenchTask, mesa,   0);
         }
@@ skipping 94 matching lines @@
     SkGraphics::Term();
 
     return reporter.failed() > 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif