summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_restore_uitest.cc
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 18:34:03 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 18:34:03 +0000
commit89f550b854228a6414d017c9186e3e8540b69e13 (patch)
tree863139cb1cfeeeeeebbfb48b729373ce4c12f112 /chrome/browser/tab_restore_uitest.cc
parent56283961a67c5beb667589a547adf3d94db018e9 (diff)
downloadchromium_src-89f550b854228a6414d017c9186e3e8540b69e13.zip
chromium_src-89f550b854228a6414d017c9186e3e8540b69e13.tar.gz
chromium_src-89f550b854228a6414d017c9186e3e8540b69e13.tar.bz2
*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
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
-rw-r--r--chrome/browser/tab_restore_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index dfe1c54..1e57299 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -602,7 +602,7 @@ TEST_F(TabRestoreUITest, RestoreWindow) {
EXPECT_TRUE(url == url2_);
}
-// Restore tab with special URL about:credits and make sure the page loads
+// Restore tab with special URL chrome://credits/ and make sure the page loads
// properly after restore. See http://crbug.com/31905.
TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
@@ -610,7 +610,7 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) {
CheckActiveWindow(browser.get());
// Navigate new tab to a special URL.
- const GURL special_url(chrome::kAboutCreditsURL);
+ const GURL special_url(chrome::kChromeUICreditsURL);
ASSERT_TRUE(browser->AppendTab(special_url));
scoped_refptr<TabProxy> tab(browser->GetActiveTab());
ASSERT_TRUE(tab.get());
@@ -643,7 +643,7 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURLOnBack) {
CheckActiveWindow(browser.get());
// Navigate new tab to a special URL.
- const GURL special_url(chrome::kAboutCreditsURL);
+ const GURL special_url(chrome::kChromeUICreditsURL);
ASSERT_TRUE(browser->AppendTab(special_url));
scoped_refptr<TabProxy> tab(browser->GetActiveTab());
ASSERT_TRUE(tab.get());