| Index: net/socket_stream/socket_stream.h
|
| diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
|
| index f4855433df3733565df4bf3a4c4a56dd169eda73..b2afd1b97ab0859b26ca5bd5053aec83a54fa2ae 100644
|
| --- a/net/socket_stream/socket_stream.h
|
| +++ b/net/socket_stream/socket_stream.h
|
| @@ -156,6 +156,11 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| Delegate* delegate_;
|
|
|
| private:
|
| + friend class WebSocketThrottleTest;
|
| +
|
| + typedef std::map<const void*, linked_ptr<UserData> > UserDataMap;
|
| + typedef std::deque< scoped_refptr<IOBufferWithSize> > PendingDataQueue;
|
| +
|
| class RequestHeaders : public IOBuffer {
|
| public:
|
| RequestHeaders() : IOBuffer() {}
|
| @@ -212,9 +217,8 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| kSOCKSProxy, // If using a SOCKS proxy
|
| };
|
|
|
| - typedef std::deque< scoped_refptr<IOBufferWithSize> > PendingDataQueue;
|
| -
|
| - friend class WebSocketThrottleTest;
|
| + // Use the same number as HttpNetworkTransaction::kMaxHeaderBufSize.
|
| + enum { kMaxTunnelResponseHeadersSize = 32768 }; // 32 kilobytes.
|
|
|
| // Copies the given addrinfo list in |addresses_|.
|
| // Used for WebSocketThrottleTest.
|
| @@ -269,7 +273,6 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| int max_pending_send_allowed_;
|
| scoped_refptr<URLRequestContext> context_;
|
|
|
| - typedef std::map<const void*, linked_ptr<UserData> > UserDataMap;
|
| UserDataMap user_data_;
|
|
|
| State next_state_;
|
| @@ -295,9 +298,6 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> {
|
| int tunnel_response_headers_capacity_;
|
| int tunnel_response_headers_len_;
|
|
|
| - // Use the same number as HttpNetworkTransaction::kMaxHeaderBufSize.
|
| - enum { kMaxTunnelResponseHeadersSize = 32768 }; // 32 kilobytes.
|
| -
|
| scoped_ptr<SingleRequestHostResolver> resolver_;
|
| AddressList addresses_;
|
| scoped_ptr<ClientSocket> socket_;
|
|
|