Revert r150228 "Add support for PNG representation in gfx::Image"

ui/gfx/image/image_unittest_util.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.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(TOOLKIT_GTK)
-#include <gtk/gtk.h>
 #include "ui/gfx/gtk_util.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 namespace gfx {
 namespace test {
 
 #if defined(OS_MACOSX)
 
 void SetSupportedScaleFactorsTo1xAnd2x() {
   std::vector<ui::ScaleFactor> supported_scale_factors;
   supported_scale_factors.push_back(ui::SCALE_FACTOR_100P);
   supported_scale_factors.push_back(ui::SCALE_FACTOR_200P);
   ui::test::SetSupportedScaleFactors(supported_scale_factors);
 }
 
 #endif  // OS_MACOSX
 
 const SkBitmap CreateBitmap(int width, int height) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap.allocPixels();
-  bitmap.eraseRGB(0, 255, 0);
+  bitmap.eraseRGB(255, 0, 0);
   return bitmap;
 }
 
 gfx::Image CreateImage() {
   return CreateImage(100, 50);
 }
 
 gfx::Image CreateImage(int width, int height) {
   return gfx::Image(CreateBitmap(width, height));
 }
@@ skipping 56 matching lines @@
 PlatformImage ToPlatformType(const gfx::Image& image) {
 #if defined(OS_MACOSX)
   return image.ToNSImage();
 #elif defined(TOOLKIT_GTK)
   return image.ToGdkPixbuf();
 #else
   return *image.ToSkBitmap();
 #endif
 }
 
-PlatformImage CopyPlatformType(const gfx::Image& image) {
-#if defined(OS_MACOSX)
-  return image.CopyNSImage();
-#elif defined(TOOLKIT_GTK)
-  return image.CopyGdkPixbuf();
-#else
-  return *image.ToSkBitmap();
-#endif
-}
-
-#if defined(OS_MACOSX)
-// Defined in image_unittest_util_mac.mm.
-#elif defined(TOOLKIT_GTK)
-SkColor GetPlatformImageColor(PlatformImage image) {
-  guchar* gdk_pixels = gdk_pixbuf_get_pixels(image);
-  guchar alpha = gdk_pixbuf_get_has_alpha(image) ? gdk_pixels[3] : 255;
-  return SkColorSetARGB(alpha, gdk_pixels[0], gdk_pixels[1], gdk_pixels[2]);
-}
-#else
-SkColor GetPlatformImageColor(PlatformImage image) {
-  SkAutoLockPixels auto_lock(image);
-  return image.getColor(10, 10);
-}
-#endif
-
-void CheckColor(SkColor color, bool is_red) {
-  // Be tolerant of floating point rounding and lossy color space conversions.
-  if (is_red) {
-    EXPECT_GT(SkColorGetR(color), 0.95);
-    EXPECT_LT(SkColorGetG(color), 0.05);
-  } else {
-    EXPECT_GT(SkColorGetG(color), 0.95);
-    EXPECT_LT(SkColorGetR(color), 0.05);
-  }
-  EXPECT_LT(SkColorGetB(color), 0.05);
-  EXPECT_GT(SkColorGetA(color), 0.95);
-}
-
 bool IsPlatformImageValid(PlatformImage image) {
 #if defined(OS_MACOSX) || defined(TOOLKIT_GTK)
   return image != NULL;
 #else
   return !image.isNull();
 #endif
 }
 
 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
 #if defined(OS_MACOSX) || defined(TOOLKIT_GTK)
   return image1 == image2;
 #else
   return image1.getPixels() == image2.getPixels();
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx