mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision fa6a5d87 (#499098)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git net/cert/ct_policy_enforcer.cc net/cert/ct_policy_enforcer.cc
|
||||
index 0dd6a0d..8bc6502d 100644
|
||||
index 0dd6a0d6bc0c..8bc6502d1e6f 100644
|
||||
--- net/cert/ct_policy_enforcer.cc
|
||||
+++ net/cert/ct_policy_enforcer.cc
|
||||
@@ -35,15 +35,6 @@ namespace net {
|
||||
@@ -33,7 +33,7 @@ index 0dd6a0d..8bc6502d 100644
|
||||
+
|
||||
} // namespace net
|
||||
diff --git net/cert/ct_policy_enforcer.h net/cert/ct_policy_enforcer.h
|
||||
index b594cba..285eae8 100644
|
||||
index b594cba1a6fc..285eae814c50 100644
|
||||
--- net/cert/ct_policy_enforcer.h
|
||||
+++ net/cert/ct_policy_enforcer.h
|
||||
@@ -42,6 +42,17 @@ class NET_EXPORT CTPolicyEnforcer {
|
||||
@@ -55,7 +55,7 @@ index b594cba..285eae8 100644
|
||||
|
||||
} // namespace net
|
||||
diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
|
||||
index 4ffe9e8..013cea5 100644
|
||||
index 718c70b8f865..0973f4ac142c 100644
|
||||
--- net/http/transport_security_state.cc
|
||||
+++ net/http/transport_security_state.cc
|
||||
@@ -1550,8 +1550,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
|
||||
@@ -72,7 +72,7 @@ index 4ffe9e8..013cea5 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 5e75551..1d1ca02 100644
|
||||
index b4bab0db79db..6c11351b43ba 100644
|
||||
--- net/http/transport_security_state.h
|
||||
+++ net/http/transport_security_state.h
|
||||
@@ -574,6 +574,10 @@ class NET_EXPORT TransportSecurityState {
|
||||
|
Reference in New Issue
Block a user