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

net/http/transport_security_persister.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/transport_security_persister.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/base64.h"
@@ skipping 74 matching lines @@
 const char kPkpObserved[] = "pkp_observed";
 const char kReportUri[] = "report-uri";
 // The keys below are contained in a subdictionary keyed as
 // |kExpectCTSubdictionary|.
 const char kExpectCTSubdictionary[] = "expect_ct";
 const char kExpectCTExpiry[] = "expect_ct_expiry";
 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 "";
   }
   return result;
 }
 
 bool IsDynamicExpectCTEnabled() {
   return base::FeatureList::IsEnabled(
       TransportSecurityState::kDynamicExpectCTFeature);
@@ skipping 189 matching lines @@
     : transport_security_state_(state),
       writer_(profile_path.AppendASCII("TransportSecurity"), background_runner),
       foreground_runner_(base::ThreadTaskRunnerHandle::Get()),
       background_runner_(background_runner),
       readonly_(readonly),
       weak_ptr_factory_(this) {
   transport_security_state_->SetDelegate(this);
 
   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()));
 }
 
 TransportSecurityPersister::~TransportSecurityPersister() {
   DCHECK(foreground_runner_->RunsTasksInCurrentSequence());
 
   if (writer_.HasPendingWrite())
     writer_.DoScheduledWrite();
 
@@ skipping 185 matching lines @@
   bool dirty = false;
   if (!LoadEntries(state, &dirty)) {
     LOG(ERROR) << "Failed to deserialize state: " << state;
     return;
   }
   if (dirty)
     StateIsDirty(transport_security_state_);
 }
 
 }  // namespace net