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 "content/browser/loader/resource_loader.h" | 5 #include "content/browser/loader/resource_loader.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 response->head.has_major_certificate_errors = | 107 response->head.has_major_certificate_errors = |
108 net::IsCertStatusError(request->ssl_info().cert_status) && | 108 net::IsCertStatusError(request->ssl_info().cert_status) && |
109 !net::IsCertStatusMinorError(request->ssl_info().cert_status); | 109 !net::IsCertStatusMinorError(request->ssl_info().cert_status); |
110 if (info->ShouldReportRawHeaders()) { | 110 if (info->ShouldReportRawHeaders()) { |
111 // Only pass these members when the network panel of the DevTools is open, | 111 // Only pass these members when the network panel of the DevTools is open, |
112 // i.e. ShouldReportRawHeaders() is set. These data are used to populate | 112 // i.e. ShouldReportRawHeaders() is set. These data are used to populate |
113 // the requests in the security panel too. | 113 // the requests in the security panel too. |
114 response->head.cert_status = request->ssl_info().cert_status; | 114 response->head.cert_status = request->ssl_info().cert_status; |
115 response->head.ssl_connection_status = | 115 response->head.ssl_connection_status = |
116 request->ssl_info().connection_status; | 116 request->ssl_info().connection_status; |
| 117 response->head.ssl_key_exchange_group = |
| 118 request->ssl_info().GetKeyExchangeGroup(); |
117 response->head.signed_certificate_timestamps = | 119 response->head.signed_certificate_timestamps = |
118 request->ssl_info().signed_certificate_timestamps; | 120 request->ssl_info().signed_certificate_timestamps; |
119 std::string encoded; | 121 std::string encoded; |
120 bool rv = net::X509Certificate::GetDEREncoded( | 122 bool rv = net::X509Certificate::GetDEREncoded( |
121 request->ssl_info().cert->os_cert_handle(), &encoded); | 123 request->ssl_info().cert->os_cert_handle(), &encoded); |
122 DCHECK(rv); | 124 DCHECK(rv); |
123 response->head.certificate.push_back(encoded); | 125 response->head.certificate.push_back(encoded); |
124 for (auto& cert : | 126 for (auto& cert : |
125 request->ssl_info().cert->GetIntermediateCertificates()) { | 127 request->ssl_info().cert->GetIntermediateCertificates()) { |
126 rv = net::X509Certificate::GetDEREncoded(cert, &encoded); | 128 rv = net::X509Certificate::GetDEREncoded(cert, &encoded); |
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
743 } | 745 } |
744 | 746 |
745 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 747 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
746 } else if (request_->response_info().unused_since_prefetch) { | 748 } else if (request_->response_info().unused_since_prefetch) { |
747 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time(); | 749 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time(); |
748 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time); | 750 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time); |
749 } | 751 } |
750 } | 752 } |
751 | 753 |
752 } // namespace content | 754 } // namespace content |
OLD | NEW |