Expose array of bitmaps contained by gfx::Image similar to NSImage

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"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_service.h"
 #include "content/test/test_browser_thread.h"
 #include "grit/component_extension_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
 
 using content::BrowserThread;
 
 class ImageLoadingTrackerTest : public testing::Test,
                                 public ImageLoadingTracker::Observer {
  public:
   ImageLoadingTrackerTest()
       : image_loaded_count_(0),
         quit_in_image_loaded_(false),
@@ skipping 180 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.
-  ASSERT_EQ(2u, image_.GetNumberOfSkBitmaps());
-  const SkBitmap* bmp1 = image_.GetSkBitmapAtIndex(0);
-  const SkBitmap* bmp2 = image_.GetSkBitmapAtIndex(1);
+  const std::vector<const SkBitmap*>& bitmaps = image.ToImageSkia().bitmaps();
+  ASSERT_EQ(2u, bitmaps.size());
+  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
 }