| Index: net/socket_stream/socket_stream.h
|
| diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
|
| index e1f25849c5c4caaae08bc3cbe8eb43575d0b6bf6..645a74bc13b1897c028dfdb3fcad44f73c895026 100644
|
| --- a/net/socket_stream/socket_stream.h
|
| +++ b/net/socket_stream/socket_stream.h
|
| @@ -17,6 +17,7 @@
|
| #include "base/task.h"
|
| #include "net/base/address_list.h"
|
| #include "net/base/completion_callback.h"
|
| +#include "net/base/host_port_pair.h"
|
| #include "net/base/io_buffer.h"
|
| #include "net/base/net_log.h"
|
| #include "net/base/net_errors.h"
|
| @@ -34,6 +35,7 @@ class AuthChallengeInfo;
|
| class ClientSocketFactory;
|
| class HostResolver;
|
| class HttpAuthHandlerFactory;
|
| +class ProxyServer;
|
| class SSLConfigService;
|
| class SingleRequestHostResolver;
|
| class SocketStreamMetrics;
|
| @@ -142,6 +144,10 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| // back.
|
| virtual void DetachDelegate();
|
|
|
| + const HostPortPair& GetHostPortPair() const;
|
| + const ProxyServer& proxy_server() const;
|
| + void SwitchToSpdy();
|
| +
|
| // Sets an alternative HostResolver. For testing purposes only.
|
| void SetHostResolver(HostResolver* host_resolver);
|
|
|
| @@ -202,6 +208,7 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| STATE_SSL_CONNECT,
|
| STATE_SSL_CONNECT_COMPLETE,
|
| STATE_READ_WRITE,
|
| + STATE_SPDY,
|
| STATE_AUTH_REQUIRED,
|
| STATE_CLOSE,
|
| };
|
| @@ -252,6 +259,7 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| int DoSSLConnect();
|
| int DoSSLConnectComplete(int result);
|
| int DoReadWrite(int result);
|
| + int DoSpdy();
|
|
|
| GURL ProxyAuthOrigin() const;
|
| int HandleAuthChallenge(const HttpResponseHeaders* headers);
|
| @@ -297,6 +305,10 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| // Use the same number as HttpNetworkTransaction::kMaxHeaderBufSize.
|
| enum { kMaxTunnelResponseHeadersSize = 32768 }; // 32 kilobytes.
|
|
|
| + // The hostname and port of the endpoint. This is not necessarily the one
|
| + // specified by the URL, due to Alternate-Protocol or fixed testing ports.
|
| + HostPortPair endpoint_;
|
| +
|
| scoped_ptr<SingleRequestHostResolver> resolver_;
|
| AddressList addresses_;
|
| scoped_ptr<ClientSocket> socket_;
|
|
|