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

Unified Diff: net/quic/quic_connection_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_connection_test.cc
diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
index ede61c8a98dc8aaec975c0470b680bef2bad7826..61df528605aa386b3c375c4fa53f96305fc4f365 100644
--- a/net/quic/quic_connection_test.cc
+++ b/net/quic/quic_connection_test.cc
@@ -4,6 +4,8 @@
#include "net/quic/quic_connection.h"
+#include <string>
+
#include "base/basictypes.h"
#include "base/bind.h"
#include "base/stl_util.h"
@@ -1657,7 +1659,7 @@ TEST_P(QuicConnectionTest, FECSending) {
EXPECT_CALL(*send_algorithm_,
OnPacketSent(_, _, _, _, HAS_RETRANSMITTABLE_DATA)).Times(5);
// The first stream frame will have 2 fewer overhead bytes than the other 3.
- const string payload(payload_length * 4 + 2, 'a');
+ const std::string payload(payload_length * 4 + 2, 'a');
connection_.SendStreamDataWithStringWithFec(1, payload, 0, !kFin, nullptr);
// Expect the FEC group to be closed after SendStreamDataWithString.
EXPECT_FALSE(creator->IsFecGroupOpen());
@@ -1678,7 +1680,7 @@ TEST_P(QuicConnectionTest, FECQueueing) {
EXPECT_EQ(0u, connection_.NumQueuedPackets());
BlockOnNextWrite();
- const string payload(payload_length, 'a');
+ const std::string payload(payload_length, 'a');
connection_.SendStreamDataWithStringWithFec(1, payload, 0, !kFin, nullptr);
EXPECT_FALSE(creator->IsFecGroupOpen());
EXPECT_FALSE(creator->IsFecProtected());
@@ -1927,7 +1929,7 @@ TEST_P(QuicConnectionTest, FramePackingSendv) {
EXPECT_EQ(1u, writer_->stream_frames().size());
QuicStreamFrame frame = writer_->stream_frames()[0];
EXPECT_EQ(1u, frame.stream_id);
- EXPECT_EQ("ABCD", string(static_cast<char*>
+ EXPECT_EQ("ABCD", std::string(static_cast<char*>
(frame.data.iovec()[0].iov_base),
(frame.data.iovec()[0].iov_len)));
}
@@ -3053,7 +3055,7 @@ TEST_P(QuicConnectionTest, TestQueueLimitsOnSendStreamData) {
EXPECT_CALL(*send_algorithm_,
TimeUntilSend(_, _, _)).WillOnce(
testing::Return(QuicTime::Delta::FromMicroseconds(10)));
- const string payload(payload_length, 'a');
+ const std::string payload(payload_length, 'a');
EXPECT_EQ(0u, connection_.SendStreamDataWithString(3, payload, 0, !kFin,
nullptr).bytes_consumed);
EXPECT_EQ(0u, connection_.NumQueuedPackets());
@@ -3077,7 +3079,7 @@ TEST_P(QuicConnectionTest, LoopThroughSendingPackets) {
// Queue the first packet.
EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(7);
// The first stream frame will have 2 fewer overhead bytes than the other six.
- const string payload(payload_length * 7 + 2, 'a');
+ const std::string payload(payload_length * 7 + 2, 'a');
EXPECT_EQ(payload.size(),
connection_.SendStreamDataWithString(1, payload, 0, !kFin, nullptr)
.bytes_consumed);
@@ -3088,7 +3090,7 @@ TEST_P(QuicConnectionTest, LoopThroughSendingPacketsWithTruncation) {
true);
// Set up a larger payload than will fit in one packet.
- const string payload(connection_.max_packet_length(), 'a');
+ const std::string payload(connection_.max_packet_length(), 'a');
EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _, _)).Times(AnyNumber());
// Now send some packets with no truncation.

Powered by Google App Engine
This is Rietveld 408576698