Land Recent QUIC changes

net/quic/quic_config.h

Index: net/quic/quic_config.h
diff --git a/net/quic/quic_config.h b/net/quic/quic_config.h
index 17441d724d13161b9fe80ba613669a602c30e88e..013a4f2ca39c97167031c96b3d67653bb92c9b46 100644
--- a/net/quic/quic_config.h
+++ b/net/quic/quic_config.h
@@ -19,7 +19,7 @@ class NET_EXPORT_PRIVATE QuicNegotiatedParameters {
  public:
   QuicNegotiatedParameters();
 
-  CryptoTag congestion_control;
+  QuicTag congestion_control;
   QuicTime::Delta idle_connection_state_lifetime;
   QuicTime::Delta keepalive_timeout;
 };
@@ -31,6 +31,11 @@ class NET_EXPORT_PRIVATE QuicConfig {
   QuicConfig();
   ~QuicConfig();
 
+  void set_idle_connection_state_lifetime(
+      QuicTime::Delta idle_connection_state_lifetime) {
+    idle_connection_state_lifetime_ = idle_connection_state_lifetime;
+  }
+
   // SetDefaults sets the members to sensible, default values.
   void SetDefaults();
 
@@ -54,7 +59,7 @@ class NET_EXPORT_PRIVATE QuicConfig {
 
  private:
   // Congestion control feedback type.
-  CryptoTagVector congestion_control_;
+  QuicTagVector congestion_control_;
   // Idle connection state lifetime
   QuicTime::Delta idle_connection_state_lifetime_;
   // Keepalive timeout, or 0 to turn off keepalive probes