Consolidate icon loading on ChromeOS

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6939ab98acf5853b1d79e7814e9b9b1c47561ce8..df65ee62ab4d90678e60a43175bd630eec163d1f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1443,11 +1443,13 @@
         'browser/history/visitsegment_database.h',
         'browser/icon_loader.cc',
         'browser/icon_loader.h',
+        'browser/icon_loader_chromeos.cc',
         'browser/icon_loader_linux.cc',
         'browser/icon_loader_mac.mm',
         'browser/icon_loader_win.cc',
         'browser/icon_manager.cc',
         'browser/icon_manager.h',
+        'browser/icon_manager_chromeos.cc',
         'browser/icon_manager_linux.cc',
         'browser/icon_manager_mac.mm',
         'browser/icon_manager_win.cc',
@@ -3827,8 +3829,6 @@
         'browser/ui/webui/favicon_source.h',
         'browser/ui/webui/fileicon_source.cc',
         'browser/ui/webui/fileicon_source.h',
-        'browser/ui/webui/fileicon_source_chromeos.cc',
-        'browser/ui/webui/fileicon_source_chromeos.h',
         'browser/ui/webui/flags_ui.cc',
         'browser/ui/webui/flags_ui.h',
         'browser/ui/webui/flash_ui.cc',
@@ -4264,6 +4264,8 @@
             ['exclude', 'browser/extensions/extension_input_method_api.cc'],
             ['exclude', 'browser/extensions/extension_input_method_api.h'],
             ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
+            ['exclude', 'browser/icon_loader_chromeos.cc'],
+            ['exclude', 'browser/icon_manager_chromeos.cc'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],
             ['exclude', 'browser/policy/auto_enrollment_client.cc'],
@@ -4290,8 +4292,6 @@
             ['exclude', 'browser/ui/webui/about_page/about_page_ui.cc'],
             ['exclude', 'browser/ui/webui/about_page/about_page_ui.h'],
             ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
-            ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
-            ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
           ],
         }],
         ['chromeos==1', {
@@ -4308,6 +4308,8 @@
             'browser/first_run/upgrade_util.cc',
             'browser/first_run/upgrade_util.h',
             'browser/first_run/upgrade_util_linux.cc',
+            'browser/icon_loader_linux.cc',
+            'browser/icon_manager_linux.cc',
             'browser/idle_linux.cc',
             'browser/password_manager/native_backend_gnome_x.cc',
             'browser/password_manager/native_backend_gnome_x.h',