summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/connection_tester_unittest.cc8
-rw-r--r--chrome/browser/net/cookie_policy_browsertest.cc2
-rw-r--r--chrome/browser/net/ftp_browsertest.cc8
-rw-r--r--chrome/browser/net/http_pipelining_compatibility_client_unittest.cc8
-rw-r--r--chrome/browser/net/load_timing_browsertest.cc2
-rw-r--r--chrome/browser/net/network_stats_unittest.cc8
-rw-r--r--chrome/browser/net/proxy_browsertest.cc14
-rw-r--r--chrome/browser/net/websocket_browsertest.cc14
8 files changed, 32 insertions, 32 deletions
diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
index 3f537b0..a56759d 100644
--- a/chrome/browser/net/connection_tester_unittest.cc
+++ b/chrome/browser/net/connection_tester_unittest.cc
@@ -17,7 +17,7 @@
#include "net/proxy/proxy_config_service_fixed.h"
#include "net/proxy/proxy_service.h"
#include "net/ssl/ssl_config_service_defaults.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
#include "net/url_request/url_request_context.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -89,8 +89,8 @@ class ConnectionTesterTest : public PlatformTest {
ConnectionTesterTest()
: message_loop_(MessageLoop::TYPE_IO),
io_thread_(BrowserThread::IO, &message_loop_),
- test_server_(net::TestServer::TYPE_HTTP,
- net::TestServer::kLocalhost,
+ test_server_(net::SpawnedTestServer::TYPE_HTTP,
+ net::SpawnedTestServer::kLocalhost,
// Nothing is read in this directory.
base::FilePath(FILE_PATH_LITERAL("chrome"))),
proxy_script_fetcher_context_(new net::URLRequestContext) {
@@ -105,7 +105,7 @@ class ConnectionTesterTest : public PlatformTest {
// no-op, and the ObserverList will contain invalid entries.
MessageLoop message_loop_;
content::TestBrowserThread io_thread_;
- net::TestServer test_server_;
+ net::SpawnedTestServer test_server_;
ConnectionTesterDelegate test_delegate_;
net::MockHostResolver host_resolver_;
scoped_ptr<net::CertVerifier> cert_verifier_;
diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc
index 5a5ba24..499a02a 100644
--- a/chrome/browser/net/cookie_policy_browsertest.cc
+++ b/chrome/browser/net/cookie_policy_browsertest.cc
@@ -14,7 +14,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/test/browser_test_utils.h"
#include "net/dns/mock_host_resolver.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
using content::BrowserThread;
diff --git a/chrome/browser/net/ftp_browsertest.cc b/chrome/browser/net/ftp_browsertest.cc
index 8e54e318..f8d2295 100644
--- a/chrome/browser/net/ftp_browsertest.cc
+++ b/chrome/browser/net/ftp_browsertest.cc
@@ -5,19 +5,19 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "googleurl/src/gurl.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
#include "testing/gtest/include/gtest/gtest.h"
class FtpBrowserTest : public InProcessBrowserTest {
public:
FtpBrowserTest()
- : ftp_server_(net::TestServer::TYPE_FTP,
- net::TestServer::kLocalhost,
+ : ftp_server_(net::SpawnedTestServer::TYPE_FTP,
+ net::SpawnedTestServer::kLocalhost,
base::FilePath()) {
}
protected:
- net::TestServer ftp_server_;
+ net::SpawnedTestServer ftp_server_;
};
IN_PROC_BROWSER_TEST_F(FtpBrowserTest, DirectoryListing) {
diff --git a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc
index f582d1b..eb177c5 100644
--- a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc
+++ b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc
@@ -19,9 +19,9 @@
#include "content/public/test/test_browser_thread.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
+#include "net/test/spawned_test_server.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_test_util.h"
-#include "net/test/test_server.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -81,8 +81,8 @@ using testing::StrEq;
class HttpPipeliningCompatibilityClientTest : public testing::Test {
public:
HttpPipeliningCompatibilityClientTest()
- : test_server_(net::TestServer::TYPE_HTTP,
- net::TestServer::kLocalhost,
+ : test_server_(net::SpawnedTestServer::TYPE_HTTP,
+ net::SpawnedTestServer::kLocalhost,
base::FilePath(FILE_PATH_LITERAL(
"chrome/test/data/http_pipelining"))),
io_thread_(BrowserThread::IO, &message_loop_) {
@@ -205,7 +205,7 @@ class HttpPipeliningCompatibilityClientTest : public testing::Test {
}
MessageLoopForIO message_loop_;
- net::TestServer test_server_;
+ net::SpawnedTestServer test_server_;
net::TestURLRequestContextGetter* context_;
content::TestBrowserThread io_thread_;
diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc
index 6519f4e..4f8f24d 100644
--- a/chrome/browser/net/load_timing_browsertest.cc
+++ b/chrome/browser/net/load_timing_browsertest.cc
@@ -22,7 +22,7 @@
#include "content/public/test/browser_test_utils.h"
#include "googleurl/src/gurl.h"
#include "net/base/load_timing_info.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
#include "net/url_request/url_request_file_job.h"
#include "net/url_request/url_request_filter.h"
#include "net/url_request/url_request_job_factory.h"
diff --git a/chrome/browser/net/network_stats_unittest.cc b/chrome/browser/net/network_stats_unittest.cc
index 99dffb2..81c30e8 100644
--- a/chrome/browser/net/network_stats_unittest.cc
+++ b/chrome/browser/net/network_stats_unittest.cc
@@ -10,7 +10,7 @@
#include "net/base/test_completion_callback.h"
#include "net/dns/host_resolver.h"
#include "net/dns/mock_host_resolver.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -30,8 +30,8 @@ class NetworkStatsTest : public PlatformTest {
class NetworkStatsTestUDP : public NetworkStatsTest {
public:
NetworkStatsTestUDP()
- : test_server_(net::TestServer::TYPE_UDP_ECHO,
- net::TestServer::kLocalhost,
+ : test_server_(net::SpawnedTestServer::TYPE_UDP_ECHO,
+ net::SpawnedTestServer::kLocalhost,
base::FilePath(FILE_PATH_LITERAL("net/data"))) {
}
@@ -57,7 +57,7 @@ class NetworkStatsTestUDP : public NetworkStatsTest {
EXPECT_EQ(0, rv);
}
- net::TestServer test_server_;
+ net::SpawnedTestServer test_server_;
};
TEST_F(NetworkStatsTestUDP, UDPEcho100BytesHasProxy) {
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
index 791c16ba..2f1f728 100644
--- a/chrome/browser/net/proxy_browsertest.cc
+++ b/chrome/browser/net/proxy_browsertest.cc
@@ -22,7 +22,7 @@
#include "content/public/browser/web_contents_observer.h"
#include "content/public/test/browser_test_utils.h"
#include "net/base/test_data_directory.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
namespace {
@@ -58,8 +58,8 @@ class LoginPromptObserver : public content::NotificationObserver {
class ProxyBrowserTest : public InProcessBrowserTest {
public:
ProxyBrowserTest()
- : proxy_server_(net::TestServer::TYPE_BASIC_AUTH_PROXY,
- net::TestServer::kLocalhost,
+ : proxy_server_(net::SpawnedTestServer::TYPE_BASIC_AUTH_PROXY,
+ net::SpawnedTestServer::kLocalhost,
base::FilePath()) {
}
@@ -74,7 +74,7 @@ class ProxyBrowserTest : public InProcessBrowserTest {
}
protected:
- net::TestServer proxy_server_;
+ net::SpawnedTestServer proxy_server_;
private:
@@ -91,9 +91,9 @@ class ProxyBrowserTest : public InProcessBrowserTest {
// that requires basic authentication.
IN_PROC_BROWSER_TEST_F(ProxyBrowserTest, MAYBE_BasicAuthWSConnect) {
// Launch WebSocket server.
- net::TestServer ws_server(net::TestServer::TYPE_WS,
- net::TestServer::kLocalhost,
- net::GetWebSocketTestDataDirectory());
+ net::SpawnedTestServer ws_server(net::SpawnedTestServer::TYPE_WS,
+ net::SpawnedTestServer::kLocalhost,
+ net::GetWebSocketTestDataDirectory());
ASSERT_TRUE(ws_server.Start());
content::WebContents* tab =
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc
index bd7f8ee..06442c4 100644
--- a/chrome/browser/net/websocket_browsertest.cc
+++ b/chrome/browser/net/websocket_browsertest.cc
@@ -10,27 +10,27 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/test/browser_test_utils.h"
#include "net/base/test_data_directory.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
namespace {
class WebSocketBrowserTest : public InProcessBrowserTest {
public:
WebSocketBrowserTest()
- : ws_server_(net::TestServer::TYPE_WS,
- net::TestServer::kLocalhost,
+ : ws_server_(net::SpawnedTestServer::TYPE_WS,
+ net::SpawnedTestServer::kLocalhost,
net::GetWebSocketTestDataDirectory()),
- wss_server_(net::TestServer::TYPE_WSS,
+ wss_server_(net::SpawnedTestServer::TYPE_WSS,
SSLOptions(SSLOptions::CERT_OK),
net::GetWebSocketTestDataDirectory()) {
}
protected:
- net::TestServer ws_server_;
- net::TestServer wss_server_;
+ net::SpawnedTestServer ws_server_;
+ net::SpawnedTestServer wss_server_;
private:
- typedef net::TestServer::SSLOptions SSLOptions;
+ typedef net::SpawnedTestServer::SSLOptions SSLOptions;
DISALLOW_COPY_AND_ASSIGN(WebSocketBrowserTest);
};
generated by cgit v1.1 at 2025-04-01 14:09:57 +0000