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

net/quic/quartc/quartc_session.cc

 // 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.
 
 #include "net/quic/quartc/quartc_session.h"
 
 #include "base/rand_util.h"
 
 namespace {
 
@@ skipping 15 matching lines @@
  public:
   DummyProofSource() {}
   ~DummyProofSource() override {}
 
   // ProofSource override.
   bool GetProof(const net::IPAddress& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 net::QuicVersion quic_version,
                 base::StringPiece chlo_hash,
+                const net::QuicTagVector& connection_options,
                 scoped_refptr<net::ProofSource::Chain>* out_chain,
                 std::string* out_signature,
                 std::string* out_leaf_cert_sct) override {
     std::vector<std::string> certs;
     certs.push_back("Dummy cert");
     *out_chain = new ProofSource::Chain(certs);
     *out_signature = "Dummy signature";
     *out_leaf_cert_sct = "Dummy timestamp";
     return true;
   }
 
   void GetProof(const net::IPAddress& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 net::QuicVersion quic_version,
                 base::StringPiece chlo_hash,
+                const net::QuicTagVector& connection_options,
                 std::unique_ptr<Callback> callback) override {}
 };
 
 // Used by QuicCryptoClientConfig to ignore the peer's credentials
 // and establish an insecure QUIC connection.
 // TODO(zhihuang): Remove when secure P2P QUIC handshake is possible.
 class InsecureProofVerifier : public net::ProofVerifier {
  public:
   InsecureProofVerifier() {}
   ~InsecureProofVerifier() override {}
@@ skipping 220 matching lines @@
     ActivateStream(std::unique_ptr<ReliableQuicStream>(stream));
     // Register the stream to the QuicWriteBlockedList. |priority| is clamped
     // between 0 and 7, with 0 being the highest priority and 7 the lowest
     // priority.
     write_blocked_streams()->RegisterStream(stream->id(), priority);
   }
   return stream;
 }
 
 }  // namespace net