Land Recent QUIC changes.

net/quic/quic_crypto_stream.cc

Index: net/quic/quic_crypto_stream.cc
diff --git a/net/quic/quic_crypto_stream.cc b/net/quic/quic_crypto_stream.cc
index 569648f1baa6fb1309504f22cf767bb307c0d5b0..3c10c5bfbf9fdb471ee592d16632093879913112 100644
--- a/net/quic/quic_crypto_stream.cc
+++ b/net/quic/quic_crypto_stream.cc
@@ -59,8 +59,12 @@ void QuicCryptoStream::SendHandshakeMessage(
     const CryptoHandshakeMessage& message) {
   session()->OnCryptoHandshakeMessageSent(message);
   const QuicData& data = message.GetSerialized();
+  // To make reasoning about crypto frames easier, we don't combine them with
+  // any other frames in a single packet.
+  session()->connection()->Flush();
   // TODO(wtc): check the return value.
   WriteData(string(data.data(), data.length()), false);
+  session()->connection()->Flush();
 }
 
 const QuicCryptoNegotiatedParameters&