summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/all_urls_apitest.cc
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-07 19:01:45 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-07 19:01:45 +0000
commit13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3 (patch)
tree4b52c701627cf62f3e0d5d6b0aa3273303ea523b /chrome/browser/extensions/all_urls_apitest.cc
parent1e42f714e94d85e2fcc2ee4eabdb6202291375ad (diff)
downloadchromium_src-13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3.zip
chromium_src-13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3.tar.gz
chromium_src-13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3.tar.bz2
Revert 88142 to fix sync_integration_tests offline.
*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). BUG=55771 TEST=Access about:, about://, chrome:, chrome:// pages. Review URL: http://codereview.chromium.org/7068007 TBR=msw@chromium.org Review URL: http://codereview.chromium.org/7064052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/all_urls_apitest.cc')
-rw-r--r--chrome/browser/extensions/all_urls_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
index d9fde87..e34e989 100644
--- a/chrome/browser/extensions/all_urls_apitest.cc
+++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -53,8 +53,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) {
ASSERT_TRUE(listener2a.WaitUntilSatisfied());
ASSERT_TRUE(listener2b.WaitUntilSatisfied());
- // Now verify chrome://version/.
- url = "chrome://version/";
+ // Now verify about:version.
+ url = "about:version";
ExtensionTestMessageListener listener3a("content script: " + url, false);
ExtensionTestMessageListener listener3b("execute: " + url, false);
ui_test_utils::NavigateToURL(browser(), GURL(url));