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

net/quic/test_tools/fake_proof_source.h

 // Copyright (c) 2016 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_FAKE_PROOF_SOURCE_H_
 #define NET_QUIC_TEST_TOOLS_FAKE_PROOF_SOURCE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
   // distinction is necessary to ensure that GetProof can be called without
   // interference during test case setup.
   void Activate();
 
   // ProofSource interface
   bool GetProof(const IPAddress& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 QuicVersion quic_version,
                 base::StringPiece chlo_hash,
+                const QuicTagVector& connection_options,
                 scoped_refptr<ProofSource::Chain>* out_chain,
                 std::string* out_signature,
                 std::string* out_leaf_cert_sct) override;
   void GetProof(const IPAddress& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 QuicVersion quic_version,
                 base::StringPiece chlo_hash,
+                const QuicTagVector& connection_options,
                 std::unique_ptr<ProofSource::Callback> callback) override;
 
   // Get the number of callbacks which are pending
   int NumPendingCallbacks() const;
 
   // Invoke a pending callback.  The index refers to the position in params_ of
   // the callback to be completed.
   void InvokePendingCallback(int n);
 
  private:
   std::unique_ptr<ProofSource> delegate_;
   bool active_ = false;
 
   struct Params {
     Params(const IPAddress& server_ip,
            std::string hostname,
            std::string server_config,
            QuicVersion quic_version,
            std::string chlo_hash,
+           const QuicTagVector& connection_options,
            std::unique_ptr<ProofSource::Callback> callback);
     ~Params();
     Params(Params&& other);
     Params& operator=(Params&& other);
 
     IPAddress server_ip;
     std::string hostname;
     std::string server_config;
     QuicVersion quic_version;
     std::string chlo_hash;
+    QuicTagVector connection_options;
     std::unique_ptr<ProofSource::Callback> callback;
   };
 
   std::vector<Params> params_;
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_FAKE_PROOF_SOURCE_H_