| Index: net/socket_stream/socket_stream.h
|
| diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
|
| index cfc764db252951a3ec82de70e6173dd28ea44893..525043b6ae334d7b664d7ed2d1e56031f155555d 100644
|
| --- a/net/socket_stream/socket_stream.h
|
| +++ b/net/socket_stream/socket_stream.h
|
| @@ -72,12 +72,12 @@ class NET_EXPORT SocketStream
|
| int max_pending_send_allowed) = 0;
|
|
|
| // Called when |amount_sent| bytes of data are sent.
|
| - virtual void OnSentData(SocketStream* socket,
|
| - int amount_sent) = 0;
|
| + virtual void OnSentData(SocketStream* socket, int amount_sent) = 0;
|
|
|
| // Called when |len| bytes of |data| are received.
|
| virtual void OnReceivedData(SocketStream* socket,
|
| - const char* data, int len) = 0;
|
| + const char* data,
|
| + int len) = 0;
|
|
|
| // Called when the socket stream has been closed.
|
| virtual void OnClose(SocketStream* socket) = 0;
|
| @@ -115,7 +115,9 @@ class NET_EXPORT SocketStream
|
| virtual ~Delegate() {}
|
| };
|
|
|
| - SocketStream(const GURL& url, Delegate* delegate, URLRequestContext* context,
|
| + SocketStream(const GURL& url,
|
| + Delegate* delegate,
|
| + URLRequestContext* context,
|
| CookieStore* cookie_store);
|
|
|
| // The user data allows the clients to associate data with this job.
|
| @@ -199,7 +201,7 @@ class NET_EXPORT SocketStream
|
| friend class WebSocketThrottleTest;
|
|
|
| typedef std::map<const void*, linked_ptr<UserData> > UserDataMap;
|
| - typedef std::deque< scoped_refptr<IOBufferWithSize> > PendingDataQueue;
|
| + typedef std::deque<scoped_refptr<IOBufferWithSize> > PendingDataQueue;
|
|
|
| class RequestHeaders : public IOBuffer {
|
| public:
|
| @@ -211,8 +213,8 @@ class NET_EXPORT SocketStream
|
|
|
| std::string headers_;
|
|
|
| - private:
|
| - virtual ~RequestHeaders();
|
| + private:
|
| + virtual ~RequestHeaders();
|
| };
|
|
|
| class ResponseHeaders : public IOBuffer {
|
| @@ -225,7 +227,7 @@ class NET_EXPORT SocketStream
|
| void Realloc(size_t new_size);
|
|
|
| private:
|
| - virtual ~ResponseHeaders();
|
| + virtual ~ResponseHeaders();
|
|
|
| scoped_ptr<char, base::FreeDeleter> headers_;
|
| };
|
| @@ -265,8 +267,8 @@ class NET_EXPORT SocketStream
|
|
|
| enum ProxyMode {
|
| kDirectConnection, // If using a direct connection
|
| - kTunnelProxy, // If using a tunnel (CONNECT method as HTTPS)
|
| - kSOCKSProxy, // If using a SOCKS proxy
|
| + kTunnelProxy, // If using a tunnel (CONNECT method as HTTPS)
|
| + kSOCKSProxy, // If using a SOCKS proxy
|
| };
|
|
|
| // Use the same number as HttpNetworkTransaction::kMaxHeaderBufSize.
|
|
|