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

net/quic/chromium/crypto/proof_source_chromium.h

 // 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.
 
 #ifndef NET_QUIC_CRYPTO_PROOF_SOURCE_CHROMIUM_H_
 #define NET_QUIC_CRYPTO_PROOF_SOURCE_CHROMIUM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 20 matching lines @@
   bool Initialize(const base::FilePath& cert_path,
                   const base::FilePath& key_path,
                   const base::FilePath& sct_path);
 
   // 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<Callback> callback) override;
 
  private:
   std::unique_ptr<crypto::RSAPrivateKey> private_key_;
   scoped_refptr<ProofSource::Chain> chain_;
   std::string signed_certificate_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(ProofSourceChromium);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_PROOF_SOURCE_CHROMIUM_H_