Landing Recent QUIC changes until 5:55 PM, Aug 25, 2016 UTC-4

net/quic/core/quic_crypto_stream.cc

Index: net/quic/core/quic_crypto_stream.cc
diff --git a/net/quic/core/quic_crypto_stream.cc b/net/quic/core/quic_crypto_stream.cc
index 879834d3c15be0ef4f83d60f75f05afc3fef2eaf..ed8e20cc2ec17fb1ba7ed62c0b5fdf572b3ff84a 100644
--- a/net/quic/core/quic_crypto_stream.cc
+++ b/net/quic/core/quic_crypto_stream.cc
@@ -75,9 +75,7 @@ void QuicCryptoStream::OnDataAvailable() {
 void QuicCryptoStream::SendHandshakeMessage(
     const CryptoHandshakeMessage& message) {
   DVLOG(1) << ENDPOINT << "Sending " << message.DebugString();
-  if (FLAGS_quic_neuter_unencrypted_when_sending) {
-    session()->connection()->NeuterUnencryptedPackets();
-  }
+  session()->connection()->NeuterUnencryptedPackets();
   session()->OnCryptoHandshakeMessageSent(message);
   const QuicData& data = message.GetSerialized();
   WriteOrBufferData(StringPiece(data.data(), data.length()), false, nullptr);