Clean up NPN/ALPN-related SSLClientSocket bits.

net/socket/ssl_client_socket.cc

 // 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.
 
 #include "net/socket/ssl_client_socket.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/net_errors.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 
 namespace net {
 
 SSLClientSocket::SSLClientSocket()
-    : was_npn_negotiated_(false),
-      was_spdy_negotiated_(false),
-      protocol_negotiated_(kProtoUnknown),
+    : protocol_negotiated_(kProtoUnknown),
       channel_id_sent_(false),
       signed_cert_timestamps_received_(false),
       stapled_ocsp_response_received_(false),
       negotiation_extension_(kExtensionUnknown) {
 }
 
 // static
 NextProto SSLClientSocket::NextProtoFromString(
     const std::string& proto_string) {
   if (proto_string == "http1.1" || proto_string == "http/1.1") {
@@ skipping 50 matching lines @@
       return "unsupported";
     case kNextProtoNegotiated:
       return "negotiated";
     case kNextProtoNoOverlap:
       return "no-overlap";
   }
   return NULL;
 }
 
 bool SSLClientSocket::WasNpnNegotiated() const {
-  return was_npn_negotiated_;
+  std::string unused_proto;
+  return GetNextProto(&unused_proto) == kNextProtoNegotiated;
 }
 
 NextProto SSLClientSocket::GetNegotiatedProtocol() const {
-  return protocol_negotiated_;
+  std::string proto;
+  if (GetNextProto(&proto) != kNextProtoNegotiated)
+    return kProtoUnknown;
+  return NextProtoFromString(proto);
 }
 
 bool SSLClientSocket::IgnoreCertError(int error, int load_flags) {
   if (error == OK)
     return true;
   return (load_flags & LOAD_IGNORE_ALL_CERT_ERRORS) &&
          IsCertificateError(error);
 }
 
-bool SSLClientSocket::set_was_npn_negotiated(bool negotiated) {
-  return was_npn_negotiated_ = negotiated;
-}
-
-bool SSLClientSocket::was_spdy_negotiated() const {
-  return was_spdy_negotiated_;
-}
-
-bool SSLClientSocket::set_was_spdy_negotiated(bool negotiated) {
-  return was_spdy_negotiated_ = negotiated;
-}
-
-void SSLClientSocket::set_protocol_negotiated(NextProto protocol_negotiated) {
-  protocol_negotiated_ = protocol_negotiated;
-}
-
 void SSLClientSocket::set_negotiation_extension(
     SSLNegotiationExtension negotiation_extension) {
   negotiation_extension_ = negotiation_extension;
 }
 
 bool SSLClientSocket::WasChannelIDSent() const {
   return channel_id_sent_;
 }
 
 void SSLClientSocket::set_channel_id_sent(bool channel_id_sent) {
   channel_id_sent_ = channel_id_sent;
 }
 
 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;
+  std::string proto;
+  SSLClientSocket::NextProtoStatus status = GetNextProto(&proto);
+  if (status == kNextProtoUnsupported)
+    return;
+  // Convert protocol into numerical value for histogram.
+  NextProto protocol_negotiated = SSLClientSocket::NextProtoFromString(proto);
+  base::HistogramBase::Sample sample =
+      static_cast<base::HistogramBase::Sample>(protocol_negotiated);
+  // In addition to the protocol negotiated, we want to record which TLS
+  // extension was used, and in case of NPN, whether there was overlap between
+  // server and client list of supported protocols.
+  if (negotiation_extension_ == kExtensionNPN) {
+    if (status == kNextProtoNoOverlap) {
+      sample += 1000;
+    } else {
+      sample += 500;
+    }
+  } else {
+    DCHECK_EQ(kExtensionALPN, negotiation_extension_);
+  }
+  UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolNegotiation", sample);
+}
+
 // static
 void SSLClientSocket::RecordChannelIDSupport(
     ChannelIDService* channel_id_service,
     bool negotiated_channel_id,
     bool channel_id_enabled,
     bool supports_ecc) {
   // Since this enum is used for a histogram, do not change or re-use values.
   enum {
     DISABLED = 0,
     CLIENT_ONLY = 1,
@@ skipping 78 matching lines @@
     }
     wire_protos.push_back(proto.size());
     for (const char ch : proto) {
       wire_protos.push_back(static_cast<uint8_t>(ch));
     }
   }
 
   return wire_protos;
 }
 
-void SSLClientSocket::RecordNegotiationExtension() {
-  if (negotiation_extension_ == kExtensionUnknown)
-    return;
-  std::string proto;
-  SSLClientSocket::NextProtoStatus status = GetNextProto(&proto);
-  if (status == kNextProtoUnsupported)
-    return;
-  // Convert protocol into numerical value for histogram.
-  NextProto protocol_negotiated = SSLClientSocket::NextProtoFromString(proto);
-  base::HistogramBase::Sample sample =
-      static_cast<base::HistogramBase::Sample>(protocol_negotiated);
-  // In addition to the protocol negotiated, we want to record which TLS
-  // extension was used, and in case of NPN, whether there was overlap between
-  // server and client list of supported protocols.
-  if (negotiation_extension_ == kExtensionNPN) {
-    if (status == kNextProtoNoOverlap) {
-      sample += 1000;
-    } else {
-      sample += 500;
-    }
-  } else {
-    DCHECK_EQ(kExtensionALPN, negotiation_extension_);
-  }
-  UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolNegotiation", sample);
-}
-
 }  // namespace net