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

Unified Diff: net/quic/quic_session_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_session_test.cc
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index d953678f1041c05631d4110a2a0a25d7c612fa74..07d2be54c9dcabb657ea0e5cdd67d10e658c7ffe 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -5,6 +5,7 @@
#include "net/quic/quic_session.h"
#include <set>
+#include <string>
#include <vector>
#include "base/basictypes.h"
@@ -58,7 +59,7 @@ class TestCryptoStream : public QuicCryptoStream {
encryption_established_ = true;
handshake_confirmed_ = true;
CryptoHandshakeMessage msg;
- string error_details;
+ std::string error_details;
session()->config()->SetInitialFlowControlWindowToSend(
kInitialSessionFlowControlWindowForTest);
session()->config()->SetInitialStreamFlowControlWindowToSend(
@@ -97,7 +98,7 @@ class TestStream : public QuicDataStream {
return data_len;
}
- void SendBody(const string& data, bool fin) {
+ void SendBody(const std::string& data, bool fin) {
WriteOrBufferData(data, fin, nullptr);
}
@@ -636,7 +637,7 @@ TEST_P(QuicSessionTest, HandshakeUnblocksFlowControlBlockedStream) {
// Create a stream, and send enough data to make it flow control blocked.
TestStream* stream2 = session_.CreateOutgoingDataStream();
- string body(kDefaultFlowControlSendWindow, '.');
+ std::string body(kDefaultFlowControlSendWindow, '.');
EXPECT_FALSE(stream2->flow_controller()->IsBlocked());
EXPECT_FALSE(session_.IsConnectionFlowControlBlocked());
EXPECT_FALSE(session_.IsStreamFlowControlBlocked());
@@ -861,7 +862,7 @@ TEST_P(QuicSessionTest, ConnectionFlowControlAccountingFinAfterRst) {
// adjusting the connection level flow control receive window to take into
// account the total number of bytes sent by the peer.
const QuicStreamOffset kByteOffset = 5678;
- string body = "hello";
+ std::string body = "hello";
IOVector data = MakeIOVector(body);
QuicStreamFrame frame(stream->id(), true, kByteOffset, data);
vector<QuicStreamFrame> frames;

Powered by Google App Engine
This is Rietveld 408576698