Clean up NPN/ALPN-related SSLClientSocket bits.

net/socket/ssl_client_socket_nss.cc

Index: net/socket/ssl_client_socket_nss.cc
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 380a7729819ec88e3c51bc60f73269ddf6741b32..e2a740c0b74d95b969b4f14e033bbaaea6278b8b 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -2567,8 +2567,8 @@ int SSLClientSocketNSS::GetTLSUniqueChannelBinding(std::string* out) {
   return OK;
 }
 
-SSLClientSocket::NextProtoStatus
-SSLClientSocketNSS::GetNextProto(std::string* proto) {
+SSLClientSocket::NextProtoStatus SSLClientSocketNSS::GetNextProto(
+    std::string* proto) const {
   *proto = core_->state().next_proto;
   return core_->state().next_proto_status;
 }
@@ -3046,6 +3046,8 @@ int SSLClientSocketNSS::DoHandshakeComplete(int result) {
       return ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION;
     }
 
+    RecordNegotiationExtension();
+
     // SSL handshake is completed. Let's verify the certificate.
     GotoState(STATE_VERIFY_CERT);
     // Done!