Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

net/quic/chromium/crypto/proof_source_chromium.cc

 // Copyright 2013 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/quic/chromium/crypto/proof_source_chromium.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "crypto/openssl_util.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "third_party/boringssl/src/include/openssl/digest.h"
@@ skipping 58 matching lines @@
     return true;
 
   if (!base::ReadFileToString(sct_path, &signed_certificate_timestamp_)) {
     DLOG(FATAL) << "Unable to read signed certificate timestamp.";
     return false;
   }
 
   return true;
 }
 
-bool ProofSourceChromium::GetProof(
+bool ProofSourceChromium::GetProofInner(
     const QuicSocketAddress& server_addr,
     const string& hostname,
     const string& server_config,
     QuicVersion quic_version,
     base::StringPiece chlo_hash,
     const QuicTagVector& /* connection_options */,
     QuicReferenceCountedPointer<ProofSource::Chain>* out_chain,
     QuicCryptoProof* proof) {
   DCHECK(proof != nullptr);
   DCHECK(private_key_.get()) << " this: " << this;
@@ skipping 49 matching lines @@
                                    QuicVersion quic_version,
                                    base::StringPiece chlo_hash,
                                    const QuicTagVector& connection_options,
                                    std::unique_ptr<Callback> callback) {
   // As a transitional implementation, just call the synchronous version of
   // GetProof, then invoke the callback with the results and destroy it.
   QuicReferenceCountedPointer<ProofSource::Chain> chain;
   string signature;
   string leaf_cert_sct;
   QuicCryptoProof out_proof;
-  const bool ok = GetProof(server_addr, hostname, server_config, quic_version,
-                           chlo_hash, connection_options, &chain, &out_proof);
+
+  const bool ok =
+      GetProofInner(server_addr, hostname, server_config, quic_version,
+                    chlo_hash, connection_options, &chain, &out_proof);
   callback->Run(ok, chain, out_proof, nullptr /* details */);
 }
 
 }  // namespace net