Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/quic/quic_network_transaction_unittest.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 <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 2012 matching lines @@
   NetErrorDetails details;
   EXPECT_EQ(QUIC_NO_ERROR, details.quic_connection_error);
 
   trans->PopulateNetErrorDetails(&details);
   // Verify the error code logged is what sent by the peer.
   EXPECT_EQ(QUIC_CRYPTO_VERSION_NOT_SUPPORTED, details.quic_connection_error);
 }
 
 TEST_P(QuicNetworkTransactionTest,
        LogGranularQuicErrorCodeOnQuicProtocolErrorRemote) {
+  ValueRestore<bool> old_flag(&FLAGS_quic_ignore_invalid_error_code, false);
   MockQuicData mock_quic_data;
   mock_quic_data.AddWrite(
       ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
                                     GetRequestHeaders("GET", "https", "/")));
   // Peer sending an invalid stream frame with a invalid stream error causes
   // this end to raise error and close connection.
   mock_quic_data.AddRead(ConstructRstPacket(1, false, kClientDataStreamId1,
                                             QUIC_STREAM_LAST_ERROR));
   std::string quic_error_details = "Invalid rst stream error code.";
   mock_quic_data.AddWrite(ConstructAckAndConnectionClosePacket(
@@ skipping 304 matching lines @@
   std::unique_ptr<HttpNetworkTransaction> trans(
       new HttpNetworkTransaction(DEFAULT_PRIORITY, session_.get()));
   TestCompletionCallback callback;
   int rv = trans->Start(&request_, callback.callback(), net_log_.bound());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_NE(OK, callback.WaitForResult());
 }
 
 }  // namespace test
 }  // namespace net