Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index ae379ef81f3add940367c986581309d062126a3f..879d90154c91124bc961b05e5b825d81991360fe 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -42,6 +42,7 @@
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 // Colors for the infobar.
@@ -407,12 +408,12 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
                            true));
 
   // Convert the model's icons from Skia to Cocoa.
-  std::vector<SkBitmap> skiaIcons;
+  std::vector<gfx::ImageSkia> skiaIcons;
   allowedTreeModel_->GetIcons(&skiaIcons);
   icons_.reset([[NSMutableArray alloc] init]);
-  for (std::vector<SkBitmap>::iterator it = skiaIcons.begin();
+  for (std::vector<gfx::ImageSkia>::iterator it = skiaIcons.begin();
        it != skiaIcons.end(); ++it) {
-    [icons_ addObject:gfx::SkBitmapToNSImage(*it)];
+    [icons_ addObject:gfx::SkBitmapToNSImage(*it->bitmap())];
   }
 
   // Default icon will be the last item in the array.