diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 22:42:29 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 22:42:29 +0000 |
| commit | 9c4eff26e509149d2133268af7744a5cdb079dd1 (patch) | |
| tree | 37f5ddc3dee1ed87d40a9e8ff6dce25778cfb1e0 /net/socket_stream/socket_stream.cc | |
| parent | 4a210ecd52feb4f61969f329c5bd10b5746c6e2b (diff) | |
| download | chromium_src-9c4eff26e509149d2133268af7744a5cdb079dd1.zip chromium_src-9c4eff26e509149d2133268af7744a5cdb079dd1.tar.gz chromium_src-9c4eff26e509149d2133268af7744a5cdb079dd1.tar.bz2 | |
Change Origin bound certs -> Domain bound certs.
BUG=115348
TEST=unit tests, manually checked 'Origin Bound Certs' contents after browsing
TBR=jam@chromium.org,willchan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9617039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream/socket_stream.cc')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 9da4456..8604d28 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -58,7 +58,7 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate) next_state_(STATE_NONE), host_resolver_(NULL), cert_verifier_(NULL), - origin_bound_cert_service_(NULL), + server_bound_cert_service_(NULL), http_auth_handler_factory_(NULL), factory_(ClientSocketFactory::GetDefaultFactory()), proxy_mode_(kDirectConnection), @@ -126,7 +126,7 @@ void SocketStream::set_context(URLRequestContext* context) { if (context_) { host_resolver_ = context_->host_resolver(); cert_verifier_ = context_->cert_verifier(); - origin_bound_cert_service_ = context_->origin_bound_cert_service(); + server_bound_cert_service_ = context_->server_bound_cert_service(); http_auth_handler_factory_ = context_->http_auth_handler_factory(); } } @@ -923,7 +923,7 @@ int SocketStream::DoSecureProxyConnect() { DCHECK(factory_); SSLClientSocketContext ssl_context; ssl_context.cert_verifier = cert_verifier_; - ssl_context.origin_bound_cert_service = origin_bound_cert_service_; + ssl_context.server_bound_cert_service = server_bound_cert_service_; // TODO(agl): look into plumbing SSLHostInfo here. socket_.reset(factory_->CreateSSLClientSocket( socket_.release(), @@ -954,7 +954,7 @@ int SocketStream::DoSSLConnect() { DCHECK(factory_); SSLClientSocketContext ssl_context; ssl_context.cert_verifier = cert_verifier_; - ssl_context.origin_bound_cert_service = origin_bound_cert_service_; + ssl_context.server_bound_cert_service = server_bound_cert_service_; // TODO(agl): look into plumbing SSLHostInfo here. socket_.reset(factory_->CreateSSLClientSocket(socket_.release(), HostPortPair::FromURL(url_), |