| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/profiler/scoped_tracker.h" | 10 #include "base/profiler/scoped_tracker.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 SSLStatus* ssl_status) { | 64 SSLStatus* ssl_status) { |
| 65 DCHECK(ssl_info.cert); | 65 DCHECK(ssl_info.cert); |
| 66 | 66 |
| 67 int cert_id = | 67 int cert_id = |
| 68 CertStore::GetInstance()->StoreCert(ssl_info.cert.get(), child_id); | 68 CertStore::GetInstance()->StoreCert(ssl_info.cert.get(), child_id); |
| 69 | 69 |
| 70 SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids; | 70 SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids; |
| 71 StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps, | 71 StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps, |
| 72 child_id, &signed_certificate_timestamp_ids); | 72 child_id, &signed_certificate_timestamp_ids); |
| 73 | 73 |
| 74 ssl_status->cert_id = cert_id; | 74 *ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource( |
| 75 ssl_status->cert_status = ssl_info.cert_status; | 75 url, cert_id, ssl_info.cert_status), |
| 76 ssl_status->security_bits = ssl_info.security_bits; | 76 cert_id, signed_certificate_timestamp_ids, ssl_info); |
| 77 ssl_status->connection_status = ssl_info.connection_status; | |
| 78 ssl_status->signed_certificate_timestamp_ids = | |
| 79 signed_certificate_timestamp_ids; | |
| 80 ssl_status->security_style = | |
| 81 SSLPolicy::GetSecurityStyleForResource(url, *ssl_status); | |
| 82 } | 77 } |
| 83 | 78 |
| 84 void PopulateResourceResponse(ResourceRequestInfoImpl* info, | 79 void PopulateResourceResponse(ResourceRequestInfoImpl* info, |
| 85 net::URLRequest* request, | 80 net::URLRequest* request, |
| 86 ResourceResponse* response) { | 81 ResourceResponse* response) { |
| 87 response->head.request_time = request->request_time(); | 82 response->head.request_time = request->request_time(); |
| 88 response->head.response_time = request->response_time(); | 83 response->head.response_time = request->response_time(); |
| 89 response->head.headers = request->response_headers(); | 84 response->head.headers = request->response_headers(); |
| 90 request->GetCharset(&response->head.charset); | 85 request->GetCharset(&response->head.charset); |
| 91 response->head.content_length = request->GetExpectedContentSize(); | 86 response->head.content_length = request->GetExpectedContentSize(); |
| (...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 case net::URLRequestStatus::FAILED: | 696 case net::URLRequestStatus::FAILED: |
| 702 status = STATUS_UNDEFINED; | 697 status = STATUS_UNDEFINED; |
| 703 break; | 698 break; |
| 704 } | 699 } |
| 705 | 700 |
| 706 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 701 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
| 707 } | 702 } |
| 708 } | 703 } |
| 709 | 704 |
| 710 } // namespace content | 705 } // namespace content |
| OLD | NEW |