| Index: net/quic/chromium/quic_test_packet_maker.cc
|
| diff --git a/net/quic/chromium/quic_test_packet_maker.cc b/net/quic/chromium/quic_test_packet_maker.cc
|
| index d80ecda11e232a4c95fae219d511201fc4a1a1f0..12d66dcaa4efbafed869e09c7b5e6b58fa27e5a8 100644
|
| --- a/net/quic/chromium/quic_test_packet_maker.cc
|
| +++ b/net/quic/chromium/quic_test_packet_maker.cc
|
| @@ -271,7 +271,7 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeDataPacket(
|
| bool should_include_version,
|
| bool fin,
|
| QuicStreamOffset offset,
|
| - base::StringPiece data) {
|
| + QuicStringPiece data) {
|
| InitializeHeader(packet_number, should_include_version);
|
| QuicStreamFrame frame(stream_id, fin, offset, data);
|
| DVLOG(1) << "Adding frame: " << frame;
|
| @@ -294,7 +294,7 @@ QuicTestPacketMaker::MakeMultipleDataFramesPacket(
|
| for (size_t i = 0; i < data_writes.size(); ++i) {
|
| bool is_fin = fin && (i == data_writes.size() - 1);
|
| stream_frames.push_back(base::MakeUnique<QuicStreamFrame>(
|
| - stream_id, is_fin, offset, base::StringPiece(data_writes[i])));
|
| + stream_id, is_fin, offset, QuicStringPiece(data_writes[i])));
|
| offset += data_writes[i].length();
|
| }
|
| for (const auto& stream_frame : stream_frames) {
|
| @@ -313,7 +313,7 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckAndDataPacket(
|
| QuicPacketNumber least_unacked,
|
| bool fin,
|
| QuicStreamOffset offset,
|
| - base::StringPiece data) {
|
| + QuicStringPiece data) {
|
| InitializeHeader(packet_number, include_version);
|
|
|
| QuicAckFrame ack(MakeAckFrame(largest_received));
|
| @@ -362,9 +362,8 @@ QuicTestPacketMaker::MakeRequestHeadersAndMultipleDataFramesPacket(
|
| QuicFrames frames;
|
| QuicStreamOffset header_offset =
|
| header_stream_offset == nullptr ? 0 : *header_stream_offset;
|
| - QuicStreamFrame frame(
|
| - kHeadersStreamId, false, header_offset,
|
| - base::StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStreamFrame frame(kHeadersStreamId, false, header_offset,
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| frames.push_back(QuicFrame(&frame));
|
| if (header_stream_offset != nullptr) {
|
| *header_stream_offset += spdy_frame.size();
|
| @@ -377,7 +376,7 @@ QuicTestPacketMaker::MakeRequestHeadersAndMultipleDataFramesPacket(
|
| for (size_t i = 0; i < data_writes.size(); ++i) {
|
| bool is_fin = fin && (i == data_writes.size() - 1);
|
| stream_frames.push_back(base::MakeUnique<QuicStreamFrame>(
|
| - stream_id, is_fin, offset, base::StringPiece(data_writes[i])));
|
| + stream_id, is_fin, offset, QuicStringPiece(data_writes[i])));
|
| offset += data_writes[i].length();
|
| }
|
| for (const auto& stream_frame : stream_frames) {
|
| @@ -427,13 +426,13 @@ QuicTestPacketMaker::MakeRequestHeadersPacket(QuicPacketNumber packet_number,
|
| if (offset != nullptr) {
|
| QuicStreamFrame frame(
|
| kHeadersStreamId, false, *offset,
|
| - base::StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| *offset += spdy_frame.size();
|
| return MakePacket(header_, QuicFrame(&frame));
|
| } else {
|
| QuicStreamFrame frame(
|
| kHeadersStreamId, false, 0,
|
| - base::StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
|
|
| return MakePacket(header_, QuicFrame(&frame));
|
| }
|
| @@ -478,13 +477,13 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakePushPromisePacket(
|
| if (offset != nullptr) {
|
| QuicStreamFrame frame(
|
| kHeadersStreamId, false, *offset,
|
| - base::StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| *offset += spdy_frame.size();
|
| return MakePacket(header_, QuicFrame(&frame));
|
| } else {
|
| QuicStreamFrame frame(
|
| kHeadersStreamId, false, 0,
|
| - base::StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| return MakePacket(header_, QuicFrame(&frame));
|
| }
|
| }
|
| @@ -495,14 +494,15 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeForceHolDataPacket(
|
| bool should_include_version,
|
| bool fin,
|
| QuicStreamOffset* offset,
|
| - base::StringPiece data) {
|
| + QuicStringPiece data) {
|
| SpdyDataIR spdy_data(stream_id, data);
|
| spdy_data.set_fin(fin);
|
| SpdySerializedFrame spdy_frame(
|
| spdy_request_framer_.SerializeFrame(spdy_data));
|
| InitializeHeader(packet_number, should_include_version);
|
| - QuicStreamFrame quic_frame(kHeadersStreamId, false, *offset,
|
| - StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStreamFrame quic_frame(
|
| + kHeadersStreamId, false, *offset,
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| *offset += spdy_frame.size();
|
| return MakePacket(header_, QuicFrame(&quic_frame));
|
| }
|
| @@ -530,13 +530,13 @@ QuicTestPacketMaker::MakeResponseHeadersPacket(
|
| if (offset != nullptr) {
|
| QuicStreamFrame frame(
|
| kHeadersStreamId, false, *offset,
|
| - base::StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| *offset += spdy_frame.size();
|
| return MakePacket(header_, QuicFrame(&frame));
|
| } else {
|
| QuicStreamFrame frame(
|
| kHeadersStreamId, false, 0,
|
| - base::StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| return MakePacket(header_, QuicFrame(&frame));
|
| }
|
| }
|
| @@ -644,12 +644,13 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeSettingsPacket(
|
| if (offset != nullptr) {
|
| QuicStreamFrame quic_frame(
|
| kHeadersStreamId, false, *offset,
|
| - StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| *offset += spdy_frame.size();
|
| return MakePacket(header_, QuicFrame(&quic_frame));
|
| }
|
| - QuicStreamFrame quic_frame(kHeadersStreamId, false, 0,
|
| - StringPiece(spdy_frame.data(), spdy_frame.size()));
|
| + QuicStreamFrame quic_frame(
|
| + kHeadersStreamId, false, 0,
|
| + QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
|
| return MakePacket(header_, QuicFrame(&quic_frame));
|
| }
|
|
|
|
|