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

net/quic/quartc/quartc_session_test.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/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 38 matching lines @@
 class FakeProofSource : public net::ProofSource {
  public:
   explicit FakeProofSource(bool success) : success_(success) {}
 
   // ProofSource override.
   bool GetProof(const 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_certs,
                 std::string* out_signature,
                 std::string* out_leaf_cert_sct) override {
     if (success_) {
       std::vector<std::string> certs;
       certs.push_back("Required to establish handshake");
       *out_certs = new ProofSource::Chain(certs);
       *out_signature = "Signature";
       *out_leaf_cert_sct = "Time";
     }
     return success_;
   }
 
   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 {
     LOG(INFO) << "GetProof() providing dummy credentials for insecure QUIC";
   }
 
  private:
   // Whether or not obtaining proof source succeeds.
   bool success_;
 };
 
 // Used by QuicCryptoClientConfig to verify server credentials, returning a
@@ skipping 411 matching lines @@
   EXPECT_FALSE(client_peer_->IsClosedStream(id));
   stream->SetDelegate(client_peer_->stream_delegate());
   stream->Close();
   RunLoopWithTimeout();
   EXPECT_TRUE(client_peer_->IsClosedStream(id));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net