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

net/tools/quic/quic_simple_server_stream_test.cc

 // Copyright (c) 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/tools/quic/quic_simple_server_stream.h"
 
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
@@ skipping 172 matching lines @@
             QuicRandom::GetInstance(),
             ::net::test::CryptoTestUtils::ProofSourceForTesting())),
         compressed_certs_cache_(
             QuicCompressedCertsCache::kQuicCompressedCertsCacheSize),
         session_(connection_,
                  &session_owner_,
                  &session_helper_,
                  crypto_config_.get(),
                  &compressed_certs_cache_),
         body_("hello world") {
-    FLAGS_quic_always_log_bugs_for_tests = true;
     SpdyHeaderBlock request_headers;
     request_headers[":host"] = "";
     request_headers[":authority"] = "www.google.com";
     request_headers[":path"] = "/";
     request_headers[":method"] = "POST";
     request_headers[":version"] = "HTTP/1.1";
     request_headers["content-length"] = "11";
 
     headers_string_ =
         net::SpdyUtils::SerializeUncompressedHeaders(request_headers);
@@ skipping 257 matching lines @@
   EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
       .Times(1)
       .WillOnce(Return(QuicConsumedData(body.length(), true)));
   QuicSimpleServerStreamPeer::SendResponse(stream_);
   EXPECT_EQ(*request_headers, session_.original_request_headers_);
 }
 
 TEST_P(QuicSimpleServerStreamTest, PushResponseOnClientInitiatedStream) {
   // Calling PushResponse() on a client initialted stream is never supposed to
   // happen.
-  EXPECT_DFATAL(stream_->PushResponse(SpdyHeaderBlock()),
-                "Client initiated stream"
-                " shouldn't be used as promised stream.");
+  EXPECT_QUIC_BUG(stream_->PushResponse(SpdyHeaderBlock()),
+                  "Client initiated stream"
+                  " shouldn't be used as promised stream.");
 }
 
 TEST_P(QuicSimpleServerStreamTest, PushResponseOnServerInitiatedStream) {
   // Tests that PushResponse() should take the given headers as request headers
   // and fetch response from cache, and send it out.
 
   // Create a stream with even stream id and test against this stream.
   const QuicStreamId kServerInitiatedStreamId = 2;
   // Create a server initiated stream and pass it to session_.
   QuicSimpleServerStreamPeer* server_initiated_stream =
@@ skipping 160 matching lines @@
   };
   StringPiece data(arr, arraysize(arr));
   QuicStreamFrame frame(stream_->id(), true, 0, data);
   // Verify that we don't crash when we get a invalid headers in stream frame.
   stream_->OnStreamFrame(frame);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net