Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

dm/DMBenchTask.cpp

 #include "DMBenchTask.h"
 #include "DMUtil.h"
 #include "SkSurface.h"
 
 namespace DM {
 
 static SkString bench_name(const char* name, const char* config) {
     SkString result("bench ");
     result.appendf("%s_%s", name, config);
     return result;
@@ skipping 45 matching lines @@
     SkBitmap bitmap;
     SetupBitmap(colorType, bench, &bitmap);
     SkCanvas canvas(bitmap);
 
     bench->preDraw();
     bench->draw(1, &canvas);
     bench->postDraw();
 }
 
 void NonRenderingBenchTask::draw() {
-    draw_raster(fBench.get(), kPMColor_SkColorType);
+    draw_raster(fBench.get(), kN32_SkColorType);
 }
 
 void CpuBenchTask::draw() {
     draw_raster(fBench.get(), fColorType);
 }
 
 void GpuBenchTask::draw(GrContextFactory* grFactory) {
     SkImageInfo info = SkImageInfo::Make(fBench->getSize().x(),
                                          fBench->getSize().y(),
-                                         kPMColor_SkColorType,
+                                         kN32_SkColorType,
                                          kPremul_SkAlphaType);
     SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount));
 
     fBench->preDraw();
     fBench->draw(1, surface->getCanvas());
     fBench->postDraw();
 }
 
 }  // namespace DM