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

chrome/browser/shell_integration.h

Index: chrome/browser/shell_integration.h
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index 0a365fb6ce328b0b29d6db1848af000e568a410c..25232f7bc882f96e192008df05570ee227601f16 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_family.h"
 
 class CommandLine;
 
@@ -101,7 +101,7 @@ class ShellIntegration {
     string16 title;
     string16 description;
     base::FilePath extension_path;
-    gfx::Image favicon;
+    gfx::ImageFamily favicon;
     base::FilePath profile_path;
   };