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

net/http/transport_security_persister.cc

Index: net/http/transport_security_persister.cc
diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc
index 7919dcb8d787015bfb8c13ac0508997c16abb644..0ee2c39d2503438b49e7c959b71eaa48c3ebeccf 100644
--- a/net/http/transport_security_persister.cc
+++ b/net/http/transport_security_persister.cc
@@ -92,7 +92,7 @@ const char kExpectCTObserved[] = "expect_ct_observed";
 const char kExpectCTEnforce[] = "expect_ct_enforce";
 const char kExpectCTReportUri[] = "expect_ct_report_uri";
 
-std::string LoadState(const base::FilePath& path) {
+std::string LoadState2(const base::FilePath& path) {
   std::string result;
   if (!base::ReadFileToString(path, &result)) {
     return "";
@@ -302,7 +302,7 @@ TransportSecurityPersister::TransportSecurityPersister(
 
   base::PostTaskAndReplyWithResult(
       background_runner_.get(), FROM_HERE,
-      base::Bind(&LoadState, writer_.path()),
+      base::Bind(&LoadState2, writer_.path()),
       base::Bind(&TransportSecurityPersister::CompleteLoad,
                  weak_ptr_factory_.GetWeakPtr()));
 }