Commit fd90c3ed authored by Anna Malova's avatar Anna Malova Committed by Commit Bot

Convert ConsumeCallback to RepeatingCallback.

Bug: 1007815
Change-Id: I69d56f2ef9967764f1ab1f964d87f621bcf84685
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089836
Commit-Queue: Matt Menke <mmenke@chromium.org>
Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747311}
parent 496ad7a9
......@@ -46,7 +46,7 @@ class NET_EXPORT_PRIVATE SpdyBuffer {
// source followed by at most one call with DISCARD as the
// source. The sum of the number of bytes consumed equals the total
// size of the buffer.
typedef base::Callback<void(size_t, ConsumeSource)> ConsumeCallback;
typedef base::RepeatingCallback<void(size_t, ConsumeSource)> ConsumeCallback;
// Construct with the data in the given frame. Assumes that data is
// owned by |frame| or outlives it.
......
......@@ -71,9 +71,9 @@ TEST_F(SpdyBufferTest, Consume) {
size_t x1 = 0;
size_t x2 = 0;
buffer.AddConsumeCallback(
base::Bind(&IncrementBy, &x1, SpdyBuffer::CONSUME));
base::BindRepeating(&IncrementBy, &x1, SpdyBuffer::CONSUME));
buffer.AddConsumeCallback(
base::Bind(&IncrementBy, &x2, SpdyBuffer::CONSUME));
base::BindRepeating(&IncrementBy, &x2, SpdyBuffer::CONSUME));
EXPECT_EQ(std::string(kData, kDataSize), BufferToString(buffer));
......@@ -96,7 +96,7 @@ TEST_F(SpdyBufferTest, ConsumeOnDestruction) {
{
SpdyBuffer buffer(kData, kDataSize);
buffer.AddConsumeCallback(
base::Bind(&IncrementBy, &x, SpdyBuffer::DISCARD));
base::BindRepeating(&IncrementBy, &x, SpdyBuffer::DISCARD));
}
EXPECT_EQ(kDataSize, x);
......
......@@ -119,7 +119,7 @@ TEST_F(SpdyReadQueueTest, Clear) {
bool discarded = false;
size_t discarded_bytes = 0;
buffer->AddConsumeCallback(
base::Bind(&OnBufferDiscarded, &discarded, &discarded_bytes));
base::BindRepeating(&OnBufferDiscarded, &discarded, &discarded_bytes));
SpdyReadQueue read_queue;
read_queue.Enqueue(std::move(buffer));
......
......@@ -1292,7 +1292,7 @@ std::unique_ptr<SpdyBuffer> SpdySession::CreateDataBuffer(
// just a FIN with no payload.
if (effective_len != 0) {
DecreaseSendWindowSize(static_cast<int32_t>(effective_len));
data_buffer->AddConsumeCallback(base::Bind(
data_buffer->AddConsumeCallback(base::BindRepeating(
&SpdySession::OnWriteBufferConsumed, weak_factory_.GetWeakPtr(),
static_cast<size_t>(effective_len)));
}
......@@ -3192,8 +3192,8 @@ void SpdySession::OnStreamFrameData(spdy::SpdyStreamId stream_id,
buffer = std::make_unique<SpdyBuffer>(data, len);
DecreaseRecvWindowSize(static_cast<int32_t>(len));
buffer->AddConsumeCallback(base::Bind(&SpdySession::OnReadBufferConsumed,
weak_factory_.GetWeakPtr()));
buffer->AddConsumeCallback(base::BindRepeating(
&SpdySession::OnReadBufferConsumed, weak_factory_.GetWeakPtr()));
} else {
DCHECK_EQ(len, 0u);
}
......
......@@ -556,7 +556,7 @@ void SpdyStream::OnDataReceived(std::unique_ptr<SpdyBuffer> buffer) {
if (!weak_this)
return;
buffer->AddConsumeCallback(
base::Bind(&SpdyStream::OnReadBufferConsumed, GetWeakPtr()));
base::BindRepeating(&SpdyStream::OnReadBufferConsumed, GetWeakPtr()));
// May close |this|.
delegate_->OnDataReceived(std::move(buffer));
......@@ -863,7 +863,7 @@ void SpdyStream::QueueNextDataFrame() {
// This currently isn't strictly needed, since write frames are
// discarded only if the stream is about to be closed. But have it
// here anyway just in case this changes.
data_buffer->AddConsumeCallback(base::Bind(
data_buffer->AddConsumeCallback(base::BindRepeating(
&SpdyStream::OnWriteBufferConsumed, GetWeakPtr(), payload_size));
}
......
......@@ -55,7 +55,7 @@ class RequeingBufferProducer : public SpdyBufferProducer {
explicit RequeingBufferProducer(SpdyWriteQueue* queue) {
buffer_ = std::make_unique<SpdyBuffer>(kOriginal, base::size(kOriginal));
buffer_->AddConsumeCallback(
base::Bind(RequeingBufferProducer::ConsumeCallback, queue));
base::BindRepeating(RequeingBufferProducer::ConsumeCallback, queue));
}
std::unique_ptr<SpdyBuffer> ProduceBuffer() override {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment