diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 14:54:51 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 14:54:51 +0000 |
| commit | f4818827385d888ea4751d1236a32fa4b7c0c416 (patch) | |
| tree | 2de4cdafd0c726fa1c74ab3a973a2a3c4a95de17 /chrome/browser/ui/browser_browsertest.cc | |
| parent | fd1ff075d95a5edaf76ba7128b3094b8d3f97893 (diff) | |
| download | chromium_src-f4818827385d888ea4751d1236a32fa4b7c0c416.zip chromium_src-f4818827385d888ea4751d1236a32fa4b7c0c416.tar.gz chromium_src-f4818827385d888ea4751d1236a32fa4b7c0c416.tar.bz2 | |
Remove usage of a deprecated TestServer constructor.
Hostname must now be explicitly specified (previously default was 127.0.0.1). See the following CL for further details:
http://codereview.chromium.org/9369029/
A follow-up CL will remove the deprecated constructor:
http://codereview.chromium.org/9431002/
BUG=114369
TEST=everything still compiles and passes
Review URL: http://codereview.chromium.org/9433043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_browsertest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 4b2b062..2cef399 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -393,6 +393,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { // Create http and https servers for a cross-site transition. ASSERT_TRUE(test_server()->Start()); net::TestServer https_test_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); GURL http_url(test_server()->GetURL("files/title1.html")); @@ -481,6 +482,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) { // Create http and https servers for a cross-site transition. ASSERT_TRUE(test_server()->Start()); net::TestServer https_test_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); GURL http_url(test_server()->GetURL("files/title1.html")); @@ -589,7 +591,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) { IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { CommandUpdater* command_updater = browser()->command_updater(); - net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); GURL https_url(test_server.GetURL("/")); ASSERT_TRUE(https_url.SchemeIs(chrome::kHttpsScheme)); @@ -600,7 +604,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) { CommandUpdater* command_updater = browser()->command_updater(); - net::TestServer test_server(net::TestServer::TYPE_FTP, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_FTP, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); GURL ftp_url(test_server.GetURL("")); ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme)); |