mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 5fdc0fab (#520840)
- Windows now builds with clang by default.
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git net/cert/ct_policy_enforcer.cc net/cert/ct_policy_enforcer.cc
|
||||
index 61d169cb5bfa..6e16906c7cc2 100644
|
||||
index 0f7778089273..40111e89a2e0 100644
|
||||
--- net/cert/ct_policy_enforcer.cc
|
||||
+++ net/cert/ct_policy_enforcer.cc
|
||||
@@ -35,15 +35,6 @@ namespace net {
|
||||
@ -18,7 +18,7 @@ index 61d169cb5bfa..6e16906c7cc2 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
|
||||
@@ -301,4 +292,13 @@ ct::CertPolicyCompliance CTPolicyEnforcer::DoesConformToCertPolicy(
|
||||
@@ -302,4 +293,13 @@ ct::CTPolicyCompliance CTPolicyEnforcer::CheckCompliance(
|
||||
return compliance;
|
||||
}
|
||||
|
||||
@ -33,7 +33,7 @@ index 61d169cb5bfa..6e16906c7cc2 100644
|
||||
+
|
||||
} // namespace net
|
||||
diff --git net/cert/ct_policy_enforcer.h net/cert/ct_policy_enforcer.h
|
||||
index b594cba1a6fc..285eae814c50 100644
|
||||
index fb6f4847cfe9..aa4c1cdafb9f 100644
|
||||
--- net/cert/ct_policy_enforcer.h
|
||||
+++ net/cert/ct_policy_enforcer.h
|
||||
@@ -42,6 +42,17 @@ class NET_EXPORT CTPolicyEnforcer {
|
||||
@ -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 5af15d92ef49..f459c4355860 100644
|
||||
index a433afd02178..ff92489ed243 100644
|
||||
--- net/http/transport_security_state.cc
|
||||
+++ net/http/transport_security_state.cc
|
||||
@@ -1541,8 +1541,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
|
||||
@@ -1553,8 +1553,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
|
||||
sent_expect_ct_reports_cache_.Clear();
|
||||
}
|
||||
|
||||
@ -72,10 +72,10 @@ index 5af15d92ef49..f459c4355860 100644
|
||||
// We consider built-in information to be timely for 10 weeks.
|
||||
return (base::Time::Now() - build_time).InDays() < 70 /* 10 weeks */;
|
||||
diff --git net/http/transport_security_state.h net/http/transport_security_state.h
|
||||
index b4bab0db79db..6c11351b43ba 100644
|
||||
index 79d3a1c3453f..d97e26b4b024 100644
|
||||
--- net/http/transport_security_state.h
|
||||
+++ net/http/transport_security_state.h
|
||||
@@ -574,6 +574,10 @@ class NET_EXPORT TransportSecurityState {
|
||||
@@ -576,6 +576,10 @@ class NET_EXPORT TransportSecurityState {
|
||||
// Expect-CT reports.
|
||||
void ClearReportCachesForTesting();
|
||||
|
||||
@ -86,7 +86,7 @@ index b4bab0db79db..6c11351b43ba 100644
|
||||
private:
|
||||
friend class TransportSecurityStateTest;
|
||||
friend class TransportSecurityStateStaticFuzzer;
|
||||
@@ -594,7 +598,7 @@ class NET_EXPORT TransportSecurityState {
|
||||
@@ -596,7 +600,7 @@ class NET_EXPORT TransportSecurityState {
|
||||
// IsBuildTimely returns true if the current build is new enough ensure that
|
||||
// built in security information (i.e. HSTS preloading and pinning
|
||||
// information) is timely.
|
||||
@ -95,7 +95,7 @@ index b4bab0db79db..6c11351b43ba 100644
|
||||
|
||||
// Helper method for actually checking pins.
|
||||
PKPStatus CheckPublicKeyPinsImpl(
|
||||
@@ -703,6 +707,8 @@ class NET_EXPORT TransportSecurityState {
|
||||
@@ -705,6 +709,8 @@ class NET_EXPORT TransportSecurityState {
|
||||
// True if public key pinning bypass is enabled for local trust anchors.
|
||||
bool enable_pkp_bypass_for_local_trust_anchors_;
|
||||
|
||||
|
Reference in New Issue
Block a user