Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Side by Side Diff: jingle/glue/xmpp_client_socket_factory.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "jingle/glue/xmpp_client_socket_factory.h" 5 #include "jingle/glue/xmpp_client_socket_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "jingle/glue/fake_ssl_client_socket.h" 8 #include "jingle/glue/fake_ssl_client_socket.h"
9 #include "jingle/glue/proxy_resolving_client_socket.h" 9 #include "jingle/glue/proxy_resolving_client_socket.h"
10 #include "net/socket/client_socket_factory.h" 10 #include "net/socket/client_socket_factory.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 scoped_ptr<net::SSLClientSocket> 48 scoped_ptr<net::SSLClientSocket>
49 XmppClientSocketFactory::CreateSSLClientSocket( 49 XmppClientSocketFactory::CreateSSLClientSocket(
50 scoped_ptr<net::ClientSocketHandle> transport_socket, 50 scoped_ptr<net::ClientSocketHandle> transport_socket,
51 const net::HostPortPair& host_and_port) { 51 const net::HostPortPair& host_and_port) {
52 net::SSLClientSocketContext context; 52 net::SSLClientSocketContext context;
53 context.cert_verifier = 53 context.cert_verifier =
54 request_context_getter_->GetURLRequestContext()->cert_verifier(); 54 request_context_getter_->GetURLRequestContext()->cert_verifier();
55 context.transport_security_state = request_context_getter_-> 55 context.transport_security_state = request_context_getter_->
56 GetURLRequestContext()->transport_security_state(); 56 GetURLRequestContext()->transport_security_state();
57 DCHECK(context.transport_security_state); 57 DCHECK(context.transport_security_state);
58 // TODO(rkn): context.server_bound_cert_service is NULL because the 58 // TODO(rkn): context.channel_id_service is NULL because the
59 // ServerBoundCertService class is not thread safe. 59 // ChannelIDService class is not thread safe.
60 return client_socket_factory_->CreateSSLClientSocket( 60 return client_socket_factory_->CreateSSLClientSocket(
61 transport_socket.Pass(), host_and_port, ssl_config_, context); 61 transport_socket.Pass(), host_and_port, ssl_config_, context);
62 } 62 }
63 63
64 64
65 } // namespace jingle_glue 65 } // namespace jingle_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698