ShortcutInfo::favicon is now a gfx::ImageFamily instead of gfx::Image.

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 7dbbfdf257317016948ada30b36d0232ff2d20e8..3a44a815c19ba24c9e1361ac6cc49294a25c6deb 100644
--- a/chrome/browser/web_applications/web_app_mac_unittest.mm
+++ b/chrome/browser/web_applications/web_app_mac_unittest.mm
@@ -137,8 +137,10 @@ TEST(WebAppShortcutCreatorTest, UpdateIcon) {
   base::FilePath dst_path = scoped_temp_dir.path();
 
   ShellIntegration::ShortcutInfo info = GetShortcutInfo();
-  info.favicon = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_PRODUCT_LOGO_32);
+  gfx::Image product_logo =
+      ui::ResourceBundle::GetSharedInstance().GetImageNamed(

[Robert Sesek, 2013/04/04 18:39:02]

GetNativeImageNamed

[Matt Giuca, 2013/04/05 06:30:13]

Done.

+          IDR_PRODUCT_LOGO_32);
+  info.favicon.Add(product_logo);
   WebAppShortcutCreatorMock shortcut_creator(info);
 
   shortcut_creator.UpdateIcon(dst_path);
@@ -148,8 +150,8 @@ TEST(WebAppShortcutCreatorTest, UpdateIcon) {
   scoped_nsobject<NSImage> image([[NSImage alloc] initWithContentsOfFile:
       base::mac::FilePathToNSString(icon_path)]);
   EXPECT_TRUE(image);
-  EXPECT_EQ(info.favicon.ToSkBitmap()->width(), [image size].width);
-  EXPECT_EQ(info.favicon.ToSkBitmap()->height(), [image size].height);
+  EXPECT_EQ(product_logo.ToSkBitmap()->width(), [image size].width);

[Robert Sesek, 2013/04/04 18:39:02]

Use ->Width() and ->Height()

[Matt Giuca, 2013/04/05 06:30:13]

Done.

+  EXPECT_EQ(product_logo.ToSkBitmap()->height(), [image size].height);
 }
 
 }  // namespace web_app