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

chrome/browser/web_applications/web_app.h

Index: chrome/browser/web_applications/web_app.h
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h
index ceacac2d2d99871ad2ccf61e1b2faebfe7b25715..8ac7f0e8a9799cd58ba72ea839be2b54ef11d34c 100644
--- a/chrome/browser/web_applications/web_app.h
+++ b/chrome/browser/web_applications/web_app.h
@@ -17,6 +17,10 @@ namespace extensions {
 class Extension;
 }
 
+namespace gfx {
+class IconFamily;
+}
+
 namespace web_app {
 
 // Gets the user data directory for given web app. The path for the directory is
@@ -90,7 +94,8 @@ std::string GetWMClassFromAppName(std::string app_name);
 namespace internals {
 
 #if defined(OS_WIN)
-bool CheckAndSaveIcon(const base::FilePath& icon_file, const SkBitmap& image);
+bool CheckAndSaveIcon(const base::FilePath& icon_file,
+                      const gfx::IconFamily& image);
 #endif
 
 // Implemented for each platform, does the platform specific parts of creating