Snapshot of all changes to get jumbo in blink and content.

net/http/transport_security_state.cc

Index: net/http/transport_security_state.cc
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 718c70b8f865a80eaed77f09a71e2b285b4d5b67..5862130def4c22f8e567ccacfd277a7fe284b9eb 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -227,7 +227,7 @@ std::string HashHost(const std::string& canonicalized_host) {
 
 // Returns true if the intersection of |a| and |b| is not empty. If either
 // |a| or |b| is empty, returns false.
-bool HashesIntersect(const HashValueVector& a,
+bool HashesIntersect2(const HashValueVector& a,
                      const HashValueVector& b) {
   for (const auto& hash : a) {
     if (base::ContainsValue(b, hash))
@@ -1827,7 +1827,7 @@ bool TransportSecurityState::PKPState::CheckPublicKeyPins(
     return false;
   }
 
-  if (HashesIntersect(bad_spki_hashes, hashes)) {
+  if (HashesIntersect2(bad_spki_hashes, hashes)) {
     failure_log->append("Rejecting public key chain for domain " + domain +
                         ". Validated chain: " + HashesToBase64String(hashes) +
                         ", matches one or more bad hashes: " +
@@ -1839,7 +1839,7 @@ bool TransportSecurityState::PKPState::CheckPublicKeyPins(
   if (spki_hashes.empty())
     return true;
 
-  if (HashesIntersect(spki_hashes, hashes)) {
+  if (HashesIntersect2(spki_hashes, hashes)) {
     return true;
   }