summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 13:45:12 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 13:45:12 +0000
commit8c9d4ba6af47099c5ce030d0802b276cd8fd37b2 (patch)
tree8fb914c374db9631a749475180036df83e2ed9a9 /chrome_frame/test
parent971888bc3cefb8dc5538c7785a4b2c82f706a2a5 (diff)
downloadchromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.zip
chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.tar.gz
chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.tar.bz2
Revert 62918 - net: clean up SSLHostInfo construction.
Create an SSLHostInfoFactory interface and plumb it from the HttpCache to the SSLConnectJob. Also, move the SSLHostInfo reference from the ssl_config to being passed to the SSLClientSocket. BUG=none TEST=net_unittests Review URL: http://codereview.chromium.org/3747003 TBR=agl@chromium.org Review URL: http://codereview.chromium.org/3846005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/test_server_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index edef592..3d391f6 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -70,8 +70,7 @@ class URLRequestTestContext : public URLRequestContext {
host_resolver_);
http_transaction_factory_ = new net::HttpCache(
net::HttpNetworkLayer::CreateFactory(
- host_resolver_, NULL /* dnsrr_resolver */,
- NULL /* ssl_host_info_factory */, proxy_service_,
+ host_resolver_, NULL /* dnsrr_resolver */, proxy_service_,
ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
net::HttpCache::DefaultBackend::InMemory(0));
// In-memory cookie store.