Commit 21ef84dc authored by davidben's avatar davidben Committed by Commit bot

Unvirtual and inline SSLClientSocket setters.

There's no reason for them to be virtual. Also removed a
field I missed in a previous CL.

BUG=477847

Review URL: https://codereview.chromium.org/1111553002

Cr-Commit-Position: refs/heads/master@{#327174}
parent bc76161f
......@@ -18,8 +18,7 @@
namespace net {
SSLClientSocket::SSLClientSocket()
: protocol_negotiated_(kProtoUnknown),
signed_cert_timestamps_received_(false),
: signed_cert_timestamps_received_(false),
stapled_ocsp_response_received_(false),
negotiation_extension_(kExtensionUnknown) {
}
......@@ -106,21 +105,6 @@ bool SSLClientSocket::IgnoreCertError(int error, int load_flags) {
IsCertificateError(error);
}
void SSLClientSocket::set_negotiation_extension(
SSLNegotiationExtension negotiation_extension) {
negotiation_extension_ = negotiation_extension;
}
void SSLClientSocket::set_signed_cert_timestamps_received(
bool signed_cert_timestamps_received) {
signed_cert_timestamps_received_ = signed_cert_timestamps_received;
}
void SSLClientSocket::set_stapled_ocsp_response_received(
bool stapled_ocsp_response_received) {
stapled_ocsp_response_received_ = stapled_ocsp_response_received;
}
void SSLClientSocket::RecordNegotiationExtension() {
if (negotiation_extension_ == kExtensionUnknown)
return;
......
......@@ -125,18 +125,24 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
// cryptographic implementation.
static uint16 GetMaxSupportedSSLVersion();
void set_negotiation_extension(SSLNegotiationExtension negotiation_extension);
// Returns the ChannelIDService used by this socket, or NULL if
// channel ids are not supported.
virtual ChannelIDService* GetChannelIDService() const = 0;
protected:
virtual void set_signed_cert_timestamps_received(
bool signed_cert_timestamps_received);
void set_negotiation_extension(
SSLNegotiationExtension negotiation_extension) {
negotiation_extension_ = negotiation_extension;
}
void set_signed_cert_timestamps_received(
bool signed_cert_timestamps_received) {
signed_cert_timestamps_received_ = signed_cert_timestamps_received;
}
virtual void set_stapled_ocsp_response_received(
bool stapled_ocsp_response_received);
void set_stapled_ocsp_response_received(bool stapled_ocsp_response_received) {
stapled_ocsp_response_received_ = stapled_ocsp_response_received;
}
// Record which TLS extension was used to negotiate protocol and protocol
// chosen in a UMA histogram.
......@@ -192,8 +198,6 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest,
VerifyServerChainProperlyOrdered);
// Protocol that we negotiated with the server.
NextProto protocol_negotiated_;
// True if SCTs were received via a TLS extension.
bool signed_cert_timestamps_received_;
// True if a stapled OCSP response was received.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment