Update to Chromium revision ad51088c (#444943)

This commit is contained in:
Marshall Greenblatt
2017-01-23 12:36:54 -05:00
parent 9d48a4f80e
commit b7b145fa4f
117 changed files with 1261 additions and 1254 deletions

View File

@@ -33,7 +33,7 @@ index 42f631e..b02edb0 100644
+
} // namespace net
diff --git net/cert/ct_policy_enforcer.h net/cert/ct_policy_enforcer.h
index c732cee..1c80e81 100644
index 7111970..f751d6c 100644
--- net/cert/ct_policy_enforcer.h
+++ net/cert/ct_policy_enforcer.h
@@ -101,6 +101,17 @@ class NET_EXPORT CTPolicyEnforcer {
@@ -55,10 +55,10 @@ index c732cee..1c80e81 100644
} // namespace net
diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
index 9b42feb..f7860be 100644
index 5f82c28..0ebee04 100644
--- net/http/transport_security_state.cc
+++ net/http/transport_security_state.cc
@@ -1362,8 +1362,10 @@ void TransportSecurityState::SetShouldRequireCTForTesting(bool* required) {
@@ -1371,8 +1371,10 @@ void TransportSecurityState::SetShouldRequireCTForTesting(bool* required) {
g_ct_required_for_testing = *required ? 1 : -1;
}
@@ -72,7 +72,7 @@ index 9b42feb..f7860be 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 fc40b7d..c0b14a4 100644
index a55cf62..b984474 100644
--- net/http/transport_security_state.h
+++ net/http/transport_security_state.h
@@ -475,6 +475,10 @@ class NET_EXPORT TransportSecurityState
@@ -85,8 +85,8 @@ index fc40b7d..c0b14a4 100644
+
private:
friend class TransportSecurityStateTest;
FRIEND_TEST_ALL_PREFIXES(HttpSecurityHeadersTest, UpdateDynamicPKPOnly);
@@ -498,7 +502,7 @@ class NET_EXPORT TransportSecurityState
friend class TransportSecurityStateStaticFuzzer;
@@ -499,7 +503,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 fc40b7d..c0b14a4 100644
// Helper method for actually checking pins.
PKPStatus CheckPublicKeyPinsImpl(
@@ -589,6 +593,8 @@ class NET_EXPORT TransportSecurityState
@@ -590,6 +594,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_;