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

net/tools/quic/quic_server_session_base.cc

Index: net/tools/quic/quic_server_session_base.cc
diff --git a/net/tools/quic/quic_server_session_base.cc b/net/tools/quic/quic_server_session_base.cc
index 2d0831313e2a0b81dcda7c2d47e9bef76c35c9a1..63618d4150d90cea969859bb70839a41b70f2ec9 100644
--- a/net/tools/quic/quic_server_session_base.cc
+++ b/net/tools/quic/quic_server_session_base.cc
@@ -71,13 +71,6 @@ void QuicServerSessionBase::OnConfigNegotiated() {
       }
     }
   }
-
-  if (FLAGS_enable_quic_fec &&
-      ContainsQuicTag(config()->ReceivedConnectionOptions(), kFHDR)) {
-    // 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 QuicServerSessionBase::OnConnectionClosed(QuicErrorCode error,