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

ui/gfx/image/image_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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_unittest_util.h"
 
 #if defined(TOOLKIT_GTK)
@@ skipping 176 matching lines @@
   {
     gfx::Image image(gt::CreateBitmap(25, 25));
     ns_image = image.CopyNSImage();
   }
 
   EXPECT_TRUE(ns_image);
   base::mac::NSObjectRelease(ns_image);
 }
 #endif
 
+inline uint32_t SetPackedColor(uint8_t a, uint8_t r, uint8_t g, uint8_t b) {

[sky, 2012/08/02 21:02:00]

There are functions in skia for creating a color from a specific argb. Can you
use it?

+  // Pack colors according to the order of alpha and rgb
+  return (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
+         (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
+}
+
 TEST_F(ImageTest, CheckSkiaColor) {
   gfx::Image image(gt::CreatePlatformImage());
   const SkBitmap* bitmap = image.ToSkBitmap();
 
   SkAutoLockPixels auto_lock(*bitmap);
   uint32_t* pixel = bitmap->getAddr32(10, 10);
-  EXPECT_EQ(SK_ColorRED, *pixel);
+  // Expect the red color
+  EXPECT_EQ(SetPackedColor(0xFF, 0xFF, 0x00, 0x00), *pixel);
 }
 
 TEST_F(ImageTest, SwapRepresentations) {
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
   gfx::Image image1(gt::CreateBitmap(25, 25));
   const SkBitmap* bitmap1 = image1.ToSkBitmap();
   EXPECT_EQ(1U, image1.RepresentationCount());
 
   gfx::Image image2(gt::CreatePlatformImage());
@@ skipping 101 matching lines @@
     image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
   }
   EXPECT_TRUE(!image.ToSkBitmap()->isNull());
 }
 
 // Integration tests with UI toolkit frameworks require linking against the
 // Views library and cannot be here (gfx_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace