Remove QuicStreamSendBufferPeer and the benchmark.
The peer is mostly not used (the one remaining method is only used in the old class), and the benchmark tests implementation detail of the old buffer. Removing those should simplify deprecating the old buffer.
PiperOrigin-RevId: 840299285
diff --git a/build/source_list.bzl b/build/source_list.bzl
index 996140b..5f823f3 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -856,7 +856,6 @@
"quic/test_tools/quic_spdy_stream_peer.h",
"quic/test_tools/quic_stream_id_manager_peer.h",
"quic/test_tools/quic_stream_peer.h",
- "quic/test_tools/quic_stream_send_buffer_peer.h",
"quic/test_tools/quic_stream_sequencer_buffer_peer.h",
"quic/test_tools/quic_stream_sequencer_peer.h",
"quic/test_tools/quic_sustained_bandwidth_recorder_peer.h",
@@ -952,7 +951,6 @@
"quic/test_tools/quic_spdy_stream_peer.cc",
"quic/test_tools/quic_stream_id_manager_peer.cc",
"quic/test_tools/quic_stream_peer.cc",
- "quic/test_tools/quic_stream_send_buffer_peer.cc",
"quic/test_tools/quic_stream_sequencer_buffer_peer.cc",
"quic/test_tools/quic_stream_sequencer_peer.cc",
"quic/test_tools/quic_sustained_bandwidth_recorder_peer.cc",
diff --git a/build/source_list.gni b/build/source_list.gni
index 75ef1b9..a9cd5c0 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -856,7 +856,6 @@
"src/quiche/quic/test_tools/quic_spdy_stream_peer.h",
"src/quiche/quic/test_tools/quic_stream_id_manager_peer.h",
"src/quiche/quic/test_tools/quic_stream_peer.h",
- "src/quiche/quic/test_tools/quic_stream_send_buffer_peer.h",
"src/quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.h",
"src/quiche/quic/test_tools/quic_stream_sequencer_peer.h",
"src/quiche/quic/test_tools/quic_sustained_bandwidth_recorder_peer.h",
@@ -952,7 +951,6 @@
"src/quiche/quic/test_tools/quic_spdy_stream_peer.cc",
"src/quiche/quic/test_tools/quic_stream_id_manager_peer.cc",
"src/quiche/quic/test_tools/quic_stream_peer.cc",
- "src/quiche/quic/test_tools/quic_stream_send_buffer_peer.cc",
"src/quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.cc",
"src/quiche/quic/test_tools/quic_stream_sequencer_peer.cc",
"src/quiche/quic/test_tools/quic_sustained_bandwidth_recorder_peer.cc",
diff --git a/build/source_list.json b/build/source_list.json
index 27e99c9..8f11f30 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -855,7 +855,6 @@
"quiche/quic/test_tools/quic_spdy_stream_peer.h",
"quiche/quic/test_tools/quic_stream_id_manager_peer.h",
"quiche/quic/test_tools/quic_stream_peer.h",
- "quiche/quic/test_tools/quic_stream_send_buffer_peer.h",
"quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.h",
"quiche/quic/test_tools/quic_stream_sequencer_peer.h",
"quiche/quic/test_tools/quic_sustained_bandwidth_recorder_peer.h",
@@ -951,7 +950,6 @@
"quiche/quic/test_tools/quic_spdy_stream_peer.cc",
"quiche/quic/test_tools/quic_stream_id_manager_peer.cc",
"quiche/quic/test_tools/quic_stream_peer.cc",
- "quiche/quic/test_tools/quic_stream_send_buffer_peer.cc",
"quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.cc",
"quiche/quic/test_tools/quic_stream_sequencer_peer.cc",
"quiche/quic/test_tools/quic_sustained_bandwidth_recorder_peer.cc",
diff --git a/quiche/quic/core/http/quic_spdy_session_test.cc b/quiche/quic/core/http/quic_spdy_session_test.cc
index b559386..82b5322 100644
--- a/quiche/quic/core/http/quic_spdy_session_test.cc
+++ b/quiche/quic/core/http/quic_spdy_session_test.cc
@@ -47,7 +47,6 @@
#include "quiche/quic/test_tools/quic_session_peer.h"
#include "quiche/quic/test_tools/quic_spdy_session_peer.h"
#include "quiche/quic/test_tools/quic_stream_peer.h"
-#include "quiche/quic/test_tools/quic_stream_send_buffer_peer.h"
#include "quiche/quic/test_tools/quic_test_utils.h"
#include "quiche/common/quiche_endian.h"
#include "quiche/common/quiche_mem_slice.h"
diff --git a/quiche/quic/core/quic_session_test.cc b/quiche/quic/core/quic_session_test.cc
index ac0c87b..974a79d 100644
--- a/quiche/quic/core/quic_session_test.cc
+++ b/quiche/quic/core/quic_session_test.cc
@@ -41,7 +41,6 @@
#include "quiche/quic/test_tools/quic_session_peer.h"
#include "quiche/quic/test_tools/quic_stream_id_manager_peer.h"
#include "quiche/quic/test_tools/quic_stream_peer.h"
-#include "quiche/quic/test_tools/quic_stream_send_buffer_peer.h"
#include "quiche/quic/test_tools/quic_test_utils.h"
#include "quiche/common/platform/api/quiche_logging.h"
#include "quiche/common/quiche_mem_slice_storage.h"
diff --git a/quiche/quic/core/quic_stream_send_buffer_test.cc b/quiche/quic/core/quic_stream_send_buffer_test.cc
index 312f502..c44f1c1 100644
--- a/quiche/quic/core/quic_stream_send_buffer_test.cc
+++ b/quiche/quic/core/quic_stream_send_buffer_test.cc
@@ -20,7 +20,7 @@
#include "quiche/quic/core/quic_types.h"
#include "quiche/quic/platform/api/quic_expect_bug.h"
#include "quiche/quic/platform/api/quic_flags.h"
-#include "quiche/quic/test_tools/quic_stream_send_buffer_peer.h"
+#include "quiche/quic/test_tools/quic_interval_deque_peer.h"
#include "quiche/quic/test_tools/quic_test_utils.h"
#include "quiche/common/platform/api/quiche_test.h"
#include "quiche/common/quiche_buffer_allocator.h"
@@ -30,6 +30,16 @@
namespace quic {
namespace test {
+
+// TODO: b/417402601 - remove this after the old SendBuffer implementation is
+// gone.
+class QuicStreamSendBufferPeer {
+ public:
+ static int32_t write_index(QuicStreamSendBuffer* send_buffer) {
+ return QuicIntervalDequePeer::GetCachedIndex(&send_buffer->interval_deque_);
+ }
+};
+
namespace {
enum class SendBufferType {
@@ -263,24 +273,24 @@
EXPECT_TRUE(send_buffer_->OnStreamDataAcked(500, 1000, &newly_acked_length));
EXPECT_EQ(1000u, newly_acked_length);
EXPECT_EQ(4u, send_buffer_->size());
- EXPECT_EQ(3840u, QuicStreamSendBufferPeer::TotalLength(send_buffer_.get()));
+ EXPECT_EQ(3840u, send_buffer_->TotalDataBufferedForTest());
EXPECT_TRUE(send_buffer_->OnStreamDataAcked(1200, 1000, &newly_acked_length));
EXPECT_EQ(700u, newly_acked_length);
EXPECT_EQ(4u, send_buffer_->size());
// Slice 2 gets fully acked.
- EXPECT_EQ(2816u, QuicStreamSendBufferPeer::TotalLength(send_buffer_.get()));
+ EXPECT_EQ(2816u, send_buffer_->TotalDataBufferedForTest());
EXPECT_TRUE(send_buffer_->OnStreamDataAcked(2000, 1840, &newly_acked_length));
EXPECT_EQ(1640u, newly_acked_length);
EXPECT_EQ(4u, send_buffer_->size());
// Slices 3 and 4 get fully acked.
- EXPECT_EQ(1024u, QuicStreamSendBufferPeer::TotalLength(send_buffer_.get()));
+ EXPECT_EQ(1024u, send_buffer_->TotalDataBufferedForTest());
EXPECT_TRUE(send_buffer_->OnStreamDataAcked(0, 1000, &newly_acked_length));
EXPECT_EQ(500u, newly_acked_length);
EXPECT_EQ(0u, send_buffer_->size());
- EXPECT_EQ(0u, QuicStreamSendBufferPeer::TotalLength(send_buffer_.get()));
+ EXPECT_EQ(0u, send_buffer_->TotalDataBufferedForTest());
}
TEST_P(QuicStreamSendBufferTest, PendingRetransmission) {
diff --git a/quiche/quic/test_tools/quic_stream_peer.cc b/quiche/quic/test_tools/quic_stream_peer.cc
index 4ff801b..bc88ea3 100644
--- a/quiche/quic/test_tools/quic_stream_peer.cc
+++ b/quiche/quic/test_tools/quic_stream_peer.cc
@@ -10,7 +10,6 @@
#include "quiche/quic/core/quic_stream_send_buffer_base.h"
#include "quiche/quic/core/quic_types.h"
#include "quiche/quic/test_tools/quic_flow_controller_peer.h"
-#include "quiche/quic/test_tools/quic_stream_send_buffer_peer.h"
namespace quic {
namespace test {
diff --git a/quiche/quic/test_tools/quic_stream_send_buffer_peer.cc b/quiche/quic/test_tools/quic_stream_send_buffer_peer.cc
deleted file mode 100644
index 35bca77..0000000
--- a/quiche/quic/test_tools/quic_stream_send_buffer_peer.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2017 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 "quiche/quic/test_tools/quic_stream_send_buffer_peer.h"
-
-#include "quiche/quic/test_tools/quic_interval_deque_peer.h"
-
-namespace quic {
-
-namespace test {
-
-// static
-void QuicStreamSendBufferPeer::SetStreamOffset(
- QuicStreamSendBuffer* send_buffer, QuicStreamOffset stream_offset) {
- send_buffer->stream_offset_ = stream_offset;
-}
-
-// static
-const BufferedSlice* QuicStreamSendBufferPeer::CurrentWriteSlice(
- QuicStreamSendBuffer* send_buffer) {
- auto wi = write_index(send_buffer);
-
- if (wi == -1) {
- return nullptr;
- }
- return QuicIntervalDequePeer::GetItem(&send_buffer->interval_deque_, wi);
-}
-
-// static
-QuicByteCount QuicStreamSendBufferPeer::TotalLength(
- QuicStreamSendBufferBase* send_buffer) {
- return send_buffer->TotalDataBufferedForTest();
-}
-
-// static
-int32_t QuicStreamSendBufferPeer::write_index(
- QuicStreamSendBuffer* send_buffer) {
- return QuicIntervalDequePeer::GetCachedIndex(&send_buffer->interval_deque_);
-}
-
-} // namespace test
-
-} // namespace quic
diff --git a/quiche/quic/test_tools/quic_stream_send_buffer_peer.h b/quiche/quic/test_tools/quic_stream_send_buffer_peer.h
deleted file mode 100644
index d65a1bf..0000000
--- a/quiche/quic/test_tools/quic_stream_send_buffer_peer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 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.
-
-#ifndef QUICHE_QUIC_TEST_TOOLS_QUIC_STREAM_SEND_BUFFER_PEER_H_
-#define QUICHE_QUIC_TEST_TOOLS_QUIC_STREAM_SEND_BUFFER_PEER_H_
-
-#include "quiche/quic/core/quic_stream_send_buffer.h"
-
-namespace quic {
-
-namespace test {
-
-class QuicStreamSendBufferPeer {
- public:
- static void SetStreamOffset(QuicStreamSendBuffer* send_buffer,
- QuicStreamOffset stream_offset);
-
- static const BufferedSlice* CurrentWriteSlice(
- QuicStreamSendBuffer* send_buffer);
-
- static QuicByteCount TotalLength(QuicStreamSendBufferBase* send_buffer);
-
- static int32_t write_index(QuicStreamSendBuffer* send_buffer);
-};
-
-} // namespace test
-
-} // namespace quic
-
-#endif // QUICHE_QUIC_TEST_TOOLS_QUIC_STREAM_SEND_BUFFER_PEER_H_
