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 "base/metrics/sparse_histogram.h" | 10 #include "base/metrics/sparse_histogram.h" |
11 #include "net/base/load_flags.h" | 11 #include "net/base/load_flags.h" |
12 #include "net/http/http_request_headers.h" | 12 #include "net/http/http_request_headers.h" |
13 #include "net/http/http_status_code.h" | 13 #include "net/http/http_status_code.h" |
| 14 #include "net/url_request/redirect_info.h" |
14 #include "net/url_request/url_request.h" | 15 #include "net/url_request/url_request.h" |
15 #include "net/url_request/url_request_context.h" | 16 #include "net/url_request/url_request_context.h" |
16 #include "net/websockets/websocket_errors.h" | 17 #include "net/websockets/websocket_errors.h" |
17 #include "net/websockets/websocket_event_interface.h" | 18 #include "net/websockets/websocket_event_interface.h" |
18 #include "net/websockets/websocket_handshake_constants.h" | 19 #include "net/websockets/websocket_handshake_constants.h" |
19 #include "net/websockets/websocket_handshake_stream_base.h" | 20 #include "net/websockets/websocket_handshake_stream_base.h" |
20 #include "net/websockets/websocket_handshake_stream_create_helper.h" | 21 #include "net/websockets/websocket_handshake_stream_create_helper.h" |
21 #include "net/websockets/websocket_test_util.h" | 22 #include "net/websockets/websocket_test_util.h" |
22 #include "url/gurl.h" | 23 #include "url/gurl.h" |
23 #include "url/origin.h" | 24 #include "url/origin.h" |
(...skipping 14 matching lines...) Expand all Loading... |
38 | 39 |
39 explicit Delegate(StreamRequestImpl* owner) | 40 explicit Delegate(StreamRequestImpl* owner) |
40 : owner_(owner), result_(INCOMPLETE) {} | 41 : owner_(owner), result_(INCOMPLETE) {} |
41 virtual ~Delegate() { | 42 virtual ~Delegate() { |
42 UMA_HISTOGRAM_ENUMERATION( | 43 UMA_HISTOGRAM_ENUMERATION( |
43 "Net.WebSocket.HandshakeResult", result_, NUM_HANDSHAKE_RESULT_TYPES); | 44 "Net.WebSocket.HandshakeResult", result_, NUM_HANDSHAKE_RESULT_TYPES); |
44 } | 45 } |
45 | 46 |
46 // Implementation of URLRequest::Delegate methods. | 47 // Implementation of URLRequest::Delegate methods. |
47 virtual void OnReceivedRedirect(URLRequest* request, | 48 virtual void OnReceivedRedirect(URLRequest* request, |
48 const GURL& new_url, | 49 const RedirectInfo& redirect_info, |
49 bool* defer_redirect) OVERRIDE { | 50 bool* defer_redirect) OVERRIDE { |
50 // HTTP status codes returned by HttpStreamParser are filtered by | 51 // HTTP status codes returned by HttpStreamParser are filtered by |
51 // WebSocketBasicHandshakeStream, and only 101, 401 and 407 are permitted | 52 // WebSocketBasicHandshakeStream, and only 101, 401 and 407 are permitted |
52 // back up the stack to HttpNetworkTransaction. In particular, redirect | 53 // back up the stack to HttpNetworkTransaction. In particular, redirect |
53 // codes are never allowed, and so URLRequest never sees a redirect on a | 54 // codes are never allowed, and so URLRequest never sees a redirect on a |
54 // WebSocket request. | 55 // WebSocket request. |
55 NOTREACHED(); | 56 NOTREACHED(); |
56 } | 57 } |
57 | 58 |
58 virtual void OnResponseStarted(URLRequest* request) OVERRIDE; | 59 virtual void OnResponseStarted(URLRequest* request) OVERRIDE; |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 new StreamRequestImpl(socket_url, | 280 new StreamRequestImpl(socket_url, |
280 url_request_context, | 281 url_request_context, |
281 origin, | 282 origin, |
282 connect_delegate.Pass(), | 283 connect_delegate.Pass(), |
283 create_helper.Pass())); | 284 create_helper.Pass())); |
284 request->Start(); | 285 request->Start(); |
285 return request.PassAs<WebSocketStreamRequest>(); | 286 return request.PassAs<WebSocketStreamRequest>(); |
286 } | 287 } |
287 | 288 |
288 } // namespace net | 289 } // namespace net |
OLD | NEW |