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

Unified Diff: jingle/glue/xmpp_client_socket_factory.cc

Issue 2104493002: Fixup ChromeOS enrollment and renderer p2p sockets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Copypasta Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/xmpp_client_socket_factory.cc
diff --git a/jingle/glue/xmpp_client_socket_factory.cc b/jingle/glue/xmpp_client_socket_factory.cc
index 7277ab44b7f2b372cfc1bf51e3e06a33f2130431..3ed455f0c1cbe0180d79956bf8e5dcbf6c5390ac 100644
--- a/jingle/glue/xmpp_client_socket_factory.cc
+++ b/jingle/glue/xmpp_client_socket_factory.cc
@@ -48,14 +48,15 @@ std::unique_ptr<net::SSLClientSocket>
XmppClientSocketFactory::CreateSSLClientSocket(
std::unique_ptr<net::ClientSocketHandle> transport_socket,
const net::HostPortPair& host_and_port) {
- net::SSLClientSocketContext context;
- context.cert_verifier =
- request_context_getter_->GetURLRequestContext()->cert_verifier();
- context.transport_security_state = request_context_getter_->
- GetURLRequestContext()->transport_security_state();
- DCHECK(context.transport_security_state);
- // TODO(rkn): context.channel_id_service is NULL because the
- // ChannelIDService class is not thread safe.
+ const net::URLRequestContext* url_context =
+ request_context_getter_->GetURLRequestContext();
+ net::SSLClientSocketContext context(
+ url_context->cert_verifier(),
+ nullptr, /* TODO(rkn): ChannelIDService is not thread safe. */
+ url_context->transport_security_state(),
+ url_context->cert_transparency_verifier(),
+ url_context->ct_policy_enforcer(),
+ std::string() /* TODO(rsleevi): Ensure a proper unique shard. */);
return client_socket_factory_->CreateSSLClientSocket(
std::move(transport_socket), host_and_port, ssl_config_, context);
}
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_tcp.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698