| Index: net/quic/core/quic_stream_sequencer_test.cc
|
| diff --git a/net/quic/core/quic_stream_sequencer_test.cc b/net/quic/core/quic_stream_sequencer_test.cc
|
| index a7b64b5cbd3ca8cfc4cd8cb6337bee9161fc19f7..a75ca27b0a7c6a7b64e00d6fe1130aab5f7a8c69 100644
|
| --- a/net/quic/core/quic_stream_sequencer_test.cc
|
| +++ b/net/quic/core/quic_stream_sequencer_test.cc
|
| @@ -13,6 +13,7 @@
|
| #include "net/quic/core/quic_stream.h"
|
| #include "net/quic/core/quic_utils.h"
|
| #include "net/quic/platform/api/quic_logging.h"
|
| +#include "net/quic/platform/api/quic_string_piece.h"
|
| #include "net/quic/test_tools/mock_clock.h"
|
| #include "net/quic/test_tools/quic_stream_sequencer_peer.h"
|
| #include "net/quic/test_tools/quic_test_utils.h"
|
| @@ -21,7 +22,6 @@
|
| #include "testing/gmock_mutant.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -using base::StringPiece;
|
| using std::string;
|
| using testing::_;
|
| using testing::AnyNumber;
|
| @@ -112,7 +112,7 @@ class QuicStreamSequencerTest : public ::testing::Test {
|
| return true;
|
| }
|
|
|
| - bool VerifyIovec(const iovec& iovec, StringPiece expected) {
|
| + bool VerifyIovec(const iovec& iovec, QuicStringPiece expected) {
|
| if (iovec.iov_len != expected.length()) {
|
| QUIC_LOG(ERROR) << "Invalid length: " << iovec.iov_len << " vs "
|
| << expected.length();
|
| @@ -571,10 +571,12 @@ TEST_F(QuicStreamSequencerTest, DontAcceptOverlappingFrames) {
|
| // The peer should never send us non-identical stream frames which contain
|
| // overlapping byte ranges - if they do, we close the connection.
|
|
|
| - QuicStreamFrame frame1(kClientDataStreamId1, false, 1, StringPiece("hello"));
|
| + QuicStreamFrame frame1(kClientDataStreamId1, false, 1,
|
| + QuicStringPiece("hello"));
|
| sequencer_->OnStreamFrame(frame1);
|
|
|
| - QuicStreamFrame frame2(kClientDataStreamId1, false, 2, StringPiece("hello"));
|
| + QuicStreamFrame frame2(kClientDataStreamId1, false, 2,
|
| + QuicStringPiece("hello"));
|
| EXPECT_CALL(stream_,
|
| CloseConnectionWithDetails(QUIC_OVERLAPPING_STREAM_DATA, _))
|
| .Times(1);
|
| @@ -666,7 +668,7 @@ TEST_F(QuicStreamSequencerTest, OutOfOrderTimestamps) {
|
| TEST_F(QuicStreamSequencerTest, OnStreamFrameWithNullSource) {
|
| // Pass in a frame with data pointing to null address, expect to close
|
| // connection with error.
|
| - StringPiece source;
|
| + QuicStringPiece source;
|
| source.set(nullptr, 5u);
|
| QuicStreamFrame frame(kClientDataStreamId1, false, 1, source);
|
| EXPECT_CALL(stream_, CloseConnectionWithDetails(
|
|
|