| Index: net/websockets/websocket_job.h
|
| diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
|
| index 119c4dcfaa9fc89f99fe47f0659ff50f90c2aa50..a3ba1eb31d37627b810731fa6938c5e0d686a724 100644
|
| --- a/net/websockets/websocket_job.h
|
| +++ b/net/websockets/websocket_job.h
|
| @@ -31,10 +31,9 @@ class WebSocketHandshakeResponseHandler;
|
| // see HttpOnly cookies, so it injects cookie header in handshake request and
|
| // strips set-cookie headers in handshake response.
|
| // TODO(ukai): refactor websocket.cc to use this.
|
| -class NET_EXPORT WebSocketJob
|
| - : public SocketStreamJob,
|
| - public SocketStream::Delegate,
|
| - public SpdyWebSocketStream::Delegate {
|
| +class NET_EXPORT WebSocketJob : public SocketStreamJob,
|
| + public SocketStream::Delegate,
|
| + public SpdyWebSocketStream::Delegate {
|
| public:
|
| // This is state of WebSocket, not SocketStream.
|
| enum State {
|
| @@ -62,7 +61,8 @@ class NET_EXPORT WebSocketJob
|
|
|
| // SocketStream::Delegate methods.
|
| virtual int OnStartOpenConnection(
|
| - SocketStream* socket, const CompletionCallback& callback) OVERRIDE;
|
| + SocketStream* socket,
|
| + const CompletionCallback& callback) OVERRIDE;
|
| virtual void OnConnected(SocketStream* socket,
|
| int max_pending_send_allowed) OVERRIDE;
|
| virtual void OnSentData(SocketStream* socket, int amount_sent) OVERRIDE;
|
| @@ -70,8 +70,8 @@ class NET_EXPORT WebSocketJob
|
| const char* data,
|
| int len) OVERRIDE;
|
| virtual void OnClose(SocketStream* socket) OVERRIDE;
|
| - virtual void OnAuthRequired(
|
| - SocketStream* socket, AuthChallengeInfo* auth_info) OVERRIDE;
|
| + virtual void OnAuthRequired(SocketStream* socket,
|
| + AuthChallengeInfo* auth_info) OVERRIDE;
|
| virtual void OnSSLCertificateError(SocketStream* socket,
|
| const SSLInfo& ssl_info,
|
| bool fatal) OVERRIDE;
|
| @@ -98,8 +98,9 @@ class NET_EXPORT WebSocketJob
|
| void OnSentHandshakeRequest(SocketStream* socket, int amount_sent);
|
| // Parses received data into handshake_response_. When finished receiving the
|
| // response, calls SaveCookiesAndNotifyHeadersComplete().
|
| - void OnReceivedHandshakeResponse(
|
| - SocketStream* socket, const char* data, int len);
|
| + void OnReceivedHandshakeResponse(SocketStream* socket,
|
| + const char* data,
|
| + int len);
|
| // Saves received cookies to the cookie store, and then notifies the
|
| // delegate_ of completion of handshake.
|
| void SaveCookiesAndNotifyHeadersComplete();
|
|
|