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

net/quic/core/quic_spdy_stream_test.cc

Index: net/quic/core/quic_spdy_stream_test.cc
diff --git a/net/quic/core/quic_spdy_stream_test.cc b/net/quic/core/quic_spdy_stream_test.cc
index cad7e8b60fa39d1ed67d81d400a457518f3edcfe..97a193253293e09b48a76207bb6cdf2f1d743e59 100644
--- a/net/quic/core/quic_spdy_stream_test.cc
+++ b/net/quic/core/quic_spdy_stream_test.cc
@@ -67,7 +67,6 @@ class TestStream : public QuicSpdyStream {
 class QuicSpdyStreamTest : public ::testing::TestWithParam<QuicVersion> {
  public:
   QuicSpdyStreamTest() {
-    FLAGS_quic_always_log_bugs_for_tests = true;
     headers_[":host"] = "www.google.com";
     headers_[":path"] = "/index.hml";
     headers_[":scheme"] = "https";
@@ -996,8 +995,8 @@ TEST_P(QuicSpdyStreamTest, WritingTrailersAfterFIN) {
 
   // Writing Trailers should fail, as the FIN has already been sent.
   // populated with the number of body bytes written.
-  EXPECT_DFATAL(stream_->WriteTrailers(SpdyHeaderBlock(), nullptr),
-                "Trailers cannot be sent after a FIN");
+  EXPECT_QUIC_BUG(stream_->WriteTrailers(SpdyHeaderBlock(), nullptr),
+                  "Trailers cannot be sent after a FIN");
 }
 
 }  // namespace