Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_config.cc

Index: net/quic/core/quic_config.cc
diff --git a/net/quic/core/quic_config.cc b/net/quic/core/quic_config.cc
index 1764b2dc26abe55494a35494d858952f78206dbb..3697a97d77cfdfc5860406aebd5aba6a240eed7c 100644
--- a/net/quic/core/quic_config.cc
+++ b/net/quic/core/quic_config.cc
@@ -694,6 +694,7 @@ void QuicConfig::ToHandshakeMessage(CryptoHandshakeMessage* out) const {
   connection_migration_disabled_.ToHandshakeMessage(out);
   connection_options_.ToHandshakeMessage(out);
   alternate_server_address_.ToHandshakeMessage(out);
+  force_hol_blocking_.ToHandshakeMessage(out);
 }
 
 QuicErrorCode QuicConfig::ProcessPeerHello(
@@ -751,6 +752,10 @@ QuicErrorCode QuicConfig::ProcessPeerHello(
     error = alternate_server_address_.ProcessPeerHello(peer_hello, hello_type,
                                                        error_details);
   }
+  if (error == QUIC_NO_ERROR) {
+    error = force_hol_blocking_.ProcessPeerHello(peer_hello, hello_type,
+                                                 error_details);
+  }
   return error;
 }