Removes use of VisitorDataSource in more tests. The `DataFrameSource` parts of the API are no longer used. PiperOrigin-RevId: 699286168
diff --git a/quiche/http2/adapter/nghttp2_adapter_test.cc b/quiche/http2/adapter/nghttp2_adapter_test.cc index f9bb6a5..ad76dc9 100644 --- a/quiche/http2/adapter/nghttp2_adapter_test.cc +++ b/quiche/http2/adapter/nghttp2_adapter_test.cc
@@ -7180,7 +7180,6 @@ visitor.AppendPayloadForStream( 1, "Here is some data, which will be completely ignored!"); - auto body = std::make_unique<VisitorDataSource>(visitor, 1); int submit_result = adapter->SubmitResponse( 1, ToHeaders({{":status", "200"}}), nullptr, false);
diff --git a/quiche/http2/adapter/oghttp2_adapter_metadata_test.cc b/quiche/http2/adapter/oghttp2_adapter_metadata_test.cc index db399f7..3995315 100644 --- a/quiche/http2/adapter/oghttp2_adapter_metadata_test.cc +++ b/quiche/http2/adapter/oghttp2_adapter_metadata_test.cc
@@ -373,10 +373,9 @@ const std::string kBody = std::string(100 * 1024, 'a'); visitor.AppendPayloadForStream(1, kBody); visitor.SetEndData(1, false); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); const int32_t stream_id1 = - adapter->SubmitRequest(headers1, std::move(body1), false, nullptr); + adapter->SubmitRequest(headers1, nullptr, false, nullptr); ASSERT_EQ(stream_id1, 1); EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, _, 0x0)); @@ -615,10 +614,9 @@ // the stream. visitor.AppendPayloadForStream(1, kBody); visitor.SetEndData(1, false); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); int submit_result = adapter->SubmitResponse( 1, ToHeaders({{":status", "200"}, {"x-comment", "Sure, sounds good."}}), - std::move(body1), false); + nullptr, false); EXPECT_EQ(submit_result, 0); EXPECT_TRUE(adapter->want_write());
diff --git a/quiche/http2/adapter/oghttp2_session_test.cc b/quiche/http2/adapter/oghttp2_session_test.cc index 9e29388..1fa44fd 100644 --- a/quiche/http2/adapter/oghttp2_session_test.cc +++ b/quiche/http2/adapter/oghttp2_session_test.cc
@@ -92,13 +92,12 @@ const char* kSentinel1 = "arbitrary pointer 1"; visitor.AppendPayloadForStream(1, "This is an example request body."); visitor.SetEndData(1, true); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); - int stream_id = session.SubmitRequest( - ToHeaders({{":method", "POST"}, - {":scheme", "http"}, - {":authority", "example.com"}, - {":path", "/this/is/request/one"}}), - std::move(body1), false, const_cast<char*>(kSentinel1)); + int stream_id = + session.SubmitRequest(ToHeaders({{":method", "POST"}, + {":scheme", "http"}, + {":authority", "example.com"}, + {":path", "/this/is/request/one"}}), + nullptr, false, const_cast<char*>(kSentinel1)); ASSERT_EQ(stream_id, 1); // Submit another request to ensure the next stream is created. @@ -278,13 +277,12 @@ const char* kSentinel1 = "arbitrary pointer 1"; visitor.AppendPayloadForStream(1, "This is an example request body."); visitor.SetEndData(1, true); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); - int stream_id = session.SubmitRequest( - ToHeaders({{":method", "POST"}, - {":scheme", "http"}, - {":authority", "example.com"}, - {":path", "/this/is/request/one"}}), - std::move(body1), false, const_cast<char*>(kSentinel1)); + int stream_id = + session.SubmitRequest(ToHeaders({{":method", "POST"}, + {":scheme", "http"}, + {":authority", "example.com"}, + {":path", "/this/is/request/one"}}), + nullptr, false, const_cast<char*>(kSentinel1)); ASSERT_EQ(stream_id, 1); EXPECT_TRUE(session.want_write()); EXPECT_EQ(kSentinel1, session.GetStreamUserData(stream_id)); @@ -389,13 +387,12 @@ visitor.AppendPayloadForStream(1, std::string(20000, 'a')); visitor.SetEndData(1, true); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); int stream_id = session.SubmitRequest(ToHeaders({{":method", "POST"}, {":scheme", "http"}, {":authority", "example.com"}, {":path", "/this/is/request/one"}}), - std::move(body1), false, nullptr); + nullptr, false, nullptr); ASSERT_EQ(stream_id, 1); EXPECT_TRUE(session.want_write()); @@ -422,13 +419,12 @@ EXPECT_FALSE(session.want_write()); const char* kSentinel1 = "arbitrary pointer 1"; - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); - int stream_id = session.SubmitRequest( - ToHeaders({{":method", "POST"}, - {":scheme", "http"}, - {":authority", "example.com"}, - {":path", "/this/is/request/one"}}), - std::move(body1), false, const_cast<char*>(kSentinel1)); + int stream_id = + session.SubmitRequest(ToHeaders({{":method", "POST"}, + {":scheme", "http"}, + {":authority", "example.com"}, + {":path", "/this/is/request/one"}}), + nullptr, false, const_cast<char*>(kSentinel1)); EXPECT_GT(stream_id, 0); EXPECT_TRUE(session.want_write()); EXPECT_EQ(kSentinel1, session.GetStreamUserData(stream_id)); @@ -477,13 +473,12 @@ EXPECT_FALSE(session.want_write()); const char* kSentinel1 = "arbitrary pointer 1"; - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); - int stream_id = session.SubmitRequest( - ToHeaders({{":method", "POST"}, - {":scheme", "http"}, - {":authority", "example.com"}, - {":path", "/this/is/request/one"}}), - std::move(body1), false, const_cast<char*>(kSentinel1)); + int stream_id = + session.SubmitRequest(ToHeaders({{":method", "POST"}, + {":scheme", "http"}, + {":authority", "example.com"}, + {":path", "/this/is/request/one"}}), + nullptr, false, const_cast<char*>(kSentinel1)); EXPECT_GT(stream_id, 0); EXPECT_TRUE(session.want_write()); EXPECT_EQ(kSentinel1, session.GetStreamUserData(stream_id)); @@ -533,13 +528,12 @@ const char* kSentinel1 = "arbitrary pointer 1"; visitor.AppendPayloadForStream(1, "This is an example request body."); visitor.SetEndData(1, true); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); - int stream_id = session.SubmitRequest( - ToHeaders({{":method", "POST"}, - {":scheme", "http"}, - {":authority", "example.com"}, - {":path", "/this/is/request/one"}}), - std::move(body1), false, const_cast<char*>(kSentinel1)); + int stream_id = + session.SubmitRequest(ToHeaders({{":method", "POST"}, + {":scheme", "http"}, + {":authority", "example.com"}, + {":path", "/this/is/request/one"}}), + nullptr, false, const_cast<char*>(kSentinel1)); EXPECT_GT(stream_id, 0); EXPECT_TRUE(session.want_write()); EXPECT_EQ(kSentinel1, session.GetStreamUserData(stream_id)); @@ -806,12 +800,11 @@ // A data fin is not sent so that the stream remains open, and the flow // control state can be verified. visitor.AppendPayloadForStream(1, "This is an example response body."); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); int submit_result = session.SubmitResponse( 1, ToHeaders({{":status", "404"}, {"x-comment", "I have no idea what you're talking about."}}), - std::move(body1), false); + nullptr, false); EXPECT_EQ(submit_result, 0); EXPECT_TRUE(session.want_write()); @@ -898,10 +891,9 @@ // the stream. visitor.AppendPayloadForStream(1, "This is an example response body."); visitor.SetEndData(1, false); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); int submit_result = session.SubmitResponse( 1, ToHeaders({{":status", "200"}, {"x-comment", "Sure, sounds good."}}), - std::move(body1), false); + nullptr, false); EXPECT_EQ(submit_result, 0); EXPECT_TRUE(session.want_write()); @@ -990,10 +982,9 @@ // the stream. visitor.AppendPayloadForStream(1, "This is an example response body."); visitor.SetEndData(1, false); - auto body1 = std::make_unique<VisitorDataSource>(visitor, 1); int submit_result = session.SubmitResponse( 1, ToHeaders({{":status", "200"}, {"x-comment", "Sure, sounds good."}}), - std::move(body1), false); + nullptr, false); EXPECT_EQ(submit_result, 0); EXPECT_TRUE(session.want_write()); // There has not been a call to Send() yet, so neither headers nor body have