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 8f46917450e31e70bc055e00dec3caa096c609f5..5c8657272b7aba2160b8d95a23b482ffb238e2a8 100644
--- a/net/quic/quic_config.h
+++ b/net/quic/quic_config.h
@@ -263,11 +263,11 @@ class NET_EXPORT_PRIVATE QuicConfig {
 
   QuicTag congestion_feedback() const;
 
-  void SetCongestionOptionsToSend(const QuicTagVector& congestion_options);
+  void SetConnectionOptionsToSend(const QuicTagVector& connection_options);
 
-  bool HasReceivedCongestionOptions() const;
+  bool HasReceivedConnectionOptions() const;
 
-  QuicTagVector ReceivedCongestionOptions() const;
+  QuicTagVector ReceivedConnectionOptions() const;
 
   void SetLossDetectionToSend(QuicTag loss_detection);
 
@@ -360,7 +360,7 @@ class NET_EXPORT_PRIVATE QuicConfig {
   // Congestion control feedback type.
   QuicNegotiableTag congestion_feedback_;
   // Congestion control option.
-  QuicFixedTagVector congestion_options_;
+  QuicFixedTagVector connection_options_;
   // Loss detection feedback type.
   QuicFixedTag loss_detection_;
   // Idle connection state lifetime