Landing Recent QUIC changes until 7/26/2016 13:53 UTC

net/quic/quic_crypto_server_stream_test.cc

 // Copyright (c) 2012 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/quic_crypto_server_stream.h"
 
 #include <map>
 #include <memory>
 #include <vector>
 
@@ skipping 516 matching lines @@
   Initialize();
 
   CompleteCryptoHandshake();
   EXPECT_EQ(
       0u, server_stream()->crypto_negotiated_params().token_binding_key_param);
   EXPECT_TRUE(server_stream()->encryption_established());
   EXPECT_TRUE(server_stream()->handshake_confirmed());
 }
 
 TEST_P(QuicCryptoServerStreamTest, CancelRPCBeforeVerificationCompletes) {
+  FLAGS_quic_require_handshake_confirmation_pre33 = false;
   // Tests that the client can close the connection while the remote strike
   // register verification RPC is still pending.
 
   // Set version to QUIC_VERSION_32 as QUIC_VERSION_33 and later don't support
   // asynchronous strike register RPCs.
   supported_versions_ = {QUIC_VERSION_32};
   Initialize();
   if (!AsyncStrikeRegisterVerification()) {
     return;
   }
@@ skipping 25 matching lines @@
       QUIC_NO_ERROR, "", ConnectionCloseBehavior::SILENT_CLOSE);
 
   // The outstanding nonce verification RPC now completes.
   strike_register_client_->RunPendingVerifications();
 }
 
 }  // namespace
 
 }  // namespace test
 }  // namespace net