Makes ImageSkia more like SkBitmap

chrome/browser/extensions/image_loading_tracker_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 "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 200 matching lines @@
 
   // The image isn't cached, so we should not have received notification.
   EXPECT_EQ(0, image_loaded_count());
 
   WaitForImageLoad();
 
   // We should have gotten the image.
   EXPECT_EQ(1, image_loaded_count());
 
   // Check that all images were loaded.
-  const std::vector<const SkBitmap*>& bitmaps =
-      image_.ToImageSkia()->bitmaps();
+  const std::vector<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);
   }
   EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_BITTY, bmp1->width());
   EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_SMALLISH, bmp2->width());
 }
 
 // Tests IsComponentExtensionResource function.
 TEST_F(ImageLoadingTrackerTest, IsComponentExtensionResource) {
   scoped_refptr<Extension> extension(CreateExtension(
       "file_manager", Extension::COMPONENT));
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource resource =
       extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_BITTY,
                                  ExtensionIconSet::MATCH_EXACTLY);
 
 #if defined(FILE_MANAGER_EXTENSION)
   ImageLoadingTracker loader(this);
   int resource_id;
   ASSERT_EQ(true,
             loader.IsComponentExtensionResource(extension.get(),
                                                 resource,
                                                 resource_id));
   ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id);
 #endif
 }