commit bd7ad68ab12b14b22cad5054f792e8474232b8be
author fayang <fayang@google.com> Tue Jun 23 10:49:12 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 23 10:49:45 2020 -0700
tree 062f60a868142c9c557e13117109ab84f1b9c3d4
parent be38a7dbf716cfbdc836dee06f685d69f57cdd11

Fixes to make chromium merge happy. No functional change.

PiperOrigin-RevId: 317898035
Change-Id: I3027b0fb20f85843babaaff4a841ca7eee70bfac

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index f416ae6..e5ab141 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -11356,7 +11356,7 @@
     connection_.SetEncrypter(ENCRYPTION_FORWARD_SECURE,
                              std::make_unique<TaggingEncrypter>(0x02));
     connection_.SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
-    SendStreamDataToPeer(2, string(1286, 'a'), 0, NO_FIN, nullptr);
+    SendStreamDataToPeer(2, std::string(1286, 'a'), 0, NO_FIN, nullptr);
     connection_.SetDefaultEncryptionLevel(ENCRYPTION_HANDSHAKE);
     // Try to coalesce a HANDSHAKE packet after 1-RTT packet.
     if (GetQuicReloadableFlag(quic_fix_min_crypto_frame_size)) {