Landing Recent QUIC changes until Sat Oct 29 14:59:35.

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 a19c97a148282fb25e204d30b6c143f2558a00e4..b40af64a96a316eb8ca8df11415ceb1528c4ba75 100644
--- a/net/quic/test_tools/fake_proof_source.cc
+++ b/net/quic/test_tools/fake_proof_source.cc
@@ -20,12 +20,14 @@ FakeProofSource::Params::Params(const IPAddress& server_ip,
                                 std::string server_config,
                                 QuicVersion quic_version,
                                 std::string chlo_hash,
+                                const QuicTagVector& connection_options,
                                 std::unique_ptr<ProofSource::Callback> callback)
     : server_ip(server_ip),
       hostname(hostname),
       server_config(server_config),
       quic_version(quic_version),
       chlo_hash(chlo_hash),
+      connection_options(connection_options),
       callback(std::move(callback)) {}
 
 FakeProofSource::Params::~Params() {}
@@ -44,13 +46,14 @@ bool FakeProofSource::GetProof(const IPAddress& server_ip,
                                const string& server_config,
                                QuicVersion quic_version,
                                StringPiece chlo_hash,
+                               const QuicTagVector& connection_options,
                                scoped_refptr<ProofSource::Chain>* out_chain,
                                string* out_signature,
                                string* out_leaf_cert_sct) {
   LOG(WARNING) << "Synchronous GetProof called";
   return delegate_->GetProof(server_ip, hostname, server_config, quic_version,
-                             chlo_hash, out_chain, out_signature,
-                             out_leaf_cert_sct);
+                             chlo_hash, connection_options, out_chain,
+                             out_signature, out_leaf_cert_sct);
 }
 
 void FakeProofSource::GetProof(
@@ -59,13 +62,15 @@ void FakeProofSource::GetProof(
     const string& server_config,
     QuicVersion quic_version,
     StringPiece chlo_hash,
+    const QuicTagVector& connection_options,
     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, &chain, &signature, &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);
     return;
@@ -73,7 +78,8 @@ void FakeProofSource::GetProof(
 
   LOG(WARNING) << "Asynchronous GetProof called";
   params_.push_back(Params{server_ip, hostname, server_config, quic_version,
-                           chlo_hash.as_string(), std::move(callback)});
+                           chlo_hash.as_string(), connection_options,
+                           std::move(callback)});
 }
 
 int FakeProofSource::NumPendingCallbacks() const {
@@ -88,10 +94,10 @@ void FakeProofSource::InvokePendingCallback(int n) {
   scoped_refptr<ProofSource::Chain> chain;
   string signature;
   string leaf_cert_sct;
-  const bool ok =
-      delegate_->GetProof(params.server_ip, params.hostname,
-                          params.server_config, params.quic_version,
-                          params.chlo_hash, &chain, &signature, &leaf_cert_sct);
+  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);
 
   params.callback->Run(ok, chain, signature, leaf_cert_sct,
                        /* details = */ nullptr);