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 "net/base/load_flags.h" | 11 #include "net/base/load_flags.h" |
11 #include "net/http/http_request_headers.h" | 12 #include "net/http/http_request_headers.h" |
12 #include "net/http/http_status_code.h" | 13 #include "net/http/http_status_code.h" |
14 #include "net/http/http_util.h" | |
yhirano
2014/06/17 10:52:44
Do you need this line?
Adam Rice
2014/06/18 01:23:19
No. Removed.
| |
13 #include "net/url_request/url_request.h" | 15 #include "net/url_request/url_request.h" |
14 #include "net/url_request/url_request_context.h" | 16 #include "net/url_request/url_request_context.h" |
15 #include "net/websockets/websocket_errors.h" | 17 #include "net/websockets/websocket_errors.h" |
16 #include "net/websockets/websocket_event_interface.h" | 18 #include "net/websockets/websocket_event_interface.h" |
17 #include "net/websockets/websocket_handshake_constants.h" | 19 #include "net/websockets/websocket_handshake_constants.h" |
18 #include "net/websockets/websocket_handshake_stream_base.h" | 20 #include "net/websockets/websocket_handshake_stream_base.h" |
19 #include "net/websockets/websocket_handshake_stream_create_helper.h" | 21 #include "net/websockets/websocket_handshake_stream_create_helper.h" |
20 #include "net/websockets/websocket_test_util.h" | 22 #include "net/websockets/websocket_test_util.h" |
21 #include "url/gurl.h" | 23 #include "url/gurl.h" |
22 #include "url/origin.h" | 24 #include "url/origin.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
171 | 173 |
172 virtual void ContinueSSLRequest() OVERRIDE { | 174 virtual void ContinueSSLRequest() OVERRIDE { |
173 url_request_->ContinueDespiteLastError(); | 175 url_request_->ContinueDespiteLastError(); |
174 } | 176 } |
175 | 177 |
176 private: | 178 private: |
177 URLRequest* url_request_; | 179 URLRequest* url_request_; |
178 }; | 180 }; |
179 | 181 |
180 void Delegate::OnResponseStarted(URLRequest* request) { | 182 void Delegate::OnResponseStarted(URLRequest* request) { |
183 // All error codes, including OK and ABORTED, as with | |
184 // Net.ErrorCodesForMainFrame3 | |
185 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.WebSocket.ErrorCodes", | |
186 -request->status().error()); | |
181 if (!request->status().is_success()) { | 187 if (!request->status().is_success()) { |
182 DVLOG(3) << "OnResponseStarted (request failed)"; | 188 DVLOG(3) << "OnResponseStarted (request failed)"; |
183 owner_->ReportFailure(); | 189 owner_->ReportFailure(); |
184 return; | 190 return; |
185 } | 191 } |
186 DVLOG(3) << "OnResponseStarted (response code " << request->GetResponseCode() | 192 const int response_code = request->GetResponseCode(); |
187 << ")"; | 193 DVLOG(3) << "OnResponseStarted (response code " << response_code << ")"; |
188 switch (request->GetResponseCode()) { | 194 switch (response_code) { |
189 case HTTP_SWITCHING_PROTOCOLS: | 195 case HTTP_SWITCHING_PROTOCOLS: |
190 result_ = CONNECTED; | 196 result_ = CONNECTED; |
191 owner_->PerformUpgrade(); | 197 owner_->PerformUpgrade(); |
192 return; | 198 return; |
193 | 199 |
194 case HTTP_UNAUTHORIZED: | 200 case HTTP_UNAUTHORIZED: |
195 case HTTP_PROXY_AUTHENTICATION_REQUIRED: | 201 case HTTP_PROXY_AUTHENTICATION_REQUIRED: |
196 return; | 202 return; |
197 | 203 |
198 default: | 204 default: |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
273 new StreamRequestImpl(socket_url, | 279 new StreamRequestImpl(socket_url, |
274 url_request_context, | 280 url_request_context, |
275 origin, | 281 origin, |
276 connect_delegate.Pass(), | 282 connect_delegate.Pass(), |
277 create_helper.Pass())); | 283 create_helper.Pass())); |
278 request->Start(); | 284 request->Start(); |
279 return request.PassAs<WebSocketStreamRequest>(); | 285 return request.PassAs<WebSocketStreamRequest>(); |
280 } | 286 } |
281 | 287 |
282 } // namespace net | 288 } // namespace net |
OLD | NEW |