Revert 278589 "Use ImageSkiaSource to create ImageSkia from Imag..."

trunk/src/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/gfx/image/image.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 225 matching lines @@
 
   std::vector<gfx::ImagePNGRep> image_png_reps;
   image_png_reps.push_back(gfx::ImagePNGRep(bytes1x, 1.0f));
   image_png_reps.push_back(gfx::ImagePNGRep(bytes2x, 2.0f));
   gfx::Image image(image_png_reps);
 
   std::vector<float> scales;
   scales.push_back(1.0f);
   scales.push_back(2.0f);
   gfx::ImageSkia image_skia = image.AsImageSkia();
+  EXPECT_TRUE(gt::ImageSkiaStructureMatches(image_skia, kSize1x, kSize1x,
+                                            scales));
   EXPECT_TRUE(gt::IsEqual(bytes1x,
       image_skia.GetRepresentation(1.0f).sk_bitmap()));
   EXPECT_TRUE(gt::IsEqual(bytes2x,
       image_skia.GetRepresentation(2.0f).sk_bitmap()));
-  EXPECT_TRUE(gt::ImageSkiaStructureMatches(image_skia, kSize1x, kSize1x,
-                                            scales));
-
-  gfx::ImageSkiaRep rep_1_6x = image_skia.GetRepresentation(1.6f);
-  ASSERT_FALSE(rep_1_6x.is_null());
-  ASSERT_EQ(1.6f, rep_1_6x.scale());
-  EXPECT_EQ("40x40", rep_1_6x.pixel_size().ToString());
-
-  gfx::ImageSkiaRep rep_0_8x = image_skia.GetRepresentation(0.8f);
-  ASSERT_FALSE(rep_0_8x.is_null());
-  ASSERT_EQ(0.8f, rep_0_8x.scale());
-  EXPECT_EQ("20x20", rep_0_8x.pixel_size().ToString());
 }
 
 TEST_F(ImageTest, MultiResolutionPNGToPlatform) {
   const int kSize1x = 25;
   const int kSize2x = 50;
 
   scoped_refptr<base::RefCountedMemory> bytes1x = gt::CreatePNGBytes(kSize1x);
   scoped_refptr<base::RefCountedMemory> bytes2x = gt::CreatePNGBytes(kSize2x);
   std::vector<gfx::ImagePNGRep> image_png_reps;
   image_png_reps.push_back(gfx::ImagePNGRep(bytes1x, 1.0f));
@@ skipping 400 matching lines @@
         gfx::ImageSkiaRep(bitmap, 1.0f)));
   }
   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