Mark QUIC broken when the network blackholes after the handshake

net/quic/chromium/quic_http_stream_test.cc

Index: net/quic/chromium/quic_http_stream_test.cc
diff --git a/net/quic/chromium/quic_http_stream_test.cc b/net/quic/chromium/quic_http_stream_test.cc
index 1930a1be447e1a207d25840b948dd16c6e229624..c6b3bb4c72464a9a290716ce820a54da48ff1b72 100644
--- a/net/quic/chromium/quic_http_stream_test.cc
+++ b/net/quic/chromium/quic_http_stream_test.cc
@@ -74,6 +74,7 @@ namespace {
 const char kUploadData[] = "Really nifty data!";
 const char kDefaultServerHostName[] = "www.example.org";
 const uint16_t kDefaultServerPort = 80;
+const bool kMarkQuicBrokenWhenNetworkSuspected = true;
 
 class TestQuicConnection : public QuicConnection {
  public:
@@ -103,8 +104,11 @@ class AutoClosingStream : public QuicHttpStream {
  public:
   explicit AutoClosingStream(
       const base::WeakPtr<QuicChromiumClientSession>& session,
-      HttpServerProperties* http_server_properties)
-      : QuicHttpStream(session, http_server_properties) {}
+      HttpServerProperties* http_server_properties,
+      bool mark_quic_broken_when_network_suspected)
+      : QuicHttpStream(session,
+                       http_server_properties,
+                       mark_quic_broken_when_network_suspected) {}
 
   void OnHeadersAvailable(const SpdyHeaderBlock& headers,
                           size_t frame_len) override {
@@ -332,16 +336,21 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
     session_->CryptoConnect(callback.callback());
     EXPECT_TRUE(session_->IsCryptoHandshakeConfirmed());
     stream_.reset(use_closing_stream_
-                      ? new AutoClosingStream(session_->GetWeakPtr(),
-                                              &http_server_properties_)
-                      : new QuicHttpStream(session_->GetWeakPtr(),
-                                           &http_server_properties_));
-
-    promised_stream_.reset(use_closing_stream_
-                               ? new AutoClosingStream(session_->GetWeakPtr(),
-                                                       &http_server_properties_)
-                               : new QuicHttpStream(session_->GetWeakPtr(),
-                                                    &http_server_properties_));
+                      ? new AutoClosingStream(
+                            session_->GetWeakPtr(), &http_server_properties_,
+                            !kMarkQuicBrokenWhenNetworkSuspected)
+                      : new QuicHttpStream(
+                            session_->GetWeakPtr(), &http_server_properties_,
+                            !kMarkQuicBrokenWhenNetworkSuspected));
+
+    promised_stream_.reset(
+        use_closing_stream_
+            ? new AutoClosingStream(session_->GetWeakPtr(),
+                                    &http_server_properties_,
+                                    !kMarkQuicBrokenWhenNetworkSuspected)
+            : new QuicHttpStream(session_->GetWeakPtr(),
+                                 &http_server_properties_,
+                                 !kMarkQuicBrokenWhenNetworkSuspected));
 
     push_promise_[":path"] = "/bar";
     push_promise_[":authority"] = "www.example.org";
@@ -725,7 +734,8 @@ TEST_P(QuicHttpStreamTest, LoadTimingTwoRequests) {
             stream_->SendRequest(headers_, &response_, callback_.callback()));
 
   // Start a second request.
-  QuicHttpStream stream2(session_->GetWeakPtr(), &http_server_properties_);
+  QuicHttpStream stream2(session_->GetWeakPtr(), &http_server_properties_,
+                         !kMarkQuicBrokenWhenNetworkSuspected);
   TestCompletionCallback callback2;
   EXPECT_EQ(OK,
             stream2.InitializeStream(&request_, DEFAULT_PRIORITY,