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/9430050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123486 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 38 insertions, 14 deletions

diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
index f8f2f94..9c66d11 100644
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
@@ -271,6 +271,7 @@ class MockDhcpRealFetchProxyScriptAdapterFetcher
 TEST(DhcpProxyScriptAdapterFetcher, MockDhcpRealFetch) {
   TestServer test_server(
       TestServer::TYPE_HTTP,
+      net::TestServer::kLocalhost,
       FilePath(FILE_PATH_LITERAL("net/data/proxy_script_fetcher_unittest")));
   ASSERT_TRUE(test_server.Start());
 
diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc
index 5de2295..f5994ca 100644
--- a/net/proxy/proxy_resolver_perftest.cc
+++ b/net/proxy/proxy_resolver_perftest.cc
@@ -98,7 +98,9 @@ class PacPerfSuiteRunner {
                      const std::string& resolver_name)
       : resolver_(resolver),
         resolver_name_(resolver_name),
-        test_server_(net::TestServer::TYPE_HTTP,
+        test_server_(
+            net::TestServer::TYPE_HTTP,
+            net::TestServer::kLocalhost,
             FilePath(FILE_PATH_LITERAL("net/data/proxy_resolver_perftest"))) {
   }
 
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index e3c0be9..d29dcba 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -118,7 +118,9 @@ GURL GetTestFileUrl(const std::string& relpath) {
 class ProxyScriptFetcherImplTest : public PlatformTest {
  public:
   ProxyScriptFetcherImplTest()
-      : test_server_(TestServer::TYPE_HTTP, FilePath(kDocRoot)) {
+      : test_server_(TestServer::TYPE_HTTP,
+                     net::TestServer::kLocalhost,
+                     FilePath(kDocRoot)) {
   }
 
   static void SetUpTestCase() {
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index e43d83e..bf156d1 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -67,7 +67,9 @@ static bool LogContainsSSLConnectEndEvent(
 };
 
 TEST_F(SSLClientSocketTest, Connect) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
@@ -317,7 +319,9 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) {
 //   - Server sends data unexpectedly.
 
 TEST_F(SSLClientSocketTest, Read) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
@@ -371,7 +375,9 @@ TEST_F(SSLClientSocketTest, Read) {
 // Test the full duplex mode, with Read and Write pending at the same time.
 // This test also serves as a regression test for http://crbug.com/29815.
 TEST_F(SSLClientSocketTest, Read_FullDuplex) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
@@ -430,7 +436,9 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) {
 }
 
 TEST_F(SSLClientSocketTest, Read_SmallChunks) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
@@ -481,7 +489,9 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) {
 }
 
 TEST_F(SSLClientSocketTest, Read_Interrupted) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
@@ -529,7 +539,9 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
 }
 
 TEST_F(SSLClientSocketTest, Read_FullLogging) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
@@ -595,7 +607,9 @@ TEST_F(SSLClientSocketTest, Read_FullLogging) {
 
 // Regression test for http://crbug.com/42538
 TEST_F(SSLClientSocketTest, PrematureApplicationData) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
@@ -724,7 +738,9 @@ TEST_F(SSLClientSocketTest, CipherSuiteDisables) {
 // Here we verify that such a simple ClientSocketHandle, not associated with any
 // client socket pool, can be destroyed safely.
 TEST_F(SSLClientSocketTest, ClientSocketHandleNotFromPool) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath());
+  net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                              net::TestServer::kLocalhost,
+                              FilePath());
   ASSERT_TRUE(test_server.Start());
 
   net::AddressList addr;
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index babe243..caeaf71 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1211,8 +1211,9 @@ TEST_F(URLRequestTestHTTP, GetZippedTest) {
 TEST_F(URLRequestTestHTTP, DISABLED_HTTPSToHTTPRedirectNoRefererTest) {
   ASSERT_TRUE(test_server_.Start());
 
-  TestServer https_test_server(
-      TestServer::TYPE_HTTPS, FilePath(FILE_PATH_LITERAL("net/data/ssl")));
+  TestServer https_test_server(TestServer::TYPE_HTTPS,
+                               TestServer::kLocalhost,
+                               FilePath(FILE_PATH_LITERAL("net/data/ssl")));
   ASSERT_TRUE(https_test_server.Start());
 
   // An https server is sent a request with an https referer,
@@ -1274,6 +1275,7 @@ class HTTPSRequestTest : public testing::Test {
 // (see bug 102991).
 TEST_F(HTTPSRequestTest, DISABLED_HTTPSGetTest) {
   TestServer test_server(TestServer::TYPE_HTTPS,
+                         TestServer::kLocalhost,
                          FilePath(FILE_PATH_LITERAL("net/data/ssl")));
   ASSERT_TRUE(test_server.Start());
 
@@ -3646,7 +3648,8 @@ TEST_F(URLRequestTest, RequestCompletionForEmptyResponse) {
 
 class URLRequestTestFTP : public URLRequestTest {
  public:
-  URLRequestTestFTP() : test_server_(TestServer::TYPE_FTP, FilePath()) {
+  URLRequestTestFTP()
+      : test_server_(TestServer::TYPE_FTP, TestServer::kLocalhost, FilePath()) {
   }
 
  protected: