Upstreaming Cygprofile for Android.

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 5cf22285da55cb4605031e6894b0a9ac694aff02..a05b67b68847de2a2ec847755b4de6f0d80f7887 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -136,9 +136,14 @@ WebUIController* NewWebUI<AboutUI>(WebUI* web_ui, const GURL& url) {
 bool NeedsExtensionWebUI(WebUI* web_ui,
                          Profile* profile,
                          const GURL& url) {
+#if defined(OS_ANDROID)
+  // Chrome for Android doesn't have extensions.
+  return false;
+#else
   ExtensionService* service = profile ? profile->GetExtensionService() : NULL;
   return service && service->ExtensionBindingsAllowed(url) &&
       (!web_ui || TabContents::FromWebContents(web_ui->GetWebContents()));
+#endif
 }
 
 // Returns a function that can be used to create the right type of WebUI for a
@@ -448,8 +453,9 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
   // overrides. This changes urls in |kChromeUIScheme| to extension urls, and
   // allows to use ExtensionWebUI::GetFaviconForURL.
   GURL url(page_url);
+#if !defined(OS_ANDROID)
   ExtensionWebUI::HandleChromeURLOverride(&url, profile);
-
+#endif
   // All extensions but the bookmark manager get their favicon from the icons
   // part of the manifest.
   if (url.SchemeIs(chrome::kExtensionScheme) &&