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

net/http/http_stream_factory_impl_job.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_STREAM_FACTORY_IMPL_JOB_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 49 matching lines @@
 
   // Tells |this| that |job| has determined it still needs to continue
   // connecting, so allow |this| to continue. If this is not called, then
   // |request_| is expected to cancel |this| by deleting it.
   void Resume(Job* job);
 
   // Used to detach the Job from |request|.
   void Orphan(const Request* request);
 
   bool was_npn_negotiated() const;
-  SSLClientSocket::NextProto protocol_negotiated() const;
+  NextProto protocol_negotiated() const;
   bool using_spdy() const;
   const BoundNetLog& net_log() const { return net_log_; }
 
   const SSLConfig& server_ssl_config() const;
   const SSLConfig& proxy_ssl_config() const;
   const ProxyInfo& proxy_info() const;
 
   // Indicates whether or not this job is performing a preconnect.
   bool IsPreconnecting() const;
 
@@ skipping 178 matching lines @@
   // True when the tunnel is in the process of being established - we can't
   // read from the socket until the tunnel is done.
   bool establishing_tunnel_;
 
   scoped_ptr<HttpStream> stream_;
 
   // True if we negotiated NPN.
   bool was_npn_negotiated_;
 
   // Protocol negotiated with the server.
-  SSLClientSocket::NextProto protocol_negotiated_;
+  NextProto protocol_negotiated_;
 
   // 0 if we're not preconnecting. Otherwise, the number of streams to
   // preconnect.
   int num_streams_;
 
   // Initialized when we create a new SpdySession.
   scoped_refptr<SpdySession> new_spdy_session_;
 
   // Initialized when we have an existing SpdySession.
   scoped_refptr<SpdySession> existing_spdy_session_;
 
   // Only used if |new_spdy_session_| is non-NULL.
   bool spdy_session_direct_;
 
   // Key used to identify the HttpPipelinedHost for |request_|.
   scoped_ptr<HttpPipelinedHost::Key> http_pipelining_key_;
 
   // True if an existing pipeline can handle this job's request.
   bool existing_available_pipeline_;
 
   base::WeakPtrFactory<Job> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Job);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_