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

net/quic/core/quic_crypto_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_crypto_stream.h"
 
 #include <string>
 
 #include "base/strings/string_piece.h"
 #include "net/quic/core/crypto/crypto_handshake.h"
@@ skipping 57 matching lines @@
                                  crypto_framer_.error_detail());
       return;
     }
     sequencer()->MarkConsumed(iov.iov_len);
   }
 }
 
 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);
 }
 
 bool QuicCryptoStream::ExportKeyingMaterial(StringPiece label,
                                             StringPiece context,
                                             size_t result_len,
                                             string* result) const {
   if (!handshake_confirmed()) {
@@ skipping 16 matching lines @@
       crypto_negotiated_params_.initial_subkey_secret, "EXPORTER-Token-Binding",
       /* context= */ "", 32, result);
 }
 
 const QuicCryptoNegotiatedParameters&
 QuicCryptoStream::crypto_negotiated_params() const {
   return crypto_negotiated_params_;
 }
 
 }  // namespace net