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

net/quic/core/crypto/crypto_server_test.cc

 // Copyright (c) 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.
 
 #include <algorithm>
 #include <cstdint>
 #include <memory>
 #include <ostream>
 #include <vector>
 
@@ skipping 273 matching lines @@
           error_substr_(error_substr),
           called_(called),
           out_(out) {
       *called_ = false;
     }
 
     void Run(
         QuicErrorCode error,
         const string& error_details,
         std::unique_ptr<CryptoHandshakeMessage> message,
-        std::unique_ptr<DiversificationNonce> diversification_nonce) override {
+        std::unique_ptr<DiversificationNonce> diversification_nonce,
+        std::unique_ptr<ProofSource::Details> proof_source_details) override {
       if (should_succeed_) {
         ASSERT_EQ(error, QUIC_NO_ERROR) << "Message failed with error "
                                         << error_details << ": "
                                         << result_->client_hello.DebugString();
       } else {
         ASSERT_NE(error, QUIC_NO_ERROR) << "Message didn't fail: "
                                         << result_->client_hello.DebugString();
 
         EXPECT_TRUE(error_details.find(error_substr_) != string::npos)
             << error_substr_ << " not in " << error_details;
@@ skipping 975 matching lines @@
     EXPECT_EQ(0, strike_register_client_->PendingVerifications());
   } else {
     // version 33.
     ASSERT_EQ(kSHLO, out_.tag());
     CheckServerHello(out_);
   }
 }
 
 }  // namespace test
 }  // namespace net