Add fuzziness to checking whether two SkBitmaps are equal for ImageTest.*

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 "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_png_rep.h"
@@ skipping 429 matching lines @@
   EXPECT_TRUE(ns_image);
   base::mac::NSObjectRelease(ns_image);
 }
 #endif
 
 TEST_F(ImageTest, CheckSkiaColor) {
   gfx::Image image(gt::CreatePlatformImage());
 
   const SkBitmap* bitmap = image.ToSkBitmap();
   SkAutoLockPixels auto_lock(*bitmap);
-  gt::CheckColor(bitmap->getColor(10, 10), false);
+  gt::CheckColors(bitmap->getColor(10, 10), SK_ColorGREEN);
 }
 
 TEST_F(ImageTest, SkBitmapConversionPreservesOrientation) {
   const int width = 50;
   const int height = 50;
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap.allocPixels();
   bitmap.eraseRGB(0, 255, 0);
 
   // Paint the upper half of the image in red (lower half is in green).
   SkCanvas canvas(bitmap);
   SkPaint red;
   red.setColor(SK_ColorRED);
   canvas.drawRect(SkRect::MakeWH(width, height / 2), red);
   {
     SCOPED_TRACE("Checking color of the initial SkBitmap");
-    gt::CheckColor(bitmap.getColor(10, 10), true);
-    gt::CheckColor(bitmap.getColor(10, 40), false);
+    gt::CheckColors(bitmap.getColor(10, 10), SK_ColorRED);
+    gt::CheckColors(bitmap.getColor(10, 40), SK_ColorGREEN);
   }
 
   // Convert from SkBitmap to a platform representation, then check the upper
   // half of the platform image to make sure it is red, not green.
   gfx::Image from_skbitmap(bitmap);
   {
     SCOPED_TRACE("Checking color of the platform image");
-    gt::CheckColor(
+    gt::CheckColors(
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 10),
-        true);
-    gt::CheckColor(
+        SK_ColorRED);
+    gt::CheckColors(
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 40),
-        false);
+        SK_ColorGREEN);
   }
 
   // Force a conversion back to SkBitmap and check that the upper half is red.
   gfx::Image from_platform(gt::CopyPlatformType(from_skbitmap));
   const SkBitmap* bitmap2 = from_platform.ToSkBitmap();
   SkAutoLockPixels auto_lock(*bitmap2);
   {
     SCOPED_TRACE("Checking color after conversion back to SkBitmap");
-    gt::CheckColor(bitmap2->getColor(10, 10), true);
-    gt::CheckColor(bitmap2->getColor(10, 40), false);
+    gt::CheckColors(bitmap2->getColor(10, 10), SK_ColorRED);
+    gt::CheckColors(bitmap2->getColor(10, 40), SK_ColorGREEN);
   }
 }
 
 TEST_F(ImageTest, SkBitmapConversionPreservesTransparency) {
   const int width = 50;
   const int height = 50;
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap.allocPixels();
   bitmap.setIsOpaque(false);
   bitmap.eraseARGB(0, 0, 255, 0);
 
   // Paint the upper half of the image in red (lower half is transparent).
   SkCanvas canvas(bitmap);
   SkPaint red;
   red.setColor(SK_ColorRED);
   canvas.drawRect(SkRect::MakeWH(width, height / 2), red);
   {
     SCOPED_TRACE("Checking color of the initial SkBitmap");
-    gt::CheckColor(bitmap.getColor(10, 10), true);
+    gt::CheckColors(bitmap.getColor(10, 10), SK_ColorRED);
     gt::CheckIsTransparent(bitmap.getColor(10, 40));
   }
 
   // Convert from SkBitmap to a platform representation, then check the upper
   // half of the platform image to make sure it is red, not green.
   gfx::Image from_skbitmap(bitmap);
   {
     SCOPED_TRACE("Checking color of the platform image");
-    gt::CheckColor(
+    gt::CheckColors(
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 10),
-        true);
+        SK_ColorRED);
     gt::CheckIsTransparent(
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 40));
   }
 
   // Force a conversion back to SkBitmap and check that the upper half is red.
   gfx::Image from_platform(gt::CopyPlatformType(from_skbitmap));
   const SkBitmap* bitmap2 = from_platform.ToSkBitmap();
   SkAutoLockPixels auto_lock(*bitmap2);
   {
     SCOPED_TRACE("Checking color after conversion back to SkBitmap");
-    gt::CheckColor(bitmap2->getColor(10, 10), true);
+    gt::CheckColors(bitmap2->getColor(10, 10), SK_ColorRED);
     gt::CheckIsTransparent(bitmap.getColor(10, 40));
   }
 }
 
 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());
@@ skipping 90 matching lines @@
         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 (ui_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace