Fix the PNCodec error on Android caused by different Skia color format.

ui/gfx/codec/png_codec_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if defined(USE_SYSTEM_LIBPNG)
 #include <png.h>
 #else
 #include "third_party/libpng/png.h"
 #endif
 
@@ skipping 1016 matching lines @@
 
   // Compare the original bitmap and the output bitmap. We need to
   // unpremultiply original_pixel, as the decoded bitmap doesn't have an alpha
   // channel.
   for (int x = 0; x < w; x++) {
     for (int y = 0; y < h; y++) {
       uint32_t original_pixel = original_bitmap.getAddr32(0, y)[x];
       uint32_t unpremultiplied =
           SkUnPreMultiply::PMColorToColor(original_pixel);
       uint32_t decoded_pixel = decoded_bitmap.getAddr32(0, y)[x];
-      EXPECT_TRUE(NonAlphaColorsClose(unpremultiplied, decoded_pixel))
+      uint32_t unpremultiplied_decoded =
+          SkUnPreMultiply::PMColorToColor(decoded_pixel);
+
+      EXPECT_TRUE(NonAlphaColorsClose(unpremultiplied, unpremultiplied_decoded))
           << "Original_pixel: ("
           << SkColorGetR(unpremultiplied) << ", "
           << SkColorGetG(unpremultiplied) << ", "
           << SkColorGetB(unpremultiplied) << "), "
           << "Decoded pixel: ("
-          << SkColorGetR(decoded_pixel) << ", "
-          << SkColorGetG(decoded_pixel) << ", "
-          << SkColorGetB(decoded_pixel) << ")";
+          << SkColorGetR(unpremultiplied_decoded) << ", "
+          << SkColorGetG(unpremultiplied_decoded) << ", "
+          << SkColorGetB(unpremultiplied_decoded) << ")";
     }
   }
 }
 
 TEST(PNGCodec, EncodeWithComment) {
   const int w = 10, h = 10;
 
   std::vector<unsigned char> original;
   MakeRGBImage(w, h, &original);
 
@@ skipping 65 matching lines @@
   ASSERT_EQ(w, outw);
   ASSERT_EQ(h, outh);
   ASSERT_EQ(original.size(), decoded.size());
 
   // Images must be exactly equal
   ASSERT_TRUE(original == decoded);
 }
 
 
 }  // namespace gfx