diff options
author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 15:06:40 +0000 |
---|---|---|
committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 15:06:40 +0000 |
commit | 63ef3238923a628e3eb191e9ff1cdc4b2ee072af (patch) | |
tree | 7e53088e714abe6f125ea559e426636937441961 | |
parent | c4734d414ea93fdd8dbb22caa1dd9f4901aeb9f0 (diff) | |
download | chromium_src-63ef3238923a628e3eb191e9ff1cdc4b2ee072af.zip chromium_src-63ef3238923a628e3eb191e9ff1cdc4b2ee072af.tar.gz chromium_src-63ef3238923a628e3eb191e9ff1cdc4b2ee072af.tar.bz2 |
Fix BrowserTest.OtherRedirectsDontForkProcess to not hard-code port 1337.
BUG=None
TEST=BrowserTest.OtherRedirectsDontForkProcess
Review URL: http://codereview.chromium.org/4088001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63892 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/browser_uitest.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 8ec30a2..8ea721e 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -159,9 +159,11 @@ TEST_F(BrowserTest, MAYBE_OtherRedirectsDontForkProcess) { // Use JavaScript URL to almost fork a new tab, but not quite. (Leave the // opener non-null.) Should not fork a process. - std::string url_prefix("javascript:(function(){w=window.open();"); - GURL dont_fork_url(url_prefix + - "w.document.location=\"http://localhost:1337\";})()"); + std::string url_str = "javascript:(function(){w=window.open(); "; + url_str += "w.document.location=\""; + url_str += test_server.GetURL("").spec(); + url_str += "\";})()"; + GURL dont_fork_url(url_str); // Make sure that a new tab but not new process has been created. ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url)); @@ -172,8 +174,11 @@ TEST_F(BrowserTest, MAYBE_OtherRedirectsDontForkProcess) { ASSERT_EQ(orig_tab_count + 1, new_tab_count); // Same thing if the current tab tries to redirect itself. - GURL dont_fork_url2(url_prefix + - "document.location=\"http://localhost:1337\";})()"); + url_str = "javascript:(function(){w=window.open(); "; + url_str += "document.location=\""; + url_str += test_server.GetURL("").spec(); + url_str += "\";})()"; + GURL dont_fork_url2(url_str); // Make sure that no new process has been created. ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url2)); |