Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/test_tools/fake_proof_source.cc

Index: net/quic/test_tools/fake_proof_source.cc
diff --git a/net/quic/test_tools/fake_proof_source.cc b/net/quic/test_tools/fake_proof_source.cc
index b40af64a96a316eb8ca8df11415ceb1528c4ba75..7300b5d54caf14e5ae28e9471a2545165c27c314 100644
--- a/net/quic/test_tools/fake_proof_source.cc
+++ b/net/quic/test_tools/fake_proof_source.cc
@@ -48,12 +48,11 @@ bool FakeProofSource::GetProof(const IPAddress& server_ip,
                                StringPiece chlo_hash,
                                const QuicTagVector& connection_options,
                                scoped_refptr<ProofSource::Chain>* out_chain,
-                               string* out_signature,
-                               string* out_leaf_cert_sct) {
+                               QuicCryptoProof* out_proof) {
   LOG(WARNING) << "Synchronous GetProof called";
   return delegate_->GetProof(server_ip, hostname, server_config, quic_version,
                              chlo_hash, connection_options, out_chain,
-                             out_signature, out_leaf_cert_sct);
+                             out_proof);
 }
 
 void FakeProofSource::GetProof(
@@ -66,13 +65,10 @@ void FakeProofSource::GetProof(
     std::unique_ptr<ProofSource::Callback> callback) {
   if (!active_) {
     scoped_refptr<Chain> chain;
-    string signature;
-    string leaf_cert_sct;
-    const bool ok =
-        GetProof(server_ip, hostname, server_config, quic_version, chlo_hash,
-                 connection_options, &chain, &signature, &leaf_cert_sct);
-    callback->Run(ok, chain, signature, leaf_cert_sct,
-                  /* details = */ nullptr);
+    QuicCryptoProof proof;
+    const bool ok = GetProof(server_ip, hostname, server_config, quic_version,
+                             chlo_hash, connection_options, &chain, &proof);
+    callback->Run(ok, chain, proof, /* details = */ nullptr);
     return;
   }
 
@@ -92,15 +88,13 @@ void FakeProofSource::InvokePendingCallback(int n) {
   const Params& params = params_[n];
 
   scoped_refptr<ProofSource::Chain> chain;
-  string signature;
-  string leaf_cert_sct;
+  QuicCryptoProof proof;
   const bool ok = delegate_->GetProof(
       params.server_ip, params.hostname, params.server_config,
       params.quic_version, params.chlo_hash, params.connection_options, &chain,
-      &signature, &leaf_cert_sct);
+      &proof);
 
-  params.callback->Run(ok, chain, signature, leaf_cert_sct,
-                       /* details = */ nullptr);
+  params.callback->Run(ok, chain, proof, /* details = */ nullptr);
   auto it = params_.begin() + n;
   params_.erase(it);
 }