Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_packet_creator_test.cc

Issue 1397113003: relnote: Refactor stream buffer allocation out into a scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with TOT Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_packet_creator.cc ('k') | net/quic/quic_packet_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_packet_creator_test.cc
diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc
index 962c1b5b4d879bff7d1b8927d5bedd49e81b3ae6..c0565edd0d631cfa9d19e7b5d420d69152a0872d 100644
--- a/net/quic/quic_packet_creator_test.cc
+++ b/net/quic/quic_packet_creator_test.cc
@@ -491,7 +491,7 @@ TEST_P(QuicPacketCreatorTest, ReserializeFramesWithSequenceNumberLength) {
TEST_P(QuicPacketCreatorTest, ReserializeFramesWithPadding) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("fake handshake message data"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
creator_.CreateStreamFrame(kCryptoStreamId, io_vector, 0u, 0u, false, &frame,
&stream_buffer);
RetransmittableFrames frames(ENCRYPTION_NONE);
@@ -515,7 +515,7 @@ TEST_P(QuicPacketCreatorTest, ReserializeFramesWithFullPacketAndPadding) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector(data));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
creator_.CreateStreamFrame(kCryptoStreamId, io_vector, 0, kOffset, false,
&frame, &stream_buffer);
RetransmittableFrames frames(ENCRYPTION_NONE);
@@ -623,7 +623,7 @@ TEST_P(QuicPacketCreatorTest, SwitchFecOnWithStreamFrameQueued) {
// Add a stream frame to the creator.
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(1u, io_vector, 0u, 0u, false,
&frame, &stream_buffer);
EXPECT_EQ(4u, consumed);
@@ -654,7 +654,7 @@ TEST_P(QuicPacketCreatorTest, SwitchFecOnWithStreamFrameQueued) {
TEST_P(QuicPacketCreatorTest, CreateStreamFrame) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(1u, io_vector, 0u, 0u, false,
&frame, &stream_buffer);
EXPECT_EQ(4u, consumed);
@@ -666,7 +666,7 @@ TEST_P(QuicPacketCreatorTest, CreateStreamFrame) {
TEST_P(QuicPacketCreatorTest, CreateStreamFrameFin) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(1u, io_vector, 0u, 10u, true,
&frame, &stream_buffer);
EXPECT_EQ(4u, consumed);
@@ -678,7 +678,7 @@ TEST_P(QuicPacketCreatorTest, CreateStreamFrameFin) {
TEST_P(QuicPacketCreatorTest, CreateStreamFrameFinOnly) {
QuicFrame frame;
QuicIOVector io_vector(nullptr, 0, 0);
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(1u, io_vector, 0u, 0u, true,
&frame, &stream_buffer);
EXPECT_EQ(0u, consumed);
@@ -698,7 +698,7 @@ TEST_P(QuicPacketCreatorTest, CreateAllFreeBytesForStreamFrames) {
if (should_have_room) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("testdata"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t bytes_consumed =
creator_.CreateStreamFrame(kClientDataStreamId1, io_vector, 0u,
kOffset, false, &frame, &stream_buffer);
@@ -725,7 +725,7 @@ TEST_P(QuicPacketCreatorTest, StreamFrameConsumption) {
size_t bytes_free = delta > 0 ? 0 : 0 - delta;
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector(data));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t bytes_consumed =
creator_.CreateStreamFrame(kClientDataStreamId1, io_vector, 0u, kOffset,
false, &frame, &stream_buffer);
@@ -759,7 +759,7 @@ TEST_P(QuicPacketCreatorTest, StreamFrameConsumptionWithFec) {
size_t bytes_free = delta > 0 ? 0 : 0 - delta;
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector(data));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t bytes_consumed =
creator_.CreateStreamFrame(kClientDataStreamId1, io_vector, 0u, kOffset,
false, &frame, &stream_buffer);
@@ -794,7 +794,7 @@ TEST_P(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector(data));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t bytes_consumed = creator_.CreateStreamFrame(
kCryptoStreamId, io_vector, 0u, kOffset, false, &frame, &stream_buffer);
EXPECT_LT(0u, bytes_consumed);
@@ -830,7 +830,7 @@ TEST_P(QuicPacketCreatorTest, NonCryptoStreamFramePacketNonPadding) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector(data));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t bytes_consumed =
creator_.CreateStreamFrame(kClientDataStreamId1, io_vector, 0u, kOffset,
false, &frame, &stream_buffer);
@@ -966,7 +966,7 @@ TEST_P(QuicPacketCreatorTest, CreateStreamFrameTooLarge) {
QuicFrame frame;
const string too_long_payload(payload_length * 2, 'a');
QuicIOVector io_vector(MakeIOVector(too_long_payload));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(1u, io_vector, 0u, 0u, true,
&frame, &stream_buffer);
EXPECT_EQ(payload_length, consumed);
@@ -997,7 +997,7 @@ TEST_P(QuicPacketCreatorTest, AddFrameAndSerialize) {
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(1u, io_vector, 0u, 0u, false,
&frame, &stream_buffer);
EXPECT_EQ(4u, consumed);
@@ -1058,7 +1058,7 @@ TEST_P(QuicPacketCreatorTest, SerializeTruncatedAckFrameWithLargePacketSize) {
// Make sure that an additional stream frame can be added to the packet.
QuicFrame stream_frame;
QuicIOVector io_vector(MakeIOVector("test"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(2u, io_vector, 0u, 0u, false,
&stream_frame, &stream_buffer);
EXPECT_EQ(4u, consumed);
@@ -1204,7 +1204,7 @@ TEST_P(QuicPacketCreatorTest, ResetFecGroupWithQueuedFrames) {
// Add a stream frame to the creator.
QuicFrame frame;
QuicIOVector io_vector(MakeIOVector("test"));
- scoped_ptr<char[]> stream_buffer;
+ UniqueStreamBuffer stream_buffer;
size_t consumed = creator_.CreateStreamFrame(1u, io_vector, 0u, 0u, false,
&frame, &stream_buffer);
EXPECT_EQ(4u, consumed);
« no previous file with comments | « net/quic/quic_packet_creator.cc ('k') | net/quic/quic_packet_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698