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

net/socket/ssl_client_socket_openssl.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_OPENSSL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 45 matching lines @@
                               const unsigned char* in, unsigned int inlen);
 
   // SSLClientSocket implementation.
   virtual void GetSSLInfo(SSLInfo* ssl_info);
   virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
   virtual int ExportKeyingMaterial(const base::StringPiece& label,
                                    bool has_context,
                                    const base::StringPiece& context,
                                    unsigned char* out,
                                    unsigned int outlen);
-  virtual NextProtoStatus GetNextProto(std::string* proto,
+  virtual SSLClientSocket::NextProtoStatus GetNextProto(std::string* proto,
                                        std::string* server_protos);
   virtual ServerBoundCertService* GetServerBoundCertService() const;
 
   // StreamSocket implementation.
   virtual int Connect(const CompletionCallback& callback);
   virtual void Disconnect();
   virtual bool IsConnected() const;
   virtual bool IsConnectedAndIdle() const;
   virtual int GetPeerAddress(AddressList* address) const;
   virtual int GetLocalAddress(IPEndPoint* address) const;
@@ skipping 87 matching lines @@
   // Used for session cache diagnostics.
   bool trying_cached_session_;
 
   enum State {
     STATE_NONE,
     STATE_HANDSHAKE,
     STATE_VERIFY_CERT,
     STATE_VERIFY_CERT_COMPLETE,
   };
   State next_handshake_state_;
-  NextProtoStatus npn_status_;
+  SSLClientSocket::NextProtoStatus npn_status_;
   std::string npn_proto_;
   std::string server_protos_;
   BoundNetLog net_log_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_