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

net/http/http_stream_factory_impl_request.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_REQUEST_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_
 
 #include <set>
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
@@ skipping 26 matching lines @@
   // Returns true if this is this key was new to the factory.
   bool SetHttpPipeliningKey(const HttpPipelinedHost::Key& http_pipelining_key);
 
   // Attaches |job| to this request. Does not mean that Request will use |job|,
   // but Request will own |job|.
   void AttachJob(HttpStreamFactoryImpl::Job* job);
 
   // Marks completion of the request. Must be called before OnStreamReady().
   // |job_net_log| is the BoundNetLog of the Job that fulfilled this request.
   void Complete(bool was_npn_negotiated,
-                SSLClientSocket::NextProto protocol_negotiated,
+                NextProto protocol_negotiated,
                 bool using_spdy,
                 const BoundNetLog& job_net_log);
 
   // If this Request has a |spdy_session_key_|, remove this session from the
   // SpdySessionRequestMap.
   void RemoveRequestFromSpdySessionRequestMap();
 
   // If this Request has a |http_pipelining_key_|, remove this session from the
   // HttpPipeliningRequestMap.
   void RemoveRequestFromHttpPipeliningRequestMap();
@@ skipping 29 matching lines @@
       const SSLConfig& used_ssl_config,
       const ProxyInfo& used_proxy_info,
       HttpStream* stream);
 
   // HttpStreamRequest methods.
 
   virtual int RestartTunnelWithProxyAuth(
       const AuthCredentials& credentials) OVERRIDE;
   virtual LoadState GetLoadState() const OVERRIDE;
   virtual bool was_npn_negotiated() const OVERRIDE;
-  virtual SSLClientSocket::NextProto protocol_negotiated() const OVERRIDE;
+  virtual NextProto protocol_negotiated() const OVERRIDE;
   virtual bool using_spdy() const OVERRIDE;
 
  private:
   // Used to orphan all jobs in |jobs_| other than |job| which becomes "bound"
   // to the request.
   void OrphanJobsExcept(Job* job);
 
   // Used to orphan all jobs in |jobs_|.
   void OrphanJobs();
 
   const GURL url_;
   HttpStreamFactoryImpl* const factory_;
   HttpStreamRequest::Delegate* const delegate_;
   const BoundNetLog net_log_;
 
   // At the point where Job is irrevocably tied to the Request, we set this.
   scoped_ptr<Job> bound_job_;
   std::set<HttpStreamFactoryImpl::Job*> jobs_;
   scoped_ptr<const HostPortProxyPair> spdy_session_key_;
   scoped_ptr<const HttpPipelinedHost::Key> http_pipelining_key_;
 
   bool completed_;
   bool was_npn_negotiated_;
   // Protocol negotiated with the server.
-  SSLClientSocket::NextProto protocol_negotiated_;
+  NextProto protocol_negotiated_;
   bool using_spdy_;
 
   DISALLOW_COPY_AND_ASSIGN(Request);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_