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

Unified Diff: net/quic/quic_stream_sequencer_test.cc

Issue 763833003: Remove using namespace in net/quic/quic_stream_sequencer.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
Index: net/quic/quic_stream_sequencer_test.cc
diff --git a/net/quic/quic_stream_sequencer_test.cc b/net/quic/quic_stream_sequencer_test.cc
index 43a105befd38cae4c9a378de35c0b947a02a95f8..39718f48ac6e31a6d758026eef74ea360e46169a 100644
--- a/net/quic/quic_stream_sequencer_test.cc
+++ b/net/quic/quic_stream_sequencer_test.cc
@@ -4,6 +4,7 @@
#include "net/quic/quic_stream_sequencer.h"
+#include <string>
#include <utility>
#include <vector>
@@ -41,7 +42,7 @@ class MockStream : public ReliableQuicStream {
MOCK_METHOD0(OnFinRead, void());
MOCK_METHOD2(ProcessRawData, uint32(const char* data, uint32 data_len));
MOCK_METHOD2(CloseConnectionWithDetails, void(QuicErrorCode error,
- const string& details));
+ const std::string& details));
MOCK_METHOD1(Reset, void(QuicRstStreamErrorCode error));
MOCK_METHOD0(OnCanWrite, void());
QuicPriority EffectivePriority() const override {
@@ -128,7 +129,7 @@ class QuicStreamSequencerTest : public ::testing::Test {
MockSession session_;
testing::StrictMock<MockStream> stream_;
scoped_ptr<QuicStreamSequencer> sequencer_;
- map<QuicStreamOffset, string>* buffered_frames_;
+ map<QuicStreamOffset, std::string>* buffered_frames_;
};
TEST_F(QuicStreamSequencerTest, RejectOldFrame) {
@@ -326,7 +327,7 @@ TEST_F(QuicStreamSequencerTest, MutipleOffsets) {
class QuicSequencerRandomTest : public QuicStreamSequencerTest {
public:
- typedef pair<int, string> Frame;
+ typedef pair<int, std::string> Frame;
typedef vector<Frame> FrameList;
void CreateFrames() {
@@ -335,7 +336,7 @@ class QuicSequencerRandomTest : public QuicStreamSequencerTest {
while (remaining_payload != 0) {
int size = min(OneToN(6), remaining_payload);
int index = payload_size - remaining_payload;
- list_.push_back(make_pair(index, string(kPayload + index, size)));
+ list_.push_back(make_pair(index, std::string(kPayload + index, size)));
remaining_payload -= size;
}
}
@@ -357,7 +358,7 @@ class QuicSequencerRandomTest : public QuicStreamSequencerTest {
return to_process;
}
- string output_;
+ std::string output_;
FrameList list_;
};
@@ -366,7 +367,7 @@ class QuicSequencerRandomTest : public QuicStreamSequencerTest {
TEST_F(QuicSequencerRandomTest, RandomFramesNoDroppingNoBackup) {
InSequence s;
for (size_t i = 0; i < list_.size(); ++i) {
- string* data = &list_[i].second;
+ std::string* data = &list_[i].second;
EXPECT_CALL(stream_, ProcessRawData(StrEq(*data), data->size()))
.WillOnce(Return(data->size()));
}
@@ -384,13 +385,13 @@ TEST_F(QuicStreamSequencerTest, FrameOverlapsBufferedData) {
// Ensure that FrameOverlapsBufferedData returns appropriate responses when
// there is existing data buffered.
- map<QuicStreamOffset, string>* buffered_frames =
+ map<QuicStreamOffset, std::string>* buffered_frames =
QuicStreamSequencerPeer::GetBufferedFrames(sequencer_.get());
const int kBufferedOffset = 10;
const int kBufferedDataLength = 3;
const int kNewDataLength = 3;
- IOVector data = MakeIOVector(string(kNewDataLength, '.'));
+ IOVector data = MakeIOVector(std::string(kNewDataLength, '.'));
// No overlap if no buffered frames.
EXPECT_TRUE(buffered_frames_->empty());
@@ -399,7 +400,7 @@ TEST_F(QuicStreamSequencerTest, FrameOverlapsBufferedData) {
// Add a buffered frame.
buffered_frames->insert(
- make_pair(kBufferedOffset, string(kBufferedDataLength, '.')));
+ make_pair(kBufferedOffset, std::string(kBufferedDataLength, '.')));
// New byte range partially overlaps with buffered frame, start offset
// preceeding buffered frame.

Powered by Google App Engine
This is Rietveld 408576698