summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 16:16:20 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 16:16:20 +0000
commitd9fca99ac07676b78cc679b462f4adbeba7c0976 (patch)
tree31e6fd898a6c1766046b180b04d628fffa287ff6 /net/proxy
parented37a0944c1d576ff088e1f9f511f6029e79417c (diff)
downloadchromium_src-d9fca99ac07676b78cc679b462f4adbeba7c0976.zip
chromium_src-d9fca99ac07676b78cc679b462f4adbeba7c0976.tar.gz
chromium_src-d9fca99ac07676b78cc679b462f4adbeba7c0976.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/9430050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc1
-rw-r--r--net/proxy/proxy_resolver_perftest.cc4
-rw-r--r--net/proxy/proxy_script_fetcher_impl_unittest.cc6
3 files changed, 8 insertions, 3 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() {