Remove BalsaVisitorInterface::ProcessTrailers(). This method is no longer called from BalsaFrame. This CL removes the visitor callback and subclass implementations. PiperOrigin-RevId: 590704307
diff --git a/quiche/balsa/balsa_frame_test.cc b/quiche/balsa/balsa_frame_test.cc index 0196044..0e81900 100644 --- a/quiche/balsa/balsa_frame_test.cc +++ b/quiche/balsa/balsa_frame_test.cc
@@ -533,15 +533,10 @@ GenerateFakeHeaders(headers, &fake_headers); ProcessHeaders(fake_headers); } - void ProcessTrailers(const BalsaHeaders& trailer) override { - FakeHeaders fake_headers; - GenerateFakeHeaders(trailer, &fake_headers); - ProcessTrailers(fake_headers); - } void OnTrailers(std::unique_ptr<BalsaHeaders> trailers) override { FakeHeaders fake_trailers; GenerateFakeHeaders(*trailers, &fake_trailers); - ProcessTrailers(fake_trailers); + OnTrailers(fake_trailers); } MOCK_METHOD(void, OnRawBodyInput, (absl::string_view input), (override)); @@ -549,8 +544,7 @@ MOCK_METHOD(void, OnHeaderInput, (absl::string_view input), (override)); MOCK_METHOD(void, OnTrailerInput, (absl::string_view input), (override)); MOCK_METHOD(void, ProcessHeaders, (const FakeHeaders& headers)); - // TODO(b/134507471): Rename to OnTrailers(). - MOCK_METHOD(void, ProcessTrailers, (const FakeHeaders& headers)); + MOCK_METHOD(void, OnTrailers, (const FakeHeaders& trailers)); MOCK_METHOD(void, OnRequestFirstLineInput, (absl::string_view line_input, absl::string_view method_input, absl::string_view request_uri, absl::string_view version_input), @@ -1278,7 +1272,7 @@ FakeHeaders fake_trailers; fake_trailers.AddKeyValue("crass", "monkeys"); fake_trailers.AddKeyValue("funky", "monkeys"); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_trailers)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_trailers)); EXPECT_CALL(visitor_mock_, OnTrailerInput(_)).Times(AtLeast(1)); @@ -1749,7 +1743,7 @@ EXPECT_CALL(visitor_mock_, OnChunkLength(63)); EXPECT_CALL(visitor_mock_, OnChunkLength(1)); EXPECT_CALL(visitor_mock_, OnChunkLength(0)); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_trailers)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_trailers)); EXPECT_CALL(visitor_mock_, MessageDone()); } EXPECT_CALL(visitor_mock_, OnHeaderInput(message_headers)); @@ -2223,7 +2217,7 @@ EXPECT_CALL(visitor_mock_, OnChunkLength(10)); EXPECT_CALL(visitor_mock_, OnChunkLength(63)); EXPECT_CALL(visitor_mock_, OnChunkLength(0)); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_headers_in_trailer)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_headers_in_trailer)); EXPECT_CALL(visitor_mock_, MessageDone()); } EXPECT_CALL(visitor_mock_, OnHeaderInput(message_headers)); @@ -2292,7 +2286,7 @@ EXPECT_CALL(visitor_mock_, OnChunkLength(10)); EXPECT_CALL(visitor_mock_, OnChunkLength(63)); EXPECT_CALL(visitor_mock_, OnChunkLength(0)); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_headers_in_trailer)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_headers_in_trailer)); EXPECT_CALL(visitor_mock_, MessageDone()); } EXPECT_CALL(visitor_mock_, OnHeaderInput(message_headers)); @@ -2373,7 +2367,7 @@ "HTTP/1.1", "200", "Ok all is well")); EXPECT_CALL(visitor_mock, ProcessHeaders(fake_headers)); EXPECT_CALL(visitor_mock, HeaderDone()); - EXPECT_CALL(visitor_mock, ProcessTrailers(fake_headers_in_trailer)); + EXPECT_CALL(visitor_mock, OnTrailers(fake_headers_in_trailer)); EXPECT_CALL(visitor_mock, MessageDone()); } EXPECT_CALL(visitor_mock, OnHeaderInput(message_headers)); @@ -2532,7 +2526,7 @@ : BalsaFrameEnums::INVALID_TRAILER_FORMAT; EXPECT_CALL(visitor_mock_, HandleError(expected_error)).Times(1); - EXPECT_CALL(visitor_mock_, ProcessTrailers(_)).Times(0); + EXPECT_CALL(visitor_mock_, OnTrailers(_)).Times(0); EXPECT_CALL(visitor_mock_, MessageDone()).Times(0); ASSERT_EQ(headers.size(), @@ -3325,7 +3319,7 @@ FakeHeaders fake_trailers; fake_trailers.AddKeyValue("crass_monkeys", ""); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_trailers)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_trailers)); EXPECT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); @@ -3395,7 +3389,7 @@ EXPECT_CALL(visitor_mock_, HeaderDone()); EXPECT_CALL(visitor_mock_, OnChunkLength(3)); EXPECT_CALL(visitor_mock_, OnChunkLength(0)); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_headers_in_trailer)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_headers_in_trailer)); EXPECT_CALL(visitor_mock_, OnTrailerInput(trailer_data)); EXPECT_CALL(visitor_mock_, MessageDone()); } @@ -3479,7 +3473,7 @@ { FakeHeaders fake_trailers; fake_trailers.AddKeyValue("k", "v"); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_trailers)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_trailers)); } ASSERT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); @@ -3509,7 +3503,7 @@ { FakeHeaders fake_trailers; fake_trailers.AddKeyValue("nk", "nv"); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_trailers)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_trailers)); } ASSERT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); @@ -3749,7 +3743,7 @@ fake_trailers.AddKeyValue("k", "v"); fake_trailers.AddKeyValue(kGibberish1, kGibberish2); fake_trailers.AddKeyValue("foo", "bar : eeep : baz"); - EXPECT_CALL(visitor_mock_, ProcessTrailers(fake_trailers)); + EXPECT_CALL(visitor_mock_, OnTrailers(fake_trailers)); ASSERT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); @@ -3788,7 +3782,7 @@ balsa_frame_.set_max_header_length(headers.size()); EXPECT_CALL(visitor_mock_, HandleError(BalsaFrameEnums::TRAILER_TOO_LONG)); - EXPECT_CALL(visitor_mock_, ProcessTrailers(_)).Times(0); + EXPECT_CALL(visitor_mock_, OnTrailers(_)).Times(0); EXPECT_CALL(visitor_mock_, MessageDone()).Times(0); ASSERT_EQ(headers.size(), balsa_frame_.ProcessInput(headers.data(), headers.size()));
diff --git a/quiche/balsa/balsa_visitor_interface.h b/quiche/balsa/balsa_visitor_interface.h index 3f3935f..f1e3e94 100644 --- a/quiche/balsa/balsa_visitor_interface.h +++ b/quiche/balsa/balsa_visitor_interface.h
@@ -69,21 +69,8 @@ virtual void ProcessHeaders(const BalsaHeaders& headers) = 0; // Summary: - // Since the BalsaFrame already has to parse the trailer, it might as well - // pass the parsed and cleaned-up results to whatever might need it. This - // function exists for that purpose-- parsed trailer is passed into this - // function. This will not be called if the trailer_ object is not set in - // the framer, even if trailer exists in request/response. - // Arguments: - // trailer - contains the parsed headers in the order in which - // they occurred in the trailer. - // TODO(b/134507471): Remove this and update the OnTrailers() comment. - virtual void ProcessTrailers(const BalsaHeaders& trailer) = 0; - - // Summary: // Called when the trailers are framed and processed. This callback is only - // called when the trailers option is set in the framer, and it is mutually - // exclusive with ProcessTrailers(). + // called when the trailers option is set in the framer. // Arguments: // trailers - contains the parsed headers in the order in which they // occurred in the trailers.
diff --git a/quiche/balsa/noop_balsa_visitor.h b/quiche/balsa/noop_balsa_visitor.h index 634f424..8c25902 100644 --- a/quiche/balsa/noop_balsa_visitor.h +++ b/quiche/balsa/noop_balsa_visitor.h
@@ -33,7 +33,6 @@ void OnHeaderInput(absl::string_view /*input*/) override {} void OnTrailerInput(absl::string_view /*input*/) override {} void ProcessHeaders(const BalsaHeaders& /*headers*/) override {} - void ProcessTrailers(const BalsaHeaders& /*trailer*/) override {} void OnTrailers(std::unique_ptr<BalsaHeaders> /*trailers*/) override {} void OnRequestFirstLineInput(absl::string_view /*line_input*/,