[uber page] Uber URL cleanups.

- Prefer 'short' urls for simplicity, forward compatibility.
- Prefer url_constants over hard-coded strings.

BUG=121195
Review URL: https://chromiumcodereview.appspot.com/9836136

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

8 files changed, 26 insertions, 38 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 84247a8..35aed03 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -121,16 +121,16 @@ bool WillHandleBrowserAboutURL(GURL* url,
   } else if (host == chrome::kChromeUIExtensionsHost) {
     host = chrome::kChromeUIUberHost;
     path = chrome::kChromeUIExtensionsHost + url->path();
-  } else if (host == chrome::kChromeUIHistoryHost) {
-    host = chrome::kChromeUIUberHost;
-    path = chrome::kChromeUIHistoryHost + url->path();
   // Redirect chrome://settings/extensions.
-  // TODO(csilv): Fix all code paths for this page once Uber page is enabled
-  // permanently.
+  // TODO(csilv): Remove this URL after M22 (legacy URL).
   } else if (host == chrome::kChromeUISettingsHost &&
       url->path() == std::string("/") + chrome::kExtensionsSubPage) {
     host = chrome::kChromeUIUberHost;
     path = chrome::kChromeUIExtensionsHost;
+  // Redirect chrome://history.
+  } else if (host == chrome::kChromeUIHistoryHost) {
+    host = chrome::kChromeUIUberHost;
+    path = chrome::kChromeUIHistoryHost + url->path();
   // Redirect chrome://settings
   } else if (host == chrome::kChromeUISettingsHost) {
     host = chrome::kChromeUIUberHost;
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 7841c42..f364213 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -907,9 +907,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) {
   ASSERT_EQ(1u, service->extensions()->size());
 
   // Go to the Extension Settings page and click the Options button.
-  ui_test_utils::NavigateToURL(
-      browser(), GURL(std::string(chrome::kChromeUISettingsURL) +
-                      chrome::kExtensionsSubPage));
+  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIExtensionsURL));
   TabStripModel* tab_strip = browser()->tabstrip_model();
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
       browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index c323ec8..426c40b 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -146,7 +146,7 @@ void ExtensionContextMenuModel::ExecuteCommand(int command_id) {
       break;
     }
     case MANAGE: {
-      browser_->ShowOptionsTab(chrome::kExtensionsSubPage);
+      browser_->ShowExtensionsTab();
       break;
     }
     case INSPECT_POPUP: {
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index ec697df..19eff08 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -290,10 +290,8 @@ GURL UrlForExtension(const Extension* extension, const GURL& override_url) {
   // For extensions lacking launch urls, determine a reasonable fallback.
   if (!url.is_valid()) {
     url = extension->options_url();
-    if (!url.is_valid()) {
-      url = GURL(std::string(chrome::kChromeUISettingsURL) +
-                 chrome::kExtensionsSubPage);
-    }
+    if (!url.is_valid())
+      url = GURL(chrome::kChromeUIExtensionsURL);
   }
 
   return url;
@@ -2407,9 +2405,8 @@ void Browser::ShowDownloadsTab() {
 
 void Browser::ShowExtensionsTab() {
   content::RecordAction(UserMetricsAction("ShowExtensions"));
-  browser::NavigateParams params(GetSingletonTabNavigateParams(
-      GURL(std::string(chrome::kChromeUIUberURL) +
-           chrome::kChromeUIExtensionsHost)));
+  browser::NavigateParams params(
+      GetSingletonTabNavigateParams(GURL(chrome::kChromeUIExtensionsURL)));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(params);
 }
@@ -2435,23 +2432,15 @@ void Browser::ShowBrokenPageTab(WebContents* contents) {
 }
 
 void Browser::ShowOptionsTab(const std::string& sub_page) {
-  std::string url;
-  if (sub_page == chrome::kExtensionsSubPage) {
-    url = std::string(chrome::kChromeUIUberURL) +
-        chrome::kChromeUIExtensionsHost;
+  std::string url = std::string(chrome::kChromeUISettingsURL) + sub_page;
 #if defined(OS_CHROMEOS)
-  } else if (sub_page.find(chrome::kInternetOptionsSubPage, 0) !=
-             std::string::npos) {
+  if (sub_page.find(chrome::kInternetOptionsSubPage, 0) != std::string::npos) {
     std::string::size_type loc = sub_page.find("?", 0);
     std::string network_page = loc != std::string::npos ?
         sub_page.substr(loc) : std::string();
-    url = std::string(chrome::kChromeUIUberURL) +
-        chrome::kChromeUISettingsHost + network_page;
-#endif
-  } else {
-    url = std::string(chrome::kChromeUIUberURL) +
-        chrome::kChromeUISettingsHost + '/' + sub_page;
+    url = std::string(chrome::kChromeUISettingsURL) + network_page;
   }
+#endif
   browser::NavigateParams params(GetSingletonTabNavigateParams(GURL(url)));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(params);
@@ -2484,8 +2473,8 @@ void Browser::OpenInstantConfirmDialog() {
 void Browser::OpenAboutChromeDialog() {
   content::RecordAction(UserMetricsAction("AboutChrome"));
 #if !defined(OS_WIN)
-  GURL url = GURL(chrome::kChromeUIUberURL);
-  browser::NavigateParams params(GetSingletonTabNavigateParams(url));
+  browser::NavigateParams params(
+      GetSingletonTabNavigateParams(GURL(chrome::kChromeUIUberURL)));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(params);
 #else
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
index 1b9a56d..91228f0 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
@@ -275,7 +275,7 @@ int CurrentTabId() {
       break;
     }
     case kExtensionContextManage: {
-      browser->ShowOptionsTab(chrome::kExtensionsSubPage);
+      browser->ShowExtensionsTab();
       break;
     }
     case kExtensionContextInspect: {
diff --git a/chrome/browser/ui/panels/panel_settings_menu_model.cc b/chrome/browser/ui/panels/panel_settings_menu_model.cc
index 922c232..df8f1d5 100644
--- a/chrome/browser/ui/panels/panel_settings_menu_model.cc
+++ b/chrome/browser/ui/panels/panel_settings_menu_model.cc
@@ -102,7 +102,7 @@ void PanelSettingsMenuModel::ExecuteCommand(int command_id) {
       extension_uninstall_dialog_->ConfirmUninstall(extension);
       break;
     case COMMAND_MANAGE:
-      browser->ShowOptionsTab(chrome::kExtensionsSubPage);
+      browser->ShowExtensionsTab();
       break;
     default:
       NOTREACHED();
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 451650b..17f1c67 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -265,8 +265,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
       l10n_util::GetStringFUTF16(
           IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-          ASCIIToUTF16(std::string(chrome::kChromeUISettingsURL) +
-                       chrome::kExtensionsSubPage)));
+          ASCIIToUTF16(chrome::kChromeUIExtensionsURL)));
   bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
       prefs::kShowBookmarkBar);
   localized_strings.SetString("bookmarkbarattached",
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 777133a..6287ad2 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -526,7 +526,9 @@ TEST_F(AutomationProxyTest, MAYBE_AcceleratorExtensions) {
 
   ASSERT_TRUE(window->RunCommand(IDC_MANAGE_EXTENSIONS));
 
-  EXPECT_EQ("chrome://chrome/extensions", GetActiveTabURL().spec());
+  EXPECT_EQ(GURL(std::string(chrome::kChromeUIUberURL) +
+                chrome::kChromeUIExtensionsHost + "/"),
+            GetActiveTabURL());
 }
 
 TEST_F(AutomationProxyTest, AcceleratorHistory) {
@@ -535,9 +537,9 @@ TEST_F(AutomationProxyTest, AcceleratorHistory) {
 
   ASSERT_TRUE(window->RunCommand(IDC_SHOW_HISTORY));
 
-  EXPECT_EQ(std::string(chrome::kChromeUIUberURL) +
-                chrome::kChromeUIHistoryHost + "/",
-            GetActiveTabURL().spec());
+  EXPECT_EQ(GURL(std::string(chrome::kChromeUIUberURL) +
+                chrome::kChromeUIHistoryHost + "/"),
+            GetActiveTabURL());
 }
 
 class AutomationProxyTest4 : public UITest {