Land Recent QUIC Changes.

net/tools/quic/quic_server_session.cc

Index: net/tools/quic/quic_server_session.cc
diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc
index d7bc3b84e703302bc9d036887bac9c238d23f660..01371bf2ba26f41e9687cc52a88f67f08a135717 100644
--- a/net/tools/quic/quic_server_session.cc
+++ b/net/tools/quic/quic_server_session.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "net/quic/quic_connection.h"
+#include "net/quic/quic_flags.h"
 #include "net/quic/reliable_quic_stream.h"
 #include "net/tools/quic/quic_spdy_server_stream.h"
 
@@ -30,6 +31,18 @@ QuicCryptoServerStream* QuicServerSession::CreateQuicCryptoServerStream(
   return new QuicCryptoServerStream(crypto_config, this);
 }
 
+void QuicServerSession::OnConfigNegotiated() {
+  QuicSession::OnConfigNegotiated();
+  if (!FLAGS_enable_quic_fec ||
+      !config()->HasReceivedConnectionOptions() ||
+      !net::ContainsQuicTag(config()->ReceivedConnectionOptions(), 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 QuicServerSession::OnConnectionClosed(QuicErrorCode error,
                                            bool from_peer) {
   QuicSession::OnConnectionClosed(error, from_peer);