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

net/quic/core/quic_headers_stream_test.cc

Index: net/quic/core/quic_headers_stream_test.cc
diff --git a/net/quic/core/quic_headers_stream_test.cc b/net/quic/core/quic_headers_stream_test.cc
index 59f300e044ebae0e41cd8681c36366b188ef02ff..ba6e34b711076c715e230ed56a1978954f8e30d5 100644
--- a/net/quic/core/quic_headers_stream_test.cc
+++ b/net/quic/core/quic_headers_stream_test.cc
@@ -208,7 +208,6 @@ struct TestParams {
         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
@@ -460,7 +459,7 @@ TEST_P(QuicHeadersStreamTest, WritePushPromises) {
       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");