Deprecate FLAGS_quic_consolidate_onstreamframe_errors

net/quic/quic_stream_sequencer_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_stream_sequencer.h"
 
 #include <algorithm>
 #include <cstdint>
 #include <memory>
 #include <utility>
@@ skipping 548 matching lines @@
 }
 
 TEST_F(QuicStreamSequencerTest, DontAcceptOverlappingFrames) {
   // The peer should never send us non-identical stream frames which contain
   // overlapping byte ranges - if they do, we close the connection.
 
   QuicStreamFrame frame1(kClientDataStreamId1, false, 1, StringPiece("hello"));
   sequencer_->OnStreamFrame(frame1);
 
   QuicStreamFrame frame2(kClientDataStreamId1, false, 2, StringPiece("hello"));
-  EXPECT_CALL(stream_, CloseConnectionWithDetails(
-                           FLAGS_quic_consolidate_onstreamframe_errors
-                               ? QUIC_OVERLAPPING_STREAM_DATA
-                               : QUIC_EMPTY_STREAM_FRAME_NO_FIN,
-                           _))
+  EXPECT_CALL(stream_,
+              CloseConnectionWithDetails(QUIC_OVERLAPPING_STREAM_DATA, _))
       .Times(1);
   sequencer_->OnStreamFrame(frame2);
 }
 
 TEST_F(QuicStreamSequencerTest, InOrderTimestamps) {
   // This test verifies that timestamps returned by
   // GetReadableRegion() are in the correct sequence when frames
   // arrive at the sequencer in order.
   EXPECT_CALL(stream_, OnDataAvailable());
 
@@ skipping 69 matching lines @@
   EXPECT_EQ(timestamp, t1);
   QuicStreamSequencerTest::ConsumeData(3);
   EXPECT_EQ(0u, NumBufferedBytes());
   EXPECT_EQ(6u, sequencer_->NumBytesConsumed());
   EXPECT_EQ(0u, sequencer_->NumBytesBuffered());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net