Support custom icon in search result.

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 47d96dc7d7d22d879a95abc7fa93c86b298aa49f..c3615c9ad105105b3ae0b4b5dc71b0df430771e3 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1569,6 +1569,10 @@
       'browser/ui/app_list/test/fake_profile_store.h',
       'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
     ],
+    # ChromeOS only sources of app_list.
+    'chrome_unit_tests_app_list_chromeos_sources': [
+      'browser/ui/app_list/search/launcher_search/extension_badged_icon_image_unittest.cc',
+    ],
   },
   'targets': [
     {
@@ -2605,6 +2609,9 @@
             '../ui/app_list/app_list.gyp:app_list_test_support',
           ],
         }],
+        ['enable_app_list==1 and chromeos==1', {

[Lei Zhang, 2015/05/11 19:48:07]

You need to make the same change in chrome/test/BUILD.gn.

[yawano, 2015/05/12 02:37:22]

Done.

+          'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ],
+        }],
         ['enable_plugin_installation==0', {
           'sources!': [
             'browser/plugins/plugin_installer_unittest.cc',