| Index: net/tools/quic/quic_dispatcher_test.cc
|
| diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
|
| index 45cddb011fc75756792eb5a468cad264f1166d65..e2f0c0624bd678bb739395a24d564cb3efef358a 100644
|
| --- a/net/tools/quic/quic_dispatcher_test.cc
|
| +++ b/net/tools/quic/quic_dispatcher_test.cc
|
| @@ -120,10 +120,10 @@ class QuicDispatcherTest : public ::testing::Test {
|
| void ProcessPacket(IPEndPoint client_address,
|
| QuicConnectionId connection_id,
|
| bool has_version_flag,
|
| - const string& data) {
|
| + const std::string& data) {
|
| scoped_ptr<QuicEncryptedPacket> packet(ConstructEncryptedPacket(
|
| connection_id, has_version_flag, false, 1, data));
|
| - data_ = string(packet->data(), packet->length());
|
| + data_ = std::string(packet->data(), packet->length());
|
| dispatcher_.ProcessPacket(server_address_, client_address, *packet);
|
| }
|
|
|
| @@ -139,7 +139,7 @@ class QuicDispatcherTest : public ::testing::Test {
|
| TestDispatcher dispatcher_;
|
| MockSession* session1_;
|
| MockSession* session2_;
|
| - string data_;
|
| + std::string data_;
|
| };
|
|
|
| TEST_F(QuicDispatcherTest, ProcessPackets) {
|
| @@ -256,7 +256,7 @@ TEST_F(QuicDispatcherTest, StrayPacketToTimeWaitListManager) {
|
| EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, _)).Times(0);
|
| EXPECT_CALL(*time_wait_list_manager,
|
| ProcessPacket(_, _, connection_id, _, _)).Times(1);
|
| - string data = "foo";
|
| + std::string data = "foo";
|
| ProcessPacket(client_address, connection_id, false, "foo");
|
| }
|
|
|
|
|