Add support for multiple icon sizes for Mac platform apps

chrome/browser/web_applications/web_app_mac_unittest.mm

Index: chrome/browser/web_applications/web_app_mac_unittest.mm
diff --git a/chrome/browser/web_applications/web_app_mac_unittest.mm b/chrome/browser/web_applications/web_app_mac_unittest.mm
index 6d95261679e5511a294dad81f820a811df924a7a..bfa5c84806a7f918f11adbe68639a61b31cd861d 100644
--- a/chrome/browser/web_applications/web_app_mac_unittest.mm
+++ b/chrome/browser/web_applications/web_app_mac_unittest.mm
@@ -89,8 +89,8 @@ TEST(WebAppShortcutCreatorTest, UpdateIcon) {
   FilePath dst_path = scoped_temp_dir.path();
 
   ShellIntegration::ShortcutInfo info = GetShortcutInfo();
-  info.favicon = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_PRODUCT_LOGO_32).ToSkBitmap();
+  info.favicon = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+      IDR_PRODUCT_LOGO_32);

[jeremy, 2012/03/01 10:54:39]

How hard would it be to add a test for a bitmap for which
AddBitmapImageRepToIconFamily() fails?

[sail, 2012/03/04 04:59:56]

There wasn't an easy way to do this. I'll look into this for a second CL.

   WebAppShortcutCreatorMock shortcut_creator(info);
 
   shortcut_creator.UpdateIcon(dst_path);
@@ -100,8 +100,8 @@ TEST(WebAppShortcutCreatorTest, UpdateIcon) {
   scoped_nsobject<NSImage> image([[NSImage alloc] initWithContentsOfFile:
       base::mac::FilePathToNSString(icon_path)]);
   EXPECT_TRUE(image);
-  EXPECT_EQ(info.favicon.width(), [image size].width);
-  EXPECT_EQ(info.favicon.height(), [image size].height);
+  EXPECT_EQ(info.favicon.ToSkBitmap()->width(), [image size].width);
+  EXPECT_EQ(info.favicon.ToSkBitmap()->height(), [image size].height);
 }
 
 }  // namespace web_app