summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 13:28:28 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 13:28:28 +0000
commit8281f7022c819a13d5d1741d2c1ff73aa4e994a9 (patch)
tree7fcb40be8d7a09b8a55800250a14d496fce5646c /chrome_frame
parent46aeaa8e2c32a014c9d4641ceb6e75954f0bb3a0 (diff)
downloadchromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.zip
chromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.tar.gz
chromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/metrics_service.cc1
-rw-r--r--chrome_frame/test/test_server_test.cc3
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index 4e46708..6d51898 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -177,6 +177,7 @@ class ChromeFrameUploadRequestContext : public URLRequestContext {
http_transaction_factory_ = new net::HttpCache(
net::HttpNetworkLayer::CreateFactory(host_resolver_,
NULL /* dnsrr_resovler */,
+ NULL /* ssl_host_info */,
proxy_service_,
ssl_config_service_,
http_auth_handler_factory_,
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 3d391f6..edef592 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -70,7 +70,8 @@ class URLRequestTestContext : public URLRequestContext {
host_resolver_);
http_transaction_factory_ = new net::HttpCache(
net::HttpNetworkLayer::CreateFactory(
- host_resolver_, NULL /* dnsrr_resolver */, proxy_service_,
+ host_resolver_, NULL /* dnsrr_resolver */,
+ NULL /* ssl_host_info_factory */, proxy_service_,
ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
net::HttpCache::DefaultBackend::InMemory(0));
// In-memory cookie store.