OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/websockets/websocket_stream.h" | 5 #include "net/websockets/websocket_stream.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "net/base/load_flags.h" |
10 #include "net/http/http_request_headers.h" | 11 #include "net/http/http_request_headers.h" |
11 #include "net/http/http_status_code.h" | 12 #include "net/http/http_status_code.h" |
12 #include "net/url_request/url_request.h" | 13 #include "net/url_request/url_request.h" |
13 #include "net/url_request/url_request_context.h" | 14 #include "net/url_request/url_request_context.h" |
14 #include "net/websockets/websocket_errors.h" | 15 #include "net/websockets/websocket_errors.h" |
15 #include "net/websockets/websocket_handshake_constants.h" | 16 #include "net/websockets/websocket_handshake_constants.h" |
16 #include "net/websockets/websocket_handshake_stream_base.h" | 17 #include "net/websockets/websocket_handshake_stream_base.h" |
17 #include "net/websockets/websocket_handshake_stream_create_helper.h" | 18 #include "net/websockets/websocket_handshake_stream_create_helper.h" |
18 #include "net/websockets/websocket_test_util.h" | 19 #include "net/websockets/websocket_test_util.h" |
19 #include "url/gurl.h" | 20 #include "url/gurl.h" |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate) { | 226 scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate) { |
226 return CreateAndConnectStreamWithCreateHelper(socket_url, | 227 return CreateAndConnectStreamWithCreateHelper(socket_url, |
227 create_helper.Pass(), | 228 create_helper.Pass(), |
228 origin, | 229 origin, |
229 url_request_context, | 230 url_request_context, |
230 net_log, | 231 net_log, |
231 connect_delegate.Pass()); | 232 connect_delegate.Pass()); |
232 } | 233 } |
233 | 234 |
234 } // namespace net | 235 } // namespace net |
OLD | NEW |