diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:01:45 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:01:45 +0000 |
commit | 13ed8da1c7ca2564e5fb9ff624f7cdb80eb033f3 (patch) | |
tree | 4b52c701627cf62f3e0d5d6b0aa3273303ea523b /chrome/browser/tab_restore_uitest.cc | |
parent | 1e42f714e94d85e2fcc2ee4eabdb6202291375ad (diff) | |
download | chromium_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/tab_restore_uitest.cc')
-rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 1e57299..dfe1c54 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 chrome://credits/ and make sure the page loads +// Restore tab with special URL about: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::kChromeUICreditsURL); + const GURL special_url(chrome::kAboutCreditsURL); 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::kChromeUICreditsURL); + const GURL special_url(chrome::kAboutCreditsURL); ASSERT_TRUE(browser->AppendTab(special_url)); scoped_refptr<TabProxy> tab(browser->GetActiveTab()); ASSERT_TRUE(tab.get()); |