*Fixup about and chrome scheme URLs in URLFixerUpper::FixupURL.
*Update AboutSource to use the source_name of each about/chrome page.
*Make WillHandleBrowserAboutURL fix up schemes and handle chrome://foo/
-Redirect memory to memory-redirect (wasn't handling chrome://memory/).
-Catalog all kChromeUI*Hosts in url_constants.cc
-Simplify paths (credits, os-credits, ipc, settings, about/version).
-Nix web_ui_util::ChromeURLHostEquals (use scheme & host comparison).
-Favor GURL::SchemeIs and url_constants, update & expand tests.
-Add and fixup chrome://chrome-urls (the about:about page).
-Update special_tabs.py from Nirnimesh's codereview.chromium.org/6995057/.
This change was reverted with r88166 for sync_integration_tests failures.
These failures are a tangential issue, crbug.com/85294; I'll re-land this soon.
BUG=55771
TEST=Access about:, about://, chrome:, chrome:// pages.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=88142
Review URL: http://codereview.chromium.org/7068007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88367 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
index 9b30550..064e807 100644
--- a/chrome/browser/browser_about_handler_unittest.cc
+++ b/chrome/browser/browser_about_handler_unittest.cc
@@ -16,6 +16,8 @@
typedef TestingBrowserProcessTest BrowserAboutHandlerTest;
TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
+ std::string chrome_prefix(chrome::kChromeUIScheme);
+ chrome_prefix.append(chrome::kStandardSchemeSeparator);
struct AboutURLTestData {
GURL test_url;
GURL result_url;
@@ -35,71 +37,71 @@
false
},
{
- GURL(std::string(chrome::kAboutCacheURL) + "/mercury"),
- GURL(std::string(chrome::kNetworkViewCacheURL) + "mercury"),
- false,
- true
- },
- {
- GURL(std::string(chrome::kAboutNetInternalsURL) + "/venus"),
- GURL(std::string(chrome::kNetworkViewInternalsURL) + "venus"),
- false,
- true
- },
- {
- GURL(std::string(chrome::kAboutGpuURL) + "/jupiter"),
- GURL(std::string(chrome::kGpuInternalsURL) + "jupiter"),
- false,
- true
- },
- {
- GURL(std::string(chrome::kAboutAppCacheInternalsURL) + "/earth"),
- GURL(std::string(chrome::kAppCacheViewInternalsURL) + "earth"),
- false,
- true
- },
- {
- GURL(chrome::kAboutPluginsURL),
- GURL(chrome::kChromeUIPluginsURL),
- false,
- true
- },
- {
- GURL(chrome::kAboutCrashURL),
- GURL(chrome::kAboutCrashURL),
+ GURL(chrome_prefix + chrome::kChromeUICrashHost),
+ GURL(chrome_prefix + chrome::kChromeUICrashHost),
true,
false
},
{
- GURL(chrome::kAboutKillURL),
- GURL(chrome::kAboutKillURL),
+ GURL(chrome_prefix + chrome::kChromeUIKillHost),
+ GURL(chrome_prefix + chrome::kChromeUIKillHost),
true,
false
},
{
- GURL(chrome::kAboutHangURL),
- GURL(chrome::kAboutHangURL),
+ GURL(chrome_prefix + chrome::kChromeUIHangHost),
+ GURL(chrome_prefix + chrome::kChromeUIHangHost),
true,
false
},
{
- GURL(chrome::kAboutShorthangURL),
- GURL(chrome::kAboutShorthangURL),
+ GURL(chrome_prefix + chrome::kChromeUIShorthangHost),
+ GURL(chrome_prefix + chrome::kChromeUIShorthangHost),
true,
false
},
{
- GURL("about:memory"),
- GURL("chrome://about/memory-redirect"),
+ GURL(chrome_prefix + chrome::kChromeUIMemoryHost),
+ GURL(chrome_prefix + chrome::kChromeUIMemoryHost),
false,
true
},
{
- GURL("about:mars"),
- GURL("chrome://about/mars"),
+ GURL(chrome_prefix + chrome::kChromeUIDefaultHost),
+ GURL(chrome_prefix + chrome::kChromeUIVersionHost),
false,
true
},
+ {
+ GURL(chrome_prefix + chrome::kChromeUIAboutHost),
+ GURL(chrome_prefix + chrome::kChromeUIChromeURLsHost),
+ false,
+ true
+ },
+ {
+ GURL(chrome_prefix + chrome::kChromeUICacheHost),
+ GURL(chrome_prefix + chrome::kChromeUINetworkViewCacheHost),
+ false,
+ true
+ },
+ {
+ GURL(chrome_prefix + chrome::kChromeUIGpuHost),
+ GURL(chrome_prefix + chrome::kChromeUIGpuInternalsHost),
+ false,
+ true
+ },
+ {
+ GURL(chrome_prefix + chrome::kChromeUISyncHost),
+ GURL(chrome_prefix + chrome::kChromeUISyncInternalsHost),
+ false,
+ true
+ },
+ {
+ GURL(chrome_prefix + "host/path?query#ref"),
+ GURL(chrome_prefix + "host/path?query#ref"),
+ false,
+ true
+ }
};
MessageLoopForUI message_loop;
BrowserThread ui_thread(BrowserThread::UI, &message_loop);
