Fix the errors of ui unittests caused by packing colors for Android

ui/gfx/skbitmap_operations_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.
 
 #include "ui/gfx/skbitmap_operations.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
@@ skipping 255 matching lines @@
   // Shift to red.
   color_utils::HSL hsl = { 0, -1, -1 };
 
   SkBitmap shifted = SkBitmapOperations::CreateHSLShiftedBitmap(src, hsl);
 
   SkAutoLockPixels src_lock(src);
   SkAutoLockPixels shifted_lock(shifted);
 
   for (int y = 0, i = 0; y < src_h; y++) {
     for (int x = 0; x < src_w; x++) {
-      EXPECT_TRUE(ColorsClose(*shifted.getAddr32(x, y),
+      EXPECT_TRUE(ColorsClose(shifted.getColor(x, y),
                               SkColorSetARGB(255, i % 255, 0, 0)));
       i++;
     }
   }
 }
 
 // Validate HSL shift.
 TEST(SkBitmapOperationsTest, ValidateHSLShift) {
   // Note: 255/51 = 5 (exactly) => 6 including 0!
   const int inc = 51;
@@ skipping 183 matching lines @@
   // The result should be divided in half 100x43 -> 50x22 -> 25x11
   EXPECT_EQ(25, result.width());
   EXPECT_EQ(11, result.height());
 }
 
 TEST(SkBitmapOperationsTest, UnPreMultiply) {
   SkBitmap input;
   input.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
   input.allocPixels();
 
-  *input.getAddr32(0, 0) = 0x80000000;
-  *input.getAddr32(1, 0) = 0x80808080;
-  *input.getAddr32(0, 1) = 0xFF00CC88;
-  *input.getAddr32(1, 1) = 0x0000CC88;
+  // Set PMColors into the bitmap
+  *input.getAddr32(0, 0) = SkPackARGB32NoCheck(0x80, 0x00, 0x00, 0x00);
+  *input.getAddr32(1, 0) = SkPackARGB32NoCheck(0x80, 0x80, 0x80, 0x80);
+  *input.getAddr32(0, 1) = SkPackARGB32NoCheck(0xFF, 0x00, 0xCC, 0x88);
+  *input.getAddr32(1, 1) = SkPackARGB32NoCheck(0x00, 0x00, 0xCC, 0x88);
 
   SkBitmap result = SkBitmapOperations::UnPreMultiply(input);
   EXPECT_EQ(2, result.width());
   EXPECT_EQ(2, result.height());
 
   SkAutoLockPixels lock(result);
   EXPECT_EQ(0x80000000, *result.getAddr32(0, 0));
   EXPECT_EQ(0x80FFFFFF, *result.getAddr32(1, 0));
   EXPECT_EQ(0xFF00CC88, *result.getAddr32(0, 1));
   EXPECT_EQ(0x00000000u, *result.getAddr32(1, 1));  // "Division by zero".
@@ skipping 14 matching lines @@
   EXPECT_EQ(3, result.width());
   EXPECT_EQ(2, result.height());
 
   SkAutoLockPixels lock(result);
   for (int x = 0; x < input.width(); ++x) {
     for (int y = 0; y < input.height(); ++y) {
       EXPECT_EQ(*input.getAddr32(x, y), *result.getAddr32(y, x));
     }
   }
 }