Land Recent QUIC Changes.

net/quic/quic_config_test.cc

Index: net/quic/quic_config_test.cc
diff --git a/net/quic/quic_config_test.cc b/net/quic/quic_config_test.cc
index 3cb2dd26d3afd8ee10a8b96d57e9ddc168b7c0e5..cc0401ff17580b1b3d73b19abb103a39ef8d74f5 100644
--- a/net/quic/quic_config_test.cc
+++ b/net/quic/quic_config_test.cc
@@ -109,7 +109,7 @@ TEST_F(QuicConfigTest, ProcessClientHello) {
       2 * kInitialSessionFlowControlWindowForTest);
   QuicTagVector copt;
   copt.push_back(kTBBR);
-  client_config.SetCongestionOptionsToSend(copt);
+  client_config.SetConnectionOptionsToSend(copt);
   CryptoHandshakeMessage msg;
   client_config.ToHandshakeMessage(&msg);
   string error_details;
@@ -126,9 +126,9 @@ TEST_F(QuicConfigTest, ProcessClientHello) {
   EXPECT_EQ(10 * base::Time::kMicrosecondsPerMillisecond,
             config_.ReceivedInitialRoundTripTimeUs());
   EXPECT_FALSE(config_.HasReceivedLossDetection());
-  EXPECT_TRUE(config_.HasReceivedCongestionOptions());
-  EXPECT_EQ(1u, config_.ReceivedCongestionOptions().size());
-  EXPECT_EQ(config_.ReceivedCongestionOptions()[0], kTBBR);
+  EXPECT_TRUE(config_.HasReceivedConnectionOptions());
+  EXPECT_EQ(1u, config_.ReceivedConnectionOptions().size());
+  EXPECT_EQ(config_.ReceivedConnectionOptions()[0], kTBBR);
   EXPECT_EQ(config_.ReceivedInitialFlowControlWindowBytes(),
             2 * kInitialSessionFlowControlWindowForTest);
   EXPECT_EQ(config_.ReceivedInitialStreamFlowControlWindowBytes(),