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

Original code review: https://chromiumcodereview.appspot.com/10980008/
Reverted by: https://codereview.chromium.org/10993005/

This CL fixes builtin_provider_unittest.cc which was broken by the
previous CL.

BUG=136996


Review URL: https://chromiumcodereview.appspot.com/10993018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158753 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 23 insertions, 14 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 248a53a..1a0e33b 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -23,41 +23,40 @@ namespace {
 const char* const kPaths[] = {
   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
@@ -79,8 +78,18 @@ const char* const kPaths[] = {
   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