Move NextProto enum to a new file net/socket/next_proto.h

net/socket/ssl_client_socket_pool.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_pool.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 277 matching lines @@
   std::string server_protos;
   // GetNextProto will fail and and trigger a NOTREACHED if we pass in a socket
   // that hasn't had SSL_ImportFD called on it. If we get a certificate error
   // here, then we know that we called SSL_ImportFD.
   if (result == OK || IsCertificateError(result))
     status = ssl_socket_->GetNextProto(&proto, &server_protos);
 
   // If we want spdy over npn, make sure it succeeded.
   if (status == SSLClientSocket::kNextProtoNegotiated) {
     ssl_socket_->set_was_npn_negotiated(true);
-    SSLClientSocket::NextProto protocol_negotiated =
+    NextProto protocol_negotiated =
         SSLClientSocket::NextProtoFromString(proto);
     ssl_socket_->set_protocol_negotiated(protocol_negotiated);
     // If we negotiated either version of SPDY, we must have
     // advertised it, so allow it.
     // TODO(mbelshe): verify it was a protocol we advertised?
-    if (protocol_negotiated == SSLClientSocket::kProtoSPDY1 ||
-        protocol_negotiated == SSLClientSocket::kProtoSPDY2 ||
-        protocol_negotiated == SSLClientSocket::kProtoSPDY21 ||
-        protocol_negotiated == SSLClientSocket::kProtoSPDY3) {
+    if (protocol_negotiated == kProtoSPDY1 ||
+        protocol_negotiated == kProtoSPDY2 ||
+        protocol_negotiated == kProtoSPDY21 ||
+        protocol_negotiated == kProtoSPDY3) {
       ssl_socket_->set_was_spdy_negotiated(true);
     }
   }
   if (params_->want_spdy_over_npn() && !ssl_socket_->was_spdy_negotiated())
     return ERR_NPN_NEGOTIATION_FAILED;
 
   // Spdy might be turned on by default, or it might be over npn.
   bool using_spdy = params_->force_spdy_over_ssl() ||
       params_->want_spdy_over_npn();
 
@@ skipping 267 matching lines @@
 
 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const {
   return base_.histograms();
 }
 
 void SSLClientSocketPool::OnSSLConfigChanged() {
   Flush();
 }
 
 }  // namespace net