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

ui/ui.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'shell_dialogs.gypi',
@@ skipping 370 matching lines @@
         'gfx/font_fallback_win.h',
         'gfx/font_list.cc',
         'gfx/font_list.h',
         'gfx/font_render_params_android.cc',
         'gfx/font_render_params_linux.cc',
         'gfx/font_render_params_linux.h',
         'gfx/font_smoothing_win.cc',
         'gfx/font_smoothing_win.h',
         'gfx/gfx_paths.cc',
         'gfx/gfx_paths.h',
+        'gfx/icon_family.cc',
+        'gfx/icon_family.h',
         'gfx/image/canvas_image_source.cc',
         'gfx/image/canvas_image_source.h',
         'gfx/image/image.cc',
         'gfx/image/image.h',
         'gfx/image/image_ios.mm',
         'gfx/image/image_mac.mm',
         'gfx/image/image_png_rep.cc',
         'gfx/image/image_png_rep.h',
         'gfx/image/image_skia.cc',
         'gfx/image/image_skia.h',
@@ skipping 536 matching lines @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
             ],
           },
         },
       ],
     }],
   ],
 }