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

trunk/src/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 "ui/gfx/image/image_unittest_util.h"
 
 #include <cmath>
@@ skipping 62 matching lines @@
 
 gfx::Image CreateImage() {
   return CreateImage(100, 50);
 }
 
 gfx::Image CreateImage(int width, int height) {
   return gfx::Image::CreateFrom1xBitmap(CreateBitmap(width, height));
 }
 
 bool IsEqual(const gfx::Image& img1, const gfx::Image& img2) {
-  img1.AsImageSkia().EnsureRepsForSupportedScales();
-  img2.AsImageSkia().EnsureRepsForSupportedScales();
   std::vector<gfx::ImageSkiaRep> img1_reps = img1.AsImageSkia().image_reps();
   gfx::ImageSkia image_skia2 = img2.AsImageSkia();
   if (image_skia2.image_reps().size() != img1_reps.size())
     return false;
 
   for (size_t i = 0; i < img1_reps.size(); ++i) {
     float scale = img1_reps[i].scale();
     const gfx::ImageSkiaRep& image_rep2 = image_skia2.GetRepresentation(scale);
     if (image_rep2.scale() != scale ||
         !IsEqual(img1_reps[i].sk_bitmap(), image_rep2.sk_bitmap())) {
@@ skipping 160 matching lines @@
 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
 #if defined(OS_MACOSX)
   return image1 == image2;
 #else
   return image1.BackedBySameObjectAs(image2);
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx