Deprecate FLAGS_quic_send_push_stream_timed_out_error.

net/quic/core/quic_client_promised_info_test.cc

 // Copyright 2016 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_client_promised_info.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "net/quic/core/spdy_utils.h"
@@ skipping 106 matching lines @@
 }
 
 TEST_F(QuicClientPromisedInfoTest, PushPromiseCleanupAlarm) {
   ReceivePromise(promise_id_);
 
   // Verify that the promise is in the unclaimed streams map.
   QuicClientPromisedInfo* promised = session_.GetPromisedById(promise_id_);
   ASSERT_NE(promised, nullptr);
 
   // Fire the alarm that will cancel the promised stream.
-  if (FLAGS_quic_send_push_stream_timed_out_error) {
-    EXPECT_CALL(*connection_,
-                SendRstStream(promise_id_, QUIC_PUSH_STREAM_TIMED_OUT, 0));
-  } else {
-    EXPECT_CALL(*connection_,
-                SendRstStream(promise_id_, QUIC_STREAM_CANCELLED, 0));
-  }
+  EXPECT_CALL(*connection_,
+              SendRstStream(promise_id_, QUIC_PUSH_STREAM_TIMED_OUT, 0));
   alarm_factory_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
 
   // Verify that the promise is gone after the alarm fires.
   EXPECT_EQ(session_.GetPromisedById(promise_id_), nullptr);
   EXPECT_EQ(session_.GetPromisedByUrl(promise_url_), nullptr);
 }
 
 TEST_F(QuicClientPromisedInfoTest, PushPromiseInvalidMethod) {
   // Promise with an unsafe method
   push_promise_[":method"] = "PUT";
@@ skipping 164 matching lines @@
   EXPECT_FALSE(delegate.rendezvous_fired());
   EXPECT_EQ(delegate.rendezvous_stream(), nullptr);
 
   // Promise is gone
   EXPECT_EQ(session_.GetPromisedById(promise_id_), nullptr);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net