Remove unused AddPromiseDataToResend() and associated classes and members. PiperOrigin-RevId: 572964797
diff --git a/quiche/quic/test_tools/quic_test_client.cc b/quiche/quic/test_tools/quic_test_client.cc index 44c630f..601a2bb 100644 --- a/quiche/quic/test_tools/quic_test_client.cc +++ b/quiche/quic/test_tools/quic_test_client.cc
@@ -611,9 +611,7 @@ response_body_size_ = 0; } -bool QuicTestClient::HaveActiveStream() { - return push_promise_data_to_resend_.get() || !open_streams_.empty(); -} +bool QuicTestClient::HaveActiveStream() { return !open_streams_.empty(); } bool QuicTestClient::WaitUntil( int timeout_ms, @@ -780,23 +778,6 @@ } } -QuicTestClient::TestClientDataToResend::TestClientDataToResend( - std::unique_ptr<spdy::Http2HeaderBlock> headers, absl::string_view body, - bool fin, QuicTestClient* test_client, - quiche::QuicheReferenceCountedPointer<QuicAckListenerInterface> - ack_listener) - : QuicDefaultClient::QuicDataToResend(std::move(headers), body, fin), - test_client_(test_client), - ack_listener_(std::move(ack_listener)) {} - -QuicTestClient::TestClientDataToResend::~TestClientDataToResend() = default; - -void QuicTestClient::TestClientDataToResend::Resend() { - test_client_->GetOrCreateStreamAndSendRequest(headers_.get(), body_, fin_, - ack_listener_); - headers_.reset(); -} - QuicTestClient::PerStreamState::PerStreamState(const PerStreamState& other) : stream_error(other.stream_error), response_complete(other.response_complete),
diff --git a/quiche/quic/test_tools/quic_test_client.h b/quiche/quic/test_tools/quic_test_client.h index ae024ab..9ea9cfa 100644 --- a/quiche/quic/test_tools/quic_test_client.h +++ b/quiche/quic/test_tools/quic_test_client.h
@@ -337,24 +337,6 @@ QuicTestClient& operator=(const QuicTestClient&&) = delete; private: - class TestClientDataToResend : public QuicDefaultClient::QuicDataToResend { - public: - TestClientDataToResend( - std::unique_ptr<spdy::Http2HeaderBlock> headers, absl::string_view body, - bool fin, QuicTestClient* test_client, - quiche::QuicheReferenceCountedPointer<QuicAckListenerInterface> - ack_listener); - - ~TestClientDataToResend() override; - - void Resend() override; - - protected: - QuicTestClient* test_client_; - quiche::QuicheReferenceCountedPointer<QuicAckListenerInterface> - ack_listener_; - }; - // PerStreamState of a stream is updated when it is closed. struct PerStreamState { PerStreamState(const PerStreamState& other); @@ -424,9 +406,6 @@ bool auto_reconnect_; // Should we buffer the response body? Defaults to true. bool buffer_body_; - // For async push promise rendezvous, validation may fail in which - // case the request should be retried. - std::unique_ptr<TestClientDataToResend> push_promise_data_to_resend_; // Number of requests/responses this client has sent/received. size_t num_requests_; size_t num_responses_;
diff --git a/quiche/quic/tools/quic_spdy_client_base.cc b/quiche/quic/tools/quic_spdy_client_base.cc index 7335617..a4e7ecc 100644 --- a/quiche/quic/tools/quic_spdy_client_base.cc +++ b/quiche/quic/tools/quic_spdy_client_base.cc
@@ -21,11 +21,6 @@ namespace quic { -void QuicSpdyClientBase::ClientQuicDataToResend::Resend() { - client_->SendRequest(*headers_, body_, fin_); - headers_ = nullptr; -} - QuicSpdyClientBase::QuicDataToResend::QuicDataToResend( std::unique_ptr<Http2HeaderBlock> headers, absl::string_view body, bool fin) : headers_(std::move(headers)), body_(body), fin_(fin) {} @@ -216,15 +211,6 @@ } } -void QuicSpdyClientBase::AddPromiseDataToResend(const Http2HeaderBlock& headers, - absl::string_view body, - bool fin) { - std::unique_ptr<Http2HeaderBlock> new_headers( - new Http2HeaderBlock(headers.Clone())); - push_promise_data_to_resend_.reset( - new ClientQuicDataToResend(std::move(new_headers), body, fin, this)); -} - int QuicSpdyClientBase::latest_response_code() const { QUIC_BUG_IF(quic_bug_10949_3, !store_response_) << "Response not stored!"; return latest_response_code_;
diff --git a/quiche/quic/tools/quic_spdy_client_base.h b/quiche/quic/tools/quic_spdy_client_base.h index 7fff7e1..3e52633 100644 --- a/quiche/quic/tools/quic_spdy_client_base.h +++ b/quiche/quic/tools/quic_spdy_client_base.h
@@ -162,32 +162,9 @@ void ResendSavedData() override; - void AddPromiseDataToResend(const spdy::Http2HeaderBlock& headers, - absl::string_view body, bool fin); bool HasActiveRequests() override; private: - // Specific QuicClient class for storing data to resend. - class ClientQuicDataToResend : public QuicDataToResend { - public: - ClientQuicDataToResend(std::unique_ptr<spdy::Http2HeaderBlock> headers, - absl::string_view body, bool fin, - QuicSpdyClientBase* client) - : QuicDataToResend(std::move(headers), body, fin), client_(client) { - QUICHE_DCHECK(headers_); - QUICHE_DCHECK(client); - } - - ClientQuicDataToResend(const ClientQuicDataToResend&) = delete; - ClientQuicDataToResend& operator=(const ClientQuicDataToResend&) = delete; - ~ClientQuicDataToResend() override {} - - void Resend() override; - - private: - QuicSpdyClientBase* client_; - }; - void SendRequestInternal(spdy::Http2HeaderBlock sanitized_headers, absl::string_view body, bool fin); @@ -216,8 +193,6 @@ // connection, in case the client receives a stateless reject. std::vector<std::unique_ptr<QuicDataToResend>> data_to_resend_on_connect_; - std::unique_ptr<ClientQuicDataToResend> push_promise_data_to_resend_; - bool drop_response_body_ = false; bool enable_web_transport_ = false; bool use_datagram_contexts_ = false;