Land Recent QUIC Changes.

Change the initial maximum packet size for a QUIC server to 1000 bytes
instead of 1350 bytes. Protected by FLAGS_quic_small_default_packet_size
which is enabled by default.

When the server receives the CHLO from the client, if the CHLO packet is
larger, the server will increase its max packet length to match.

Merge internal change: 86310847
https://codereview.chromium.org/916143004/

Adding DCHECKS in the crypto stream constructors to make sure is_server
is set correctly, and fixing up tests accordingly.

Merge internal change: 86300482
https://codereview.chromium.org/929033003/

Enable QUIC's pacing by default on all QUIC connections by setting
FLAGS_quic_enable_pacing to true by default.

Merge internal change: 86286914
https://codereview.chromium.org/933653003/

Fully qualify std::* names being exported internally by using
declarations in third_party/stl/*. These using declarations are a
historical artifact and they hinder portability and toolchain changes.

Merge internal change: 86267997
https://codereview.chromium.org/925423004/

Adding an option to the quic client to not respect GOAWAYS.

Didn't make this change in Chromium's QuicClientSession.

Merge internal change: 86198166
https://codereview.chromium.org/930983002/

Deprecating FLAGS_quic_ack_notifier_informed_on_serialized.

Merge internal change: 86177949
https://codereview.chromium.org/927173002/

Change QuicFramer so it accepts a QuicDataWriter rather than allocating
one.

Saves a full packet allocation by putting it on the stack.

Merge internal change: 86104715
https://codereview.chromium.org/921883003/

Deprecate FLAGS_quic_use_std_cbrt.

Merge internal change: 86087014
https://codereview.chromium.org/928163004/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/932723002

Cr-Commit-Position: refs/heads/master@{#316616}

1 files changed, 2 insertions, 4 deletions

diff --git a/net/quic/crypto/strike_register_test.cc b/net/quic/crypto/strike_register_test.cc
index df72357..73a6b2f 100644
--- a/net/quic/crypto/strike_register_test.cc
+++ b/net/quic/crypto/strike_register_test.cc
@@ -15,7 +15,6 @@ namespace {
 
 using net::InsertStatus;
 using net::StrikeRegister;
-using std::make_pair;
 using std::min;
 using std::pair;
 using std::set;
@@ -232,9 +231,8 @@ class SlowStrikeRegister {
       return net::NONCE_INVALID_TIME_FAILURE;
     }
 
-    pair<uint32, string> nonce = make_pair(
-        nonce_time,
-        string(reinterpret_cast<const char*>(nonce_bytes), 32));
+    pair<uint32, string> nonce = std::make_pair(
+        nonce_time, string(reinterpret_cast<const char*>(nonce_bytes), 32));
 
     set<pair<uint32, string> >::const_iterator it = nonces_.find(nonce);
     if (it != nonces_.end()) {