Deprecate FLAGS_quic_send_push_stream_timed_out_error.

net/quic/core/quic_client_promised_info.cc

 // Copyright (c) 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 "base/logging.h"
 #include "net/quic/core/spdy_utils.h"
 
 using net::SpdyHeaderBlock;
 using net::kPushPromiseTimeoutSecs;
 using std::string;
 
 namespace net {
 
 QuicClientPromisedInfo::QuicClientPromisedInfo(QuicClientSessionBase* session,
                                                QuicStreamId id,
                                                string url)
     : session_(session),
       id_(id),
       url_(std::move(url)),
       client_request_delegate_(nullptr) {}
 
 QuicClientPromisedInfo::~QuicClientPromisedInfo() {}
 
 void QuicClientPromisedInfo::CleanupAlarm::OnAlarm() {
   DVLOG(1) << "self GC alarm for stream " << promised_->id_;
   promised_->session()->OnPushStreamTimedOut(promised_->id_);
-  if (FLAGS_quic_send_push_stream_timed_out_error) {
-    promised_->Reset(QUIC_PUSH_STREAM_TIMED_OUT);
-  } else {
-    promised_->Reset(QUIC_STREAM_CANCELLED);
-  }
+  promised_->Reset(QUIC_PUSH_STREAM_TIMED_OUT);
 }
 
 void QuicClientPromisedInfo::Init() {
   cleanup_alarm_.reset(session_->connection()->alarm_factory()->CreateAlarm(
       new QuicClientPromisedInfo::CleanupAlarm(this)));
   cleanup_alarm_->Set(
       session_->connection()->helper()->GetClock()->ApproximateNow() +
       QuicTime::Delta::FromSeconds(kPushPromiseTimeoutSecs));
 }
 
@@ skipping 84 matching lines @@
   return FinalValidation();
 }
 
 void QuicClientPromisedInfo::Cancel() {
   // Don't fire OnRendezvousResult() for client initiated cancel.
   client_request_delegate_ = nullptr;
   Reset(QUIC_STREAM_CANCELLED);
 }
 
 }  // namespace net