Revert 136304 - This patch makes ImageSkia more like SkBitmap. The goal is to make swapping from SkBitmap to ImageSkia easier.

Notable changes:
- ImageSkia can be cheaply copied
- Added extractSubset, will remove after SkBitmaps have been converted to ImageSkia
- Modified API to look more like SkBitmap

Review URL: https://chromiumcodereview.appspot.com/10245003

TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10383110

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136313 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc
index edbbcee..4306936 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc
@@ -218,10 +218,11 @@ TEST_F(ImageLoadingTrackerTest, MultipleImages) {
   EXPECT_EQ(1, image_loaded_count());
 
   // Check that all images were loaded.
-  const std::vector<SkBitmap> bitmaps = image_.ToImageSkia()->bitmaps();
+  const std::vector<const SkBitmap*>& bitmaps =
+      image_.ToImageSkia()->bitmaps();
   ASSERT_EQ(2u, bitmaps.size());
-  const SkBitmap* bmp1 = &bitmaps[0];
-  const SkBitmap* bmp2 = &bitmaps[1];
+  const SkBitmap* bmp1 = bitmaps[0];
+  const SkBitmap* bmp2 = bitmaps[1];
   if (bmp1->width() > bmp2->width()) {
     std::swap(bmp1, bmp2);
   }