Attempting to re-land CL 3110006 which turned out to have ...

net/http/http_stream_request.h

 // Copyright (c) 2010 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_REQUEST_H_
 #define NET_HTTP_HTTP_STREAM_REQUEST_H_
 
 #include "base/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/ssl_config_service.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_auth_controller.h"
 #include "net/http/http_alternate_protocols.h"
 #include "net/http/http_stream_factory.h"
 #include "net/http/stream_factory.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/client_socket_handle.h"
 
 namespace net {
 
 class ClientSocketHandle;
 class HttpAuthController;
 class HttpNetworkSession;
+class HttpProxySocketParams;
 class HttpStreamFactory;
+class SOCKSSocketParams;
+class SSLSocketParams;
 class StreamRequestDelegate;
+class TCPSocketParams;
 struct HttpRequestInfo;
 
 // An HttpStreamRequest exists for each stream which is in progress of being
 // created for the StreamFactory.
 class HttpStreamRequest : public StreamFactory::StreamRequestJob {
  public:
   HttpStreamRequest(HttpStreamFactory* factory,
                     const scoped_refptr<HttpNetworkSession>& session);
   virtual ~HttpStreamRequest();
 
@@ skipping 63 matching lines @@
   int DoResolveProxy();
   int DoResolveProxyComplete(int result);
   int DoInitConnection();
   int DoInitConnectionComplete(int result);
   int DoWaitingUserAction(int result);
   int DoCreateStream();
   int DoCreateStreamComplete(int result);
   int DoRestartTunnelAuth();
   int DoRestartTunnelAuthComplete(int result);
 
+  // Returns a newly create SSLSocketParams, and sets several
+  // fields of ssl_config_.
+  scoped_refptr<SSLSocketParams> GenerateSslParams(
+      scoped_refptr<TCPSocketParams> tcp_params,
+      scoped_refptr<HttpProxySocketParams> http_proxy_params,
+      scoped_refptr<SOCKSSocketParams> socks_params,
+      ProxyServer::Scheme proxy_scheme,
+      bool want_spdy_over_npn);
+
   // AlternateProtocol API
   void MarkBrokenAlternateProtocolAndFallback();
 
   // Retrieve SSLInfo from our SSL Socket.
   // This must only be called when we are using an SSLSocket.
   // After calling, the caller can use ssl_info_.
   void GetSSLInfo();
 
   // Called when we encounter a network error that could be resolved by trying
   // a new proxy configuration.  If there is another proxy configuration to try
@@ skipping 76 matching lines @@
   // this has been cancelled, input parameters passed into the StreamRequest
   // can no longer be touched (as they belong to the requestor).
   bool cancelled_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpStreamRequest);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_REQUEST_H_
-