Remove ChannelIDService from the socket and HTTP layers.
This gets it out of the way of SSL state cleanup work.
Bug: 875053
Change-Id: If56c7857c3c82bbb379e15bfd36e55e11a26f5ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530118
Commit-Queue: David Benjamin <[email protected]>
Reviewed-by: Sean Topping <[email protected]>
Reviewed-by: Nick Harper <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Reviewed-by: Rohit Rao <[email protected]>
Cr-Commit-Position: refs/heads/master@{#643077}diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 4a953ac..226b22a 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -45,9 +45,9 @@
const HttpNetworkSession::Context& context,
SSLClientSessionCache* ssl_client_session_cache) {
return SSLClientSocketContext(
- context.cert_verifier, context.channel_id_service,
- context.transport_security_state, context.cert_transparency_verifier,
- context.ct_policy_enforcer, ssl_client_session_cache);
+ context.cert_verifier, context.transport_security_state,
+ context.cert_transparency_verifier, context.ct_policy_enforcer,
+ ssl_client_session_cache);
}
} // unnamed namespace
@@ -146,7 +146,6 @@
: client_socket_factory(nullptr),
host_resolver(nullptr),
cert_verifier(nullptr),
- channel_id_service(nullptr),
transport_security_state(nullptr),
cert_transparency_verifier(nullptr),
ct_policy_enforcer(nullptr),
