Re-land r158555: "[Android] Exclude unsupported URLs from chrome://chrome-urls."

chrome/browser/browser_about_handler.cc

Index: chrome/browser/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 8ea02a9c1565a3bd2f496bc456b2a4e92d3b74a5..0eef437683d2aef202c16d41862f47cb9f57c352 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -22,41 +22,40 @@ namespace {
 const char* const kChromePaths[] = {
   chrome::kChromeUIAppCacheInternalsHost,
   chrome::kChromeUIBlobInternalsHost,
-  chrome::kChromeUIBookmarksHost,
   chrome::kChromeUICacheHost,
   chrome::kChromeUIChromeURLsHost,
   chrome::kChromeUICrashesHost,
   chrome::kChromeUICreditsHost,
   chrome::kChromeUIDNSHost,
-  chrome::kChromeUIDownloadsHost,
-  chrome::kChromeUIExtensionsHost,
-  chrome::kChromeUIFlagsHost,
-  chrome::kChromeUIFlashHost,
   chrome::kChromeUIGpuInternalsHost,
   chrome::kChromeUIHistoryHost,
   chrome::kChromeUIIPCHost,
-  chrome::kChromeUIInspectHost,
   chrome::kChromeUIMediaInternalsHost,
   chrome::kChromeUIMemoryHost,
-  chrome::kChromeUINaClHost,
   chrome::kChromeUINetInternalsHost,
   chrome::kChromeUINetworkViewCacheHost,
   chrome::kChromeUINewTabHost,
   chrome::kChromeUIOmniboxHost,
-  chrome::kChromeUIPluginsHost,
-  chrome::kChromeUIPolicyHost,
   chrome::kChromeUIPredictorsHost,
   chrome::kChromeUIProfilerHost,
   chrome::kChromeUIQuotaInternalsHost,
-  chrome::kChromeUISettingsHost,
   chrome::kChromeUIStatsHost,
   chrome::kChromeUISyncInternalsHost,
-#if defined(OS_CHROMEOS)
-  chrome::kChromeUITaskManagerHost,
-#endif
   chrome::kChromeUITermsHost,
-  chrome::kChromeUITracingHost,
   chrome::kChromeUIVersionHost,
+#if defined(OS_ANDROID)
+  chrome::kChromeUIWelcomeHost,
+#else
+  chrome::kChromeUIBookmarksHost,
+  chrome::kChromeUIDownloadsHost,
+  // TODO(dfalcantara): Enable after http://crbug.com/143146 is fixed.
+  chrome::kChromeUIFlagsHost,
+  chrome::kChromeUIFlashHost,
+  chrome::kChromeUIInspectHost,
+  chrome::kChromeUIPluginsHost,
+  chrome::kChromeUISettingsHost,
+  chrome::kChromeUITracingHost,
+#endif
 #if defined(OS_WIN)
   chrome::kChromeUIConflictsHost,
 #endif
@@ -78,8 +77,18 @@ const char* const kChromePaths[] = {
   chrome::kChromeUIOSCreditsHost,
   chrome::kChromeUIProxySettingsHost,
   chrome::kChromeUISystemInfoHost,
+  chrome::kChromeUITaskManagerHost,
   chrome::kChromeUIWallpaperHost,
 #endif
+#if !defined(DISABLE_NACL)
+  chrome::kChromeUINaClHost,
+#endif
+#if defined(ENABLE_CONFIGURATION_POLICY)
+  chrome::kChromeUIPolicyHost,
+#endif
+#if defined(ENABLE_EXTENSIONS)
+  chrome::kChromeUIExtensionsHost,
+#endif
 #if defined(ENABLE_PRINTING)
   chrome::kChromeUIPrintHost,
 #endif