Index: net/websockets/websocket_stream.cc |
diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc |
index 399b8f0b0911e23c1c1a2acbfa8a5ac90cf22349..e4a1edaac8f1c7f1a7ca9e1a878738173cc3b545 100644 |
--- a/net/websockets/websocket_stream.cc |
+++ b/net/websockets/websocket_stream.cc |
@@ -46,9 +46,9 @@ class Delegate : public URLRequest::Delegate { |
virtual void OnAuthRequired(URLRequest* request, |
AuthChallengeInfo* auth_info) OVERRIDE; |
- virtual void OnCertificateRequested(URLRequest* request, |
- SSLCertRequestInfo* cert_request_info) |
- OVERRIDE; |
+ virtual void OnCertificateRequested( |
+ URLRequest* request, |
+ SSLCertRequestInfo* cert_request_info) OVERRIDE; |
virtual void OnSSLCertificateError(URLRequest* request, |
const SSLInfo& ssl_info, |
@@ -96,9 +96,8 @@ class StreamRequestImpl : public WebSocketStreamRequest { |
failure_message = "WebSocket opening handshake was canceled"; |
break; |
case URLRequestStatus::FAILED: |
- failure_message = |
- std::string("Error in connection establishment: ") + |
- ErrorToString(url_request_.status().error()); |
+ failure_message = std::string("Error in connection establishment: ") + |
+ ErrorToString(url_request_.status().error()); |
break; |
} |
} |
@@ -181,8 +180,7 @@ scoped_ptr<WebSocketStreamRequest> CreateAndConnectStreamWithCreateHelper( |
request->url_request()->SetUserData( |
WebSocketHandshakeStreamBase::CreateHelper::DataKey(), |
create_helper.release()); |
- request->url_request()->SetLoadFlags(LOAD_DISABLE_CACHE | |
- LOAD_BYPASS_CACHE | |
+ request->url_request()->SetLoadFlags(LOAD_DISABLE_CACHE | LOAD_BYPASS_CACHE | |
LOAD_DO_NOT_PROMPT_FOR_LOGIN); |
request->url_request()->Start(); |
return request.PassAs<WebSocketStreamRequest>(); |
@@ -190,12 +188,16 @@ scoped_ptr<WebSocketStreamRequest> CreateAndConnectStreamWithCreateHelper( |
} // namespace |
-WebSocketStreamRequest::~WebSocketStreamRequest() {} |
+WebSocketStreamRequest::~WebSocketStreamRequest() { |
+} |
-WebSocketStream::WebSocketStream() {} |
-WebSocketStream::~WebSocketStream() {} |
+WebSocketStream::WebSocketStream() { |
+} |
+WebSocketStream::~WebSocketStream() { |
+} |
-WebSocketStream::ConnectDelegate::~ConnectDelegate() {} |
+WebSocketStream::ConnectDelegate::~ConnectDelegate() { |
+} |
scoped_ptr<WebSocketStreamRequest> WebSocketStream::CreateAndConnectStream( |
const GURL& socket_url, |