Landing recent QUIC changes until 7:19 PM, Feb 26, 2016 UTC-5.

net/quic/quic_client_session_base.cc

Index: net/quic/quic_client_session_base.cc
diff --git a/net/quic/quic_client_session_base.cc b/net/quic/quic_client_session_base.cc
index 32b3093dab0dce0bffde4b236acf9f26d342ff3b..7e45d006023dd44cc1fb8afef59804c7de7a448b 100644
--- a/net/quic/quic_client_session_base.cc
+++ b/net/quic/quic_client_session_base.cc
@@ -28,16 +28,6 @@ QuicClientSessionBase::~QuicClientSessionBase() {
 
 void QuicClientSessionBase::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
   QuicSession::OnCryptoHandshakeEvent(event);
-  // Set FEC policy for streams immediately after sending CHLO and before any
-  // more data is sent.
-  if (!FLAGS_enable_quic_fec || event != ENCRYPTION_FIRST_ESTABLISHED ||
-      !config()->HasSendConnectionOptions() ||
-      !ContainsQuicTag(config()->SendConnectionOptions(), kFHDR)) {
-    return;
-  }
-  // kFHDR config maps to FEC protection always for headers stream.
-  // TODO(jri): Add crypto stream in addition to headers for kHDR.
-  headers_stream()->set_fec_policy(FEC_PROTECT_ALWAYS);
 }
 
 void QuicClientSessionBase::OnPromiseHeaders(QuicStreamId stream_id,