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

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 75 matching lines @@
 
   const SkBitmap* bitmap1 = image.ToSkBitmap();
   EXPECT_FALSE(bitmap1->isNull());
   EXPECT_EQ(1U, image.RepresentationCount());
 
   EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 }
 
-TEST_F(ImageTest, SkiaToPNGEncodeAndDecode) {
-  gfx::Image image(gt::CreateBitmap(25, 25));
-  const std::vector<unsigned char>* png = image.ToImagePNG();
-  EXPECT_TRUE(png);
-  EXPECT_FALSE(png->empty());
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepPNG));
-
-  gfx::Image from_png(&png->front(), png->size());
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepPNG));
-  EXPECT_TRUE(gt::IsEqual(from_png, image));
-}
-
-TEST_F(ImageTest, PlatformToPNGEncodeAndDecode) {
-  gfx::Image image(gt::CreatePlatformImage());
-  const std::vector<unsigned char>* png = image.ToImagePNG();
-  EXPECT_TRUE(png);
-  EXPECT_FALSE(png->empty());
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepPNG));
-
-  gfx::Image from_png(&png->front(), png->size());
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepPNG));
-  EXPECT_TRUE(gt::IsPlatformImageValid(gt::ToPlatformType(image)));
-}
-
-// The platform types use the platform provided encoding/decoding of PNGs. Make
-// sure these work with the Skia Encode/Decode.
-TEST_F(ImageTest, PNGEncodeFromSkiaDecodeToPlatform) {
-  // Force the conversion sequence skia to png to platform_type.
-  gfx::Image from_skia(gt::CreateBitmap(25, 25));
-  const std::vector<unsigned char>* png = from_skia.ToImagePNG();
-  gfx::Image from_png(&png->front(), png->size());
-  gfx::Image from_platform(gt::CopyPlatformType(from_png));
-
-  EXPECT_TRUE(gt::IsPlatformImageValid(gt::ToPlatformType(from_platform)));
-  EXPECT_TRUE(gt::IsEqual(from_skia, from_platform));
-}
-
-TEST_F(ImageTest, PNGEncodeFromPlatformDecodeToSkia) {
-  // Force the conversion sequence platform_type to png to skia.
-  gfx::Image from_platform(gt::CreatePlatformImage());
-  const std::vector<unsigned char>* png = from_platform.ToImagePNG();
-  gfx::Image from_png(&png->front(), png->size());
-  gfx::Image from_skia(*from_png.ToImageSkia());
-
-  EXPECT_TRUE(gt::IsEqual(from_skia, from_platform));
-}
-
-TEST_F(ImageTest, PNGDecodeToSkiaFailure) {
-  std::vector<unsigned char> png(100, 0);
-  gfx::Image image(&png.front(), png.size());
-  const SkBitmap* bitmap = image.ToSkBitmap();
-
-  SkAutoLockPixels auto_lock(*bitmap);
-  gt::CheckColor(bitmap->getColor(10, 10), true);
-}
-
-TEST_F(ImageTest, PNGDecodeToPlatformFailure) {
-  std::vector<unsigned char> png(100, 0);
-  gfx::Image image(&png.front(), png.size());
-  gt::CheckColor(gt::GetPlatformImageColor(gt::ToPlatformType(image)), true);
-}
-
 TEST_F(ImageTest, SkiaToPlatform) {
   gfx::Image image(gt::CreateBitmap(25, 25));
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
   EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 
   EXPECT_TRUE(gt::IsPlatformImageValid(gt::ToPlatformType(image)));
   EXPECT_EQ(kRepCount, image.RepresentationCount());
@@ skipping 83 matching lines @@
     ns_image = image.CopyNSImage();
   }
 
   EXPECT_TRUE(ns_image);
   base::mac::NSObjectRelease(ns_image);
 }
 #endif
 
 TEST_F(ImageTest, CheckSkiaColor) {
   gfx::Image image(gt::CreatePlatformImage());
+  const SkBitmap* bitmap = image.ToSkBitmap();
 
-  const SkBitmap* bitmap = image.ToSkBitmap();
   SkAutoLockPixels auto_lock(*bitmap);
-  gt::CheckColor(bitmap->getColor(10, 10), false);
+  uint32_t* pixel = bitmap->getAddr32(10, 10);
+  EXPECT_EQ(SK_ColorRED, *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 (ui_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace