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

ui/ui_unittests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'ui_test_support',
       'type': 'static_library',
       'dependencies': [
@@ skipping 61 matching lines @@
         'base/range/range_unittest.cc',
         'base/range/range_win_unittest.cc',
         'base/resource/data_pack_literal.cc',
         'base/resource/data_pack_unittest.cc',
         'base/resource/resource_bundle_unittest.cc',
         'base/text/text_elider_unittest.cc',
         'gfx/codec/png_codec_unittest.cc',
         'gfx/color_utils_unittest.cc',
         'gfx/display_unittest.cc',
         'gfx/font_unittest.cc',
+        'gfx/icon_family_unittest.cc',
         'gfx/image/image_skia_unittest.cc',
         'gfx/image/image_unittest.cc',
         'gfx/image/image_unittest_util.cc',
         'gfx/image/image_unittest_util.h',
         'gfx/image/image_unittest_util_ios.mm',
         'gfx/image/image_unittest_util_mac.mm',
         'gfx/insets_unittest.cc',
         'gfx/matrix3_unittest.cc',
         'gfx/point_unittest.cc',
         'gfx/point3_unittest.cc',
@@ skipping 214 matching lines @@
           'variables': {
             'test_suite_name': 'ui_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }