OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/http/http_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
453 | 453 |
454 load_timing_info->proxy_resolve_start = | 454 load_timing_info->proxy_resolve_start = |
455 proxy_info_.proxy_resolve_start_time(); | 455 proxy_info_.proxy_resolve_start_time(); |
456 load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time(); | 456 load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time(); |
457 load_timing_info->send_start = send_start_time_; | 457 load_timing_info->send_start = send_start_time_; |
458 load_timing_info->send_end = send_end_time_; | 458 load_timing_info->send_end = send_end_time_; |
459 return true; | 459 return true; |
460 } | 460 } |
461 | 461 |
462 bool HttpNetworkTransaction::GetRemoteEndpoint(IPEndPoint* endpoint) const { | 462 bool HttpNetworkTransaction::GetRemoteEndpoint(IPEndPoint* endpoint) const { |
463 if (!remote_endpoint_.address().size()) | 463 if (!remote_endpoint_.address().bytes().size()) |
eroman
2016/01/13 23:19:42
no change needed here per earlier comment (address
martijnc
2016/01/14 22:48:17
Done.
| |
464 return false; | 464 return false; |
465 | 465 |
466 *endpoint = remote_endpoint_; | 466 *endpoint = remote_endpoint_; |
467 return true; | 467 return true; |
468 } | 468 } |
469 | 469 |
470 void HttpNetworkTransaction::PopulateNetErrorDetails( | 470 void HttpNetworkTransaction::PopulateNetErrorDetails( |
471 NetErrorDetails* details) const { | 471 NetErrorDetails* details) const { |
472 *details = net_error_details_; | 472 *details = net_error_details_; |
473 if (stream_) | 473 if (stream_) |
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1709 DCHECK(stream_request_); | 1709 DCHECK(stream_request_); |
1710 | 1710 |
1711 // Since the transaction can restart with auth credentials, it may create a | 1711 // Since the transaction can restart with auth credentials, it may create a |
1712 // stream more than once. Accumulate all of the connection attempts across | 1712 // stream more than once. Accumulate all of the connection attempts across |
1713 // those streams by appending them to the vector: | 1713 // those streams by appending them to the vector: |
1714 for (const auto& attempt : stream_request_->connection_attempts()) | 1714 for (const auto& attempt : stream_request_->connection_attempts()) |
1715 connection_attempts_.push_back(attempt); | 1715 connection_attempts_.push_back(attempt); |
1716 } | 1716 } |
1717 | 1717 |
1718 } // namespace net | 1718 } // namespace net |
OLD | NEW |