summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_script_fetcher_impl_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:57:22 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:57:22 +0000
commitce7d0cbc07beeac9515f0343c6d56e77ee83879a (patch)
treee7fa63e776a5fa9873e735a0b1b31b7c19249945 /net/proxy/proxy_script_fetcher_impl_unittest.cc
parent47914ce872d5e3c1901eeeb44c02dd197c01992d (diff)
downloadchromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.zip
chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.tar.gz
chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.tar.bz2
GTTF: rename net::TestServer -> net::SpawnedTestServer
This is a part of replacing most usages of the Python test server with an in-process C++ test server that should be easier to debug. BUG=96594 R=rch@chromium.org Review URL: https://codereview.chromium.org/14702004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_script_fetcher_impl_unittest.cc')
-rw-r--r--net/proxy/proxy_script_fetcher_impl_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index cca4b85..3c23528 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -20,7 +20,7 @@
#include "net/http/http_network_session.h"
#include "net/http/http_server_properties_impl.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_storage.h"
#include "net/url_request/url_request_file_job.h"
#include "net/url_request/url_request_job_factory_impl.h"
@@ -182,14 +182,14 @@ class BasicNetworkDelegate : public NetworkDelegate {
class ProxyScriptFetcherImplTest : public PlatformTest {
public:
ProxyScriptFetcherImplTest()
- : test_server_(TestServer::TYPE_HTTP,
- net::TestServer::kLocalhost,
+ : test_server_(SpawnedTestServer::TYPE_HTTP,
+ net::SpawnedTestServer::kLocalhost,
base::FilePath(kDocRoot)) {
context_.set_network_delegate(&network_delegate_);
}
protected:
- TestServer test_server_;
+ SpawnedTestServer test_server_;
BasicNetworkDelegate network_delegate_;
RequestContext context_;
};