diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 23:02:11 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 23:02:11 +0000 |
commit | 4b3c95dd199586b4c540800be8cd223e948e5e3f (patch) | |
tree | c97ef865a3c85f09e920d8b1bc4024a56bb8e8cf /net/socket_stream | |
parent | d160ec0e875e98829684f040d843e6a292dbb3ba (diff) | |
download | chromium_src-4b3c95dd199586b4c540800be8cd223e948e5e3f.zip chromium_src-4b3c95dd199586b4c540800be8cd223e948e5e3f.tar.gz chromium_src-4b3c95dd199586b4c540800be8cd223e948e5e3f.tar.bz2 |
Start reordering the methods in headers in net/.
This patch also starts reordering some of the cc files to match their
headers. More of both cleanups will be done in future patches.
BUG=68682
TEST=compiles
Review URL: http://codereview.chromium.org/6085013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r-- | net/socket_stream/socket_stream.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index f485543..b2afd1b 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_; |