Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1542)

Unified Diff: content/browser/loader/resource_loader.cc

Issue 1957483003: Removal of SignedCertificateTimestampStore (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed constructor of SSLStatus() Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 3be9bf4fc8b42861d0d0d12671b35133c698ec0a..9ee0d0ddf547c1b7f35856d3f7ac7978e3d04c00 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -29,7 +29,6 @@
#include "content/public/browser/cert_store.h"
#include "content/public/browser/resource_context.h"
#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
-#include "content/public/browser/signed_certificate_timestamp_store.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/process_type.h"
@@ -50,20 +49,6 @@ using base::TimeTicks;
namespace content {
namespace {
-void StoreSignedCertificateTimestamps(
- const net::SignedCertificateTimestampAndStatusList& sct_list,
- int process_id,
- SignedCertificateTimestampIDStatusList* sct_ids) {
- SignedCertificateTimestampStore* sct_store(
- SignedCertificateTimestampStore::GetInstance());
-
- for (auto iter = sct_list.begin(); iter != sct_list.end(); ++iter) {
- const int sct_id(sct_store->Store(iter->sct.get(), process_id));
- sct_ids->push_back(
- SignedCertificateTimestampIDAndStatus(sct_id, iter->status));
- }
-}
-
void GetSSLStatusForRequest(const GURL& url,
const net::SSLInfo& ssl_info,
int child_id,
@@ -72,13 +57,9 @@ void GetSSLStatusForRequest(const GURL& url,
DCHECK(ssl_info.cert);
int cert_id = cert_store->StoreCert(ssl_info.cert.get(), child_id);
- SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids;
- StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps,
- child_id, &signed_certificate_timestamp_ids);
-
*ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource(
url, cert_id, ssl_info.cert_status),
- cert_id, signed_certificate_timestamp_ids, ssl_info);
+ cert_id, ssl_info);
}
void PopulateResourceResponse(ResourceRequestInfoImpl* info,
@@ -122,6 +103,8 @@ void PopulateResourceResponse(ResourceRequestInfoImpl* info,
response->head.has_major_certificate_errors =
net::IsCertStatusError(ssl_status.cert_status) &&
!net::IsCertStatusMinorError(ssl_status.cert_status);
+ response->head.signed_certificate_timestamps =
estark 2016/05/07 07:12:51 Since this is only required for DevTools, how abou
dwaxweiler 2016/05/07 13:09:40 Acknowledged.
+ request->ssl_info().signed_certificate_timestamps;
} else {
// We should not have any SSL state.
DCHECK(!request->ssl_info().cert_status);

Powered by Google App Engine
This is Rietveld 408576698