Revert 242262 "Revert of https://codereview.chromium.org/119913003/"

trunk/src/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Index: trunk/src/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	(revision 243216)
+++ trunk/src/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	(working copy)
@@ -244,6 +244,8 @@
     return &NewWebUI<ExternalWebDialogUI>;
   if (url.host() == chrome::kChromeUICloudPrintSetupHost)
     return &NewWebUI<WebDialogUI>;
+  if (url.host() == chrome::kChromeUIComponentsHost)
+    return &NewWebUI<ComponentsUI>;
   if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL)
     return &NewWebUI<ConstrainedWebDialogUI>;
   if (url.host() == chrome::kChromeUICrashesHost)
@@ -351,9 +353,6 @@
   // Android does not support plugins for now.
   if (url.host() == chrome::kChromeUIPluginsHost)
     return &NewWebUI<PluginsUI>;
-  // Android does not support components for now.
-  if (url.host() == chrome::kChromeUIComponentsHost)
-    return &NewWebUI<ComponentsUI>;
   // Settings are implemented with native UI elements on Android.
   if (url.host() == chrome::kChromeUISettingsFrameHost)
     return &NewWebUI<options::OptionsUI>;
@@ -618,6 +617,10 @@
   if (!content::HasWebUIScheme(page_url))
     return NULL;
 
+  if (page_url.host() == chrome::kChromeUIComponentsHost)
+    return ComponentsUI::GetFaviconResourceBytes(scale_factor);
+  return NULL;
+
 #if defined(OS_WIN)
   if (page_url.host() == chrome::kChromeUIConflictsHost)
     return ConflictsUI::GetFaviconResourceBytes(scale_factor);
@@ -660,10 +663,5 @@
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes(scale_factor);
 
-  // Android doesn't use the components pages.
-  if (page_url.host() == chrome::kChromeUIComponentsHost)
-    return ComponentsUI::GetFaviconResourceBytes(scale_factor);
 #endif
-
-  return NULL;
 }