Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

dm/DMBenchTask.cpp

Index: dm/DMBenchTask.cpp
diff --git a/dm/DMBenchTask.cpp b/dm/DMBenchTask.cpp
index c53daf95b49bcfbb570445501eede1ee5fe9a5aa..bcedb96f25e43b0d6854e9c1972ac2eda3f23bed 100644
--- a/dm/DMBenchTask.cpp
+++ b/dm/DMBenchTask.cpp
@@ -63,7 +63,7 @@
 }
 
 void NonRenderingBenchTask::draw() {
-    draw_raster(fBench.get(), kPMColor_SkColorType);
+    draw_raster(fBench.get(), kN32_SkColorType);
 }
 
 void CpuBenchTask::draw() {
@@ -73,7 +73,7 @@
 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));