Deprecate MASQUE PerRequestConfig::SetExpectedEncapsulatedResponseBody() This method's behavior can still be simulated with SetEncapsulatedResponseBodyCallback(). PiperOrigin-RevId: 899001346
diff --git a/quiche/quic/masque/masque_ohttp_client.cc b/quiche/quic/masque/masque_ohttp_client.cc index 4aef071..e409be7 100644 --- a/quiche/quic/masque/masque_ohttp_client.cc +++ b/quiche/quic/masque/masque_ohttp_client.cc
@@ -658,17 +658,6 @@ return absl::InvalidArgumentError(absl::StrCat( "Bad encapsulated status code: ", encapsulated_status_code)); } - if (it->second.per_request_config.expected_encapsulated_response_body() - .has_value() && - encapsulated_response->body != - *it->second.per_request_config - .expected_encapsulated_response_body()) { - return absl::InvalidArgumentError(absl::StrCat( - "Unexpected encapsulated response body: \"", - encapsulated_response->body, "\" != \"", - *it->second.per_request_config.expected_encapsulated_response_body(), - "\"")); - } if (const auto& callback = it->second.per_request_config.encapsulated_response_body_callback(); callback) {
diff --git a/quiche/quic/masque/masque_ohttp_client.h b/quiche/quic/masque/masque_ohttp_client.h index d0fa6eb..0d7ce97 100644 --- a/quiche/quic/masque/masque_ohttp_client.h +++ b/quiche/quic/masque/masque_ohttp_client.h
@@ -64,11 +64,6 @@ void SetExpectedEncapsulatedStatusCode(uint16_t status_code) { expected_encapsulated_status_code_ = status_code; } - void SetExpectedEncapsulatedResponseBody( - const std::string& expected_encapsulated_response_body) { - expected_encapsulated_response_body_ = - expected_encapsulated_response_body; - } void SetEncapsulatedResponseBodyCallback( std::function<absl::Status(absl::string_view)> callback) { encapsulated_response_body_callback_ = std::move(callback); @@ -95,9 +90,6 @@ std::optional<uint16_t> expected_encapsulated_status_code() const { return expected_encapsulated_status_code_; } - std::optional<std::string> expected_encapsulated_response_body() const { - return expected_encapsulated_response_body_; - } const std::function<absl::Status(absl::string_view)> absl_nullable& encapsulated_response_body_callback() const { return encapsulated_response_body_callback_; @@ -114,7 +106,6 @@ std::optional<std::string> expected_gateway_error_; std::optional<uint16_t> expected_gateway_status_code_; std::optional<uint16_t> expected_encapsulated_status_code_; - std::optional<std::string> expected_encapsulated_response_body_; std::function<absl::Status(absl::string_view)> absl_nullable encapsulated_response_body_callback_ = nullptr; };