Update to Chromium revision adb61db1 (#508578)

This commit is contained in:
Marshall Greenblatt
2017-10-20 13:45:20 -04:00
parent c80264ab11
commit 8b4980b4ca
95 changed files with 647 additions and 776 deletions

View File

@@ -1,5 +1,5 @@
diff --git net/cert/ct_policy_enforcer.cc net/cert/ct_policy_enforcer.cc
index 0dd6a0d6bc0c..8bc6502d1e6f 100644
index 61d169cb5bfa..6e16906c7cc2 100644
--- net/cert/ct_policy_enforcer.cc
+++ net/cert/ct_policy_enforcer.cc
@@ -35,15 +35,6 @@ namespace net {
@@ -18,7 +18,7 @@ index 0dd6a0d6bc0c..8bc6502d1e6f 100644
// Returns a rounded-down months difference of |start| and |end|,
// together with an indication of whether the last month was
// a full month, because the range starts specified in the policy
@@ -296,4 +287,13 @@ ct::CertPolicyCompliance CTPolicyEnforcer::DoesConformToCertPolicy(
@@ -301,4 +292,13 @@ ct::CertPolicyCompliance CTPolicyEnforcer::DoesConformToCertPolicy(
return compliance;
}
@@ -55,10 +55,10 @@ index b594cba1a6fc..285eae814c50 100644
} // namespace net
diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
index 718c70b8f865..0973f4ac142c 100644
index 5af15d92ef49..f459c4355860 100644
--- net/http/transport_security_state.cc
+++ net/http/transport_security_state.cc
@@ -1550,8 +1550,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
@@ -1541,8 +1541,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
sent_expect_ct_reports_cache_.Clear();
}