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

net/http/http_pipelined_connection_impl.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_HTTP_HTTP_PIPELINED_CONNECTION_IMPL_H_
 #define NET_HTTP_HTTP_PIPELINED_CONNECTION_IMPL_H_
 #pragma once
 
 #include <map>
 #include <queue>
@@ skipping 38 matching lines @@
   class Factory : public HttpPipelinedConnection::Factory {
    public:
     virtual HttpPipelinedConnection* CreateNewPipeline(
         ClientSocketHandle* connection,
         HttpPipelinedConnection::Delegate* delegate,
         const HostPortPair& origin,
         const SSLConfig& used_ssl_config,
         const ProxyInfo& used_proxy_info,
         const BoundNetLog& net_log,
         bool was_npn_negotiated,
-        SSLClientSocket::NextProto protocol_negotiated) OVERRIDE {
+        NextProto protocol_negotiated) OVERRIDE {
       return new HttpPipelinedConnectionImpl(connection, delegate, origin,
                                              used_ssl_config, used_proxy_info,
                                              net_log, was_npn_negotiated,
                                              protocol_negotiated);
     }
   };
 
   HttpPipelinedConnectionImpl(ClientSocketHandle* connection,
                               Delegate* delegate,
                               const HostPortPair& origin,
                               const SSLConfig& used_ssl_config,
                               const ProxyInfo& used_proxy_info,
                               const BoundNetLog& net_log,
                               bool was_npn_negotiated,
-                              SSLClientSocket::NextProto protocol_negotiated);
+                              NextProto protocol_negotiated);
   virtual ~HttpPipelinedConnectionImpl();
 
   // HttpPipelinedConnection interface.
 
   // Used by HttpStreamFactoryImpl and friends.
   virtual HttpPipelinedStream* CreateNewStream() OVERRIDE;
 
   // Used by HttpPipelinedHost.
   virtual int depth() const OVERRIDE;
   virtual bool usable() const OVERRIDE;
   virtual bool active() const OVERRIDE;
 
   // Used by HttpStreamFactoryImpl.
   virtual const SSLConfig& used_ssl_config() const OVERRIDE;
   virtual const ProxyInfo& used_proxy_info() const OVERRIDE;
   virtual const BoundNetLog& net_log() const OVERRIDE;
   virtual bool was_npn_negotiated() const OVERRIDE;
-  virtual SSLClientSocket::NextProto protocol_negotiated() const OVERRIDE;
+  virtual NextProto protocol_negotiated() const OVERRIDE;
 
   // Used by HttpPipelinedStream.
 
   // Notifies this pipeline that a stream is no longer using it.
   void OnStreamDeleted(int pipeline_id);
 
   // Effective implementation of HttpStream. Note that we don't directly
   // implement that interface. Instead, these functions will be called by the
   // pass-through methods in HttpPipelinedStream.
   void InitializeParser(int pipeline_id,
@@ skipping 197 matching lines @@
   // Invokes the callback queued in QueueUserCallback().
   void FireUserCallback(int pipeline_id, int result);
 
   Delegate* delegate_;
   scoped_ptr<ClientSocketHandle> connection_;
   SSLConfig used_ssl_config_;
   ProxyInfo used_proxy_info_;
   BoundNetLog net_log_;
   bool was_npn_negotiated_;
   // Protocol negotiated with the server.
-  SSLClientSocket::NextProto protocol_negotiated_;
+  NextProto protocol_negotiated_;
   scoped_refptr<GrowableIOBuffer> read_buf_;
   int next_pipeline_id_;
   bool active_;
   bool usable_;
   bool completed_one_request_;
   base::WeakPtrFactory<HttpPipelinedConnectionImpl> weak_factory_;
 
   StreamInfoMap stream_info_map_;
 
   std::queue<int> request_order_;
 
   std::queue<PendingSendRequest*> pending_send_request_queue_;
   scoped_ptr<PendingSendRequest> active_send_request_;
   SendRequestState send_next_state_;
   bool send_still_on_call_stack_;
 
   ReadHeadersState read_next_state_;
   int active_read_id_;
   bool read_still_on_call_stack_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpPipelinedConnectionImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_PIPELINED_CONNECTION_IMPL_H_