Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

tools/skdiff_utils.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "skdiff.h"
 #include "skdiff_utils.h"
 #include "SkBitmap.h"
 #include "SkData.h"
@@ skipping 67 matching lines @@
    SkAutoLockPixels lock(bitmap);
    for (int y = 0; y < bitmap.height(); y++) {
        for (int x = 0; x < bitmap.width(); x++) {
            *bitmap.getAddr32(x, y) |= (SK_A32_MASK << SK_A32_SHIFT);
        }
    }
 }
 
 bool write_bitmap(const SkString& path, const SkBitmap& bitmap) {
     SkBitmap copy;
-    bitmap.copyTo(&copy, kN32_SkColorType);
+    bitmap.copyTo(&copy, kPMColor_SkColorType);
     force_all_opaque(copy);
     return SkImageEncoder::EncodeFile(path.c_str(), copy,
                                       SkImageEncoder::kPNG_Type, 100);
 }
 
 /// Return a copy of the "input" string, within which we have replaced all instances
 /// of oldSubstring with newSubstring.
 ///
 /// TODO: If we like this, we should move it into the core SkString implementation,
 /// adding more checks and ample test cases, and paying more attention to efficiency.
@@ skipping 78 matching lines @@
                 drp->fDifference.fStatus = DiffResource::kDoesNotExist_Status;
             }
             if (write_bitmap(drp->fWhite.fFullPath, drp->fWhite.fBitmap)) {
                 drp->fWhite.fStatus = DiffResource::kExists_Status;
             } else {
                 drp->fWhite.fStatus = DiffResource::kDoesNotExist_Status;
             }
         }
     }
 }