Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/quic/core/quic_headers_stream_test.cc

 // Copyright 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 "net/quic/core/quic_headers_stream.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/core/quic_bug_tracker.h"
@@ skipping 190 matching lines @@
     switch (hpack_decoder) {
       case HPACK_DECODER_SPDY:
         FLAGS_spdy_use_hpack_decoder2 = false;
         break;
       case HPACK_DECODER_NEW:
         FLAGS_spdy_use_hpack_decoder2 = true;
         // Needs new header methods to be used.
         FLAGS_spdy_framer_use_new_methods3 = true;
         break;
     }
-    FLAGS_quic_always_log_bugs_for_tests = true;
     VLOG(1) << "TestParams: version: " << QuicVersionToString(version)
             << ", perspective: " << perspective
             << ", http2_decoder: " << http2_decoder
             << ", hpack_decoder: " << hpack_decoder;
   }
 
   QuicVersion version;
   Perspective perspective;
   Http2DecoderChoice http2_decoder;
   HpackDecoderChoice hpack_decoder;
@@ skipping 231 matching lines @@
       headers_handler_.reset(new TestHeadersHandler);
       EXPECT_CALL(visitor_, OnHeaderFrameStart(stream_id))
           .WillOnce(Return(headers_handler_.get()));
       EXPECT_CALL(visitor_, OnHeaderFrameEnd(stream_id, true)).Times(1);
       framer_->ProcessInput(saved_data_.data(), saved_data_.length());
       EXPECT_FALSE(framer_->HasError())
           << SpdyFramer::ErrorCodeToString(framer_->error_code());
       CheckHeaders();
       saved_data_.clear();
     } else {
-      EXPECT_DFATAL(
+      EXPECT_QUIC_BUG(
           headers_stream_->WritePushPromise(stream_id, promised_stream_id,
                                             headers_.Clone(), nullptr),
           "Client shouldn't send PUSH_PROMISE");
     }
   }
 }
 
 TEST_P(QuicHeadersStreamTest, ProcessRawData) {
   for (QuicStreamId stream_id = kClientDataStreamId1;
        stream_id < kClientDataStreamId3; stream_id += 2) {
@@ skipping 490 matching lines @@
       }
       saved_data_.clear();
       saved_payloads_.clear();
     }
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net