Makes ImageSkia more like SkBitmap

chrome/browser/web_applications/web_app_mac.mm

 // 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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 180 matching lines @@
             forKey:app_mode::kCrAppModeExtensionPathKey];
   return [plist writeToFile:plist_path atomically:YES];
 }
 
 bool WebAppShortcutCreator::UpdateIcon(const FilePath& app_path) const {
   if (info_.favicon.IsEmpty())
     return true;
 
   scoped_nsobject<IconFamily> icon_family([[IconFamily alloc] init]);
   bool image_added = false;
-  const std::vector<const SkBitmap*>& bitmaps =
-      info_.favicon.ToImageSkia()->bitmaps();
+  const std::vector<SkBitmap>& bitmaps = info_.favicon.ToImageSkia()->bitmaps();
   for (size_t i = 0; i < bitmaps.size(); ++i) {
-    NSBitmapImageRep* image_rep = SkBitmapToImageRep(*bitmaps[i]);
+    NSBitmapImageRep* image_rep = SkBitmapToImageRep(bitmaps[i]);
     if (!image_rep)
       continue;
 
     // Missing an icon size is not fatal so don't fail if adding the bitmap
     // doesn't work.
     if (!AddBitmapImageRepToIconFamily(icon_family, image_rep))
       continue;
 
     image_added = true;
   }
@@ skipping 41 matching lines @@
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   string16 bundle_id = UTF8ToUTF16(base::mac::BaseBundleID());
   WebAppShortcutCreator shortcut_creator(web_app_path, shortcut_info,
                             bundle_id);
   return shortcut_creator.CreateShortcut();
 }
 
 }  // namespace internals
 }  // namespace web_app