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

net/socket/ssl_client_socket.h

 // 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
 #pragma once
 
 #include <string>
 
@@ skipping 59 matching lines @@
   // connection.
   enum NextProtoStatus {
     // WARNING: These values are serialized to disk. Don't change them.
 
     kNextProtoUnsupported = 0,  // The server doesn't support NPN.
     kNextProtoNegotiated = 1,   // We agreed on a protocol.
     kNextProtoNoOverlap = 2,    // No protocols in common. We requested
                                 // the first protocol in our list.
   };
 
-  // Next Protocol Negotiation (NPN), if successful, results in agreement on an
-  // application-level string that specifies the application level protocol to
-  // use over the TLS connection. NextProto enumerates the application level
-  // protocols that we recognise.
-  enum NextProto {
-    kProtoUnknown = 0,
-    kProtoHTTP11 = 1,
-    kProtoSPDY1 = 2,
-    kProtoSPDY2 = 3,
-    kProtoSPDY21 = 4,
-    kProtoSPDY3 = 5,
-  };
-
   // Gets the SSL connection information of the socket.
   //
   // TODO(sergeyu): Move this method to the SSLSocket interface and
   // implemented in SSLServerSocket too.
   virtual void GetSSLInfo(SSLInfo* ssl_info) = 0;
 
   // Gets the SSL CertificateRequest info of the socket after Connect failed
   // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) = 0;
 
   // Get the application level protocol that we negotiated with the server.
   // *proto is set to the resulting protocol (n.b. that the string may have
   // embedded NULs).
   //   kNextProtoUnsupported: *proto is cleared.
   //   kNextProtoNegotiated:  *proto is set to the negotiated protocol.
   //   kNextProtoNoOverlap:   *proto is set to the first protocol in the
   //                          supported list.
   // *server_protos is set to the server advertised protocols.
   virtual NextProtoStatus GetNextProto(std::string* proto,
                                        std::string* server_protos) = 0;
 
   static NextProto NextProtoFromString(const std::string& proto_string);
 
-  static const char* NextProtoToString(SSLClientSocket::NextProto next_proto);
+  static const char* NextProtoToString(NextProto next_proto);
 
-  static const char* NextProtoStatusToString(
-      const SSLClientSocket::NextProtoStatus status);
+  static const char* NextProtoStatusToString(const NextProtoStatus status);
 
   // Can be used with the second argument(|server_protos|) of |GetNextProto| to
   // construct a comma separated string of server advertised protocols.
   static std::string ServerProtosToString(const std::string& server_protos);
 
   static bool IgnoreCertError(int error, int load_flags);
 
   // ClearSessionCache clears the SSL session cache, used to resume SSL
   // sessions.
   static void ClearSessionCache();
 
   virtual bool was_npn_negotiated() const;
 
   virtual bool set_was_npn_negotiated(bool negotiated);
 
   virtual bool was_spdy_negotiated() const;
 
   virtual bool set_was_spdy_negotiated(bool negotiated);
 
-  virtual SSLClientSocket::NextProto protocol_negotiated() const;
+  virtual NextProto protocol_negotiated() const;
 
-  virtual void set_protocol_negotiated(
-      SSLClientSocket::NextProto protocol_negotiated);
+  virtual void set_protocol_negotiated(NextProto protocol_negotiated);
 
   // Returns the ServerBoundCertService used by this socket, or NULL if
   // server bound certificates are not supported.
   virtual ServerBoundCertService* GetServerBoundCertService() const = 0;
 
   // Returns true if a domain bound certificate was sent on this connection.
   // This may be useful for protocols, like SPDY, which allow the same
   // connection to be shared between multiple domains, each of which need
   // a domain bound certificate.
   virtual bool WasDomainBoundCertSent() const;
 
   // Returns the type of the domain bound cert that was sent, or
   // CLIENT_CERT_INVALID_TYPE if none was sent.
   virtual SSLClientCertType domain_bound_cert_type() const;
 
   virtual SSLClientCertType set_domain_bound_cert_type(SSLClientCertType type);
 
  private:
   // True if NPN was responded to, independent of selecting SPDY or HTTP.
   bool was_npn_negotiated_;
   // True if NPN successfully negotiated SPDY.
   bool was_spdy_negotiated_;
   // Protocol that we negotiated with the server.
-  SSLClientSocket::NextProto protocol_negotiated_;
+  NextProto protocol_negotiated_;
   // Type of the domain bound cert that was sent, or CLIENT_CERT_INVALID_TYPE
   // if none was sent.
   SSLClientCertType domain_bound_cert_type_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_H_