Land Recent QUIC changes

net/quic/quic_config.cc

Index: net/quic/quic_config.cc
diff --git a/net/quic/quic_config.cc b/net/quic/quic_config.cc
index 70e0b45097082cbb2f1f70f227d05be733f75f87..867cb6d2acf6763d03d974b7e4f61f917ad3e383 100644
--- a/net/quic/quic_config.cc
+++ b/net/quic/quic_config.cc
@@ -29,7 +29,7 @@ void QuicConfig::SetDefaults() {
 }
 
 bool QuicConfig::SetFromHandshakeMessage(const CryptoHandshakeMessage& scfg) {
-  const CryptoTag* cgst;
+  const QuicTag* cgst;
   size_t num_cgst;
   QuicErrorCode error;
 
@@ -73,7 +73,7 @@ QuicErrorCode QuicConfig::ProcessFinalPeerHandshake(
     string* error_details) const {
   DCHECK(error_details != NULL);
 
-  const CryptoTag* their_congestion_controls;
+  const QuicTag* their_congestion_controls;
   size_t num_their_congestion_controls;
   QuicErrorCode error;