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 /jingle | |
| 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 'jingle')
| -rw-r--r-- | jingle/notifier/base/proxy_resolving_client_socket.cc | 6 | ||||
| -rw-r--r-- | jingle/notifier/base/xmpp_client_socket_factory.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/jingle/notifier/base/proxy_resolving_client_socket.cc b/jingle/notifier/base/proxy_resolving_client_socket.cc index ab0b679..5130100 100644 --- a/jingle/notifier/base/proxy_resolving_client_socket.cc +++ b/jingle/notifier/base/proxy_resolving_client_socket.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -48,8 +48,8 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( session_params.client_socket_factory = socket_factory; session_params.host_resolver = request_context->host_resolver(); session_params.cert_verifier = request_context->cert_verifier(); - // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe. - session_params.origin_bound_cert_service = NULL; + // TODO(rkn): This is NULL because ServerBoundCertService is not thread safe. + session_params.server_bound_cert_service = NULL; // transport_security_state is NULL because it's not thread safe. session_params.transport_security_state = NULL; session_params.proxy_service = request_context->proxy_service(); diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc index c08de39..87b439d 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.cc +++ b/jingle/notifier/base/xmpp_client_socket_factory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -45,8 +45,8 @@ net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( net::SSLClientSocketContext context; context.cert_verifier = request_context_getter_->GetURLRequestContext()->cert_verifier(); - // TODO(rkn): context.origin_bound_cert_service is NULL because the - // OriginBoundCertService class is not thread safe. + // TODO(rkn): context.server_bound_cert_service is NULL because the + // ServerBoundCertService class is not thread safe. return client_socket_factory_->CreateSSLClientSocket( transport_socket, host_and_port, ssl_config_, NULL, context); } |