diff options
20 files changed, 73 insertions, 27 deletions
diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc index 0612a09..5c1856d 100644 --- a/chrome/browser/collected_cookies_uitest.cc +++ b/chrome/browser/collected_cookies_uitest.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. @@ -28,7 +28,9 @@ typedef UITest CollectedCookiesTest; #define MAYBE_DoubleDisplay DoubleDisplay #endif TEST_F(CollectedCookiesTest, MAYBE_DoubleDisplay) { - net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); @@ -56,7 +58,9 @@ TEST_F(CollectedCookiesTest, MAYBE_DoubleDisplay) { #define MAYBE_NavigateAway NavigateAway #endif TEST_F(CollectedCookiesTest, MAYBE_NavigateAway) { - net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); diff --git a/chrome/browser/custom_handlers/custom_handlers_uitest.cc b/chrome/browser/custom_handlers/custom_handlers_uitest.cc index faca4b1..a94f9b1 100644 --- a/chrome/browser/custom_handlers/custom_handlers_uitest.cc +++ b/chrome/browser/custom_handlers/custom_handlers_uitest.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. @@ -22,6 +22,7 @@ class CustomHandlerTest : public UITest { public: CustomHandlerTest() : test_server_(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { // Stop Chrome from removing custom protocol handlers for protocols that // Chrome is not registered with the OS as the default application. diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc index 33826c3..0037542 100644 --- a/chrome/browser/extensions/api/socket/socket_apitest.cc +++ b/chrome/browser/extensions/api/socket/socket_apitest.cc @@ -97,6 +97,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketCreateBad) { IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPExtension) { scoped_ptr<net::TestServer> test_server( new net::TestServer(net::TestServer::TYPE_UDP_ECHO, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("net/data")))); EXPECT_TRUE(test_server->Start()); @@ -120,6 +121,7 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPExtension) { IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPExtension) { scoped_ptr<net::TestServer> test_server( new net::TestServer(net::TestServer::TYPE_TCP_ECHO, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("net/data")))); EXPECT_TRUE(test_server->Start()); diff --git a/chrome/browser/infobars/infobars_uitest.cc b/chrome/browser/infobars/infobars_uitest.cc index e9eaa75..31d0759 100644 --- a/chrome/browser/infobars/infobars_uitest.cc +++ b/chrome/browser/infobars/infobars_uitest.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. @@ -18,6 +18,7 @@ class InfoBarsUITest : public UITest { TEST_F(InfoBarsUITest, TestInfoBarsCloseOnNewTheme) { net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); diff --git a/chrome/browser/notifications/notifications_interactive_uitest.cc b/chrome/browser/notifications/notifications_interactive_uitest.cc index d00fbe7..f857cba 100644 --- a/chrome/browser/notifications/notifications_interactive_uitest.cc +++ b/chrome/browser/notifications/notifications_interactive_uitest.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. @@ -20,6 +20,7 @@ class NotificationsPermissionTest : public UITest { // Flaky, http://crbug.com/62311 and http://crbug.com/74428. TEST_F(NotificationsPermissionTest, DISABLED_TestUserGestureInfobar) { net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); @@ -47,6 +48,7 @@ TEST_F(NotificationsPermissionTest, DISABLED_TestUserGestureInfobar) { // Flaky, http://crbug.com/62311. TEST_F(NotificationsPermissionTest, DISABLED_TestNoUserGestureInfobar) { net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index c98d0bf..57a3f49 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -708,6 +708,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { if (use_https_src_server_) { https_src_server.reset( new net::TestServer(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data")))); ASSERT_TRUE(https_src_server->Start()); src_server = https_src_server.get(); @@ -968,6 +969,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that a prerender for an https will prevent a prerender from happening. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) { net::TestServer https_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -980,6 +982,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) { // Checks that client-issued redirects to an https page will cancel prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttps) { net::TestServer https_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -1014,6 +1017,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectInIframe) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttpsInIframe) { net::TestServer https_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -1058,6 +1062,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectToHttps) { net::TestServer https_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -1092,6 +1097,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectInIframe) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectToHttpsInIframe) { net::TestServer https_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc index 79a767e..77a5972 100644 --- a/chrome/browser/referrer_policy_browsertest.cc +++ b/chrome/browser/referrer_policy_browsertest.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. @@ -47,9 +47,12 @@ class ReferrerPolicyTest : public InProcessBrowserTest { void RunReferrerTest(const std::string referrer_policy, bool start_on_https, ExpectedReferrer expected_referrer) { - net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); net::TestServer ssl_test_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(kDocRoot)); ASSERT_TRUE(ssl_test_server.Start()); @@ -112,9 +115,12 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsNever) { } IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, Redirect) { - net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); net::TestServer ssl_test_server(net::TestServer::TYPE_HTTPS, + net::TestServer::kLocalhost, FilePath(kDocRoot)); ASSERT_TRUE(ssl_test_server.Start()); GURL start_url = test_server.GetURL( diff --git a/chrome/browser/repost_form_warning_uitest.cc b/chrome/browser/repost_form_warning_uitest.cc index 9017131..6727f33 100644 --- a/chrome/browser/repost_form_warning_uitest.cc +++ b/chrome/browser/repost_form_warning_uitest.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. @@ -29,7 +29,9 @@ typedef UITest RepostFormWarningTest; #endif TEST_F(RepostFormWarningTest, MAYBE_TestDoubleReload) { - net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); @@ -69,7 +71,9 @@ TEST_F(RepostFormWarningTest, MAYBE_TestDoubleReload) { #endif TEST_F(RepostFormWarningTest, MAYBE_TestLoginAfterRepost) { - net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index 7c968a7..57a251a 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.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. @@ -18,6 +18,7 @@ class SessionHistoryTest : public UITest { protected: SessionHistoryTest() : test_server_(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { dom_automation_enabled_ = true; } diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index f0f0e09..8afd742 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.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. @@ -445,6 +445,7 @@ TEST_F(TabRestoreUITest, RestoreIntoSameWindow) { // to an existing SiteInstance. (Bug 1230446) TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); @@ -492,6 +493,7 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { // already exists. (Bug 1204135) TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) { net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); @@ -634,6 +636,7 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) { // entry and see that it loads properly. See http://crbug.com/31905 TEST_F(TabRestoreUITest, RestoreTabWithSpecialURLOnBack) { net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); diff --git a/chrome/common/chrome_switches_uitest.cc b/chrome/common/chrome_switches_uitest.cc index feb8d9d..f1d5634 100644 --- a/chrome/common/chrome_switches_uitest.cc +++ b/chrome/common/chrome_switches_uitest.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. @@ -22,6 +22,7 @@ class HostRulesTest : public UITest { HostRulesTest::HostRulesTest() : test_server_(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))), test_server_started_(false) { dom_automation_enabled_ = true; diff --git a/chrome/renderer/external_extension_uitest.cc b/chrome/renderer/external_extension_uitest.cc index 38a44e8..e8fc638 100644 --- a/chrome/renderer/external_extension_uitest.cc +++ b/chrome/renderer/external_extension_uitest.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. @@ -37,6 +37,7 @@ class SearchProviderTest : public UITest { SearchProviderTest::SearchProviderTest() : test_server_(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data"))), test_server_started_(false) { // The test_server is started in the constructor (rather than the test body) diff --git a/chrome/renderer/loadtimes_extension_bindings_uitest.cc b/chrome/renderer/loadtimes_extension_bindings_uitest.cc index a47ca9d..84a7e67 100644 --- a/chrome/renderer/loadtimes_extension_bindings_uitest.cc +++ b/chrome/renderer/loadtimes_extension_bindings_uitest.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. @@ -11,7 +11,9 @@ class LoadtimesExtensionBindingsUITest : public UITest { public: LoadtimesExtensionBindingsUITest() - : http_server_(net::TestServer::TYPE_HTTP, FilePath()) { + : http_server_(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + FilePath()) { dom_automation_enabled_ = true; } diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index fed4cf5..b6d5589 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -1054,6 +1054,7 @@ TEST_F(ExternalTabUITest, DISABLED_TabPostMessage) { TEST_F(ExternalTabUITest, DISABLED_PostMessageTarget) { net::TestServer test_server( net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data/external_tab"))); ASSERT_TRUE(test_server.Start()); diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index e1ee2cf..cd66c2e 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -72,6 +72,7 @@ InProcessBrowserTest::InProcessBrowserTest() test_server_.reset(new net::TestServer( net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("chrome/test/data")))); } diff --git a/chrome/test/perf/mach_ports_test.cc b/chrome/test/perf/mach_ports_test.cc index d634450..d42de35 100644 --- a/chrome/test/perf/mach_ports_test.cc +++ b/chrome/test/perf/mach_ports_test.cc @@ -26,6 +26,7 @@ class MachPortsTest : public UIPerfTest { public: MachPortsTest() : server_(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, FilePath(FILE_PATH_LITERAL("data/mach_ports/moz"))) { } diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index 793dd95..72d1372 100755 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -748,7 +748,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): A handle to Sync Server, an instance of TestServer """ sync_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_SYNC, - pyautolib.FilePath('')) + '127.0.0.1', + pyautolib.FilePath('')) assert sync_server.Start(), 'Could not start sync server' sync_server.ports = dict(port=sync_server.GetPort(), xmpp_port=sync_server.GetSyncXmppPort()) @@ -771,7 +772,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): handle to FTP Server, an instance of TestServer """ ftp_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_FTP, - pyautolib.FilePath(data_dir)) + '127.0.0.1', + pyautolib.FilePath(data_dir)) assert ftp_server.Start(), 'Could not start ftp server' logging.debug('Started ftp server at "%s".', data_dir) return ftp_server @@ -793,7 +795,8 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): handle to the HTTP TestServer """ http_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_HTTP, - pyautolib.FilePath(data_dir)) + '127.0.0.1', + pyautolib.FilePath(data_dir)) assert http_server.Start(), 'Could not start HTTP server' logging.debug('Started HTTP server at "%s".', data_dir) return http_server @@ -4637,7 +4640,8 @@ class PyUITestSuite(pyautolib.PyUITestSuiteBase, unittest.TestSuite): assert not _HTTP_SERVER, 'HTTP Server already started' http_data_dir = _OPTIONS.http_data_dir http_server = pyautolib.TestServer(pyautolib.TestServer.TYPE_HTTP, - pyautolib.FilePath(http_data_dir)) + '127.0.0.1', + pyautolib.FilePath(http_data_dir)) assert http_server.Start(), 'Could not start http server' _HTTP_SERVER = http_server logging.debug('Started http server at "%s".', http_data_dir) diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i index 736048f..5c15397 100644 --- a/chrome/test/pyautolib/pyautolib.i +++ b/chrome/test/pyautolib/pyautolib.i @@ -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. // @@ -418,7 +418,8 @@ class TestServer { TYPE_SYNC, }; - TestServer(Type type, const FilePath& document_root); + // Initialize a TestServer listening on the specified host (IP or hostname). + TestServer(Type type, const std::string& host, const FilePath& document_root); // Initialize a HTTPS TestServer with a specific set of HTTPSOptions. TestServer(const HTTPSOptions& https_options, const FilePath& document_root); diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index f968344..a41921b 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -113,7 +113,9 @@ class PPAPITestBase : public UITest { web_dir = web_dir.Append(exe_parts[match]); } - net::TestServer test_server(net::TestServer::TYPE_HTTP, web_dir); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + net::TestServer::kLocalhost, + web_dir); ASSERT_TRUE(test_server.Start()); std::string query = BuildQuery("files/test_case.html?", test_case); diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc index 53f60d1..51b9aac 100644 --- a/net/tools/testserver/run_testserver.cc +++ b/net/tools/testserver/run_testserver.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. @@ -83,7 +83,9 @@ int main(int argc, const char* argv[]) { if (server_type == net::TestServer::TYPE_HTTPS) test_server.reset(new net::TestServer(https_options, doc_root)); else - test_server.reset(new net::TestServer(server_type, doc_root)); + test_server.reset(new net::TestServer(server_type, + net::TestServer::kLocalhost, + doc_root)); if (!test_server->Start()) { printf("Error: failed to start test server. Exiting.\n"); |