summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 01:19:31 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 01:19:31 +0000
commit1b9565c618315cd50b80ef2f2b696e15c4801f17 (patch)
treec1198c7a24938b80fa7ff491d48b8a1d7986ddcb /net/url_request
parent9ecc2dee313ed8d32a8aabe738c97d231bea8f98 (diff)
downloadchromium_src-1b9565c618315cd50b80ef2f2b696e15c4801f17.zip
chromium_src-1b9565c618315cd50b80ef2f2b696e15c4801f17.tar.gz
chromium_src-1b9565c618315cd50b80ef2f2b696e15c4801f17.tar.bz2
GTTF: Move net/socket/ssl_test_util to net/test/test_server
This is a first step to make test server easier to use and more reliable. TEST=none BUG=49680 Review URL: http://codereview.chromium.org/3040011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_unittest.cc2
-rw-r--r--net/url_request/url_request_unittest.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 3c18312..d1a542a 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -39,7 +39,7 @@
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/proxy/proxy_service.h"
-#include "net/socket/ssl_test_util.h"
+#include "net/test/test_server.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_file_dir_job.h"
#include "net/url_request/url_request_http_job.h"
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index f8fee49..8f090ef 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -33,7 +33,7 @@
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_cache.h"
#include "net/http/http_network_layer.h"
-#include "net/socket/ssl_test_util.h"
+#include "net/test/test_server.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/proxy/proxy_service.h"