| Index: net/quic/quic_config_test.cc
|
| diff --git a/net/quic/quic_config_test.cc b/net/quic/quic_config_test.cc
|
| index 66a47d60deb6f3b137b8e7ded5ce15151c6455ff..2263e44e67cfbf2752cc7c7f2dcedd881a34e5b9 100644
|
| --- a/net/quic/quic_config_test.cc
|
| +++ b/net/quic/quic_config_test.cc
|
| @@ -37,9 +37,9 @@ TEST_F(QuicConfigTest, ToHandshakeMessage) {
|
| kInitialStreamFlowControlWindowForTest);
|
| config_.SetInitialSessionFlowControlWindowToSend(
|
| kInitialSessionFlowControlWindowForTest);
|
| - config_.set_idle_connection_state_lifetime(QuicTime::Delta::FromSeconds(5),
|
| - QuicTime::Delta::FromSeconds(2));
|
| - config_.set_max_streams_per_connection(4, 2);
|
| + config_.SetIdleConnectionStateLifetime(QuicTime::Delta::FromSeconds(5),
|
| + QuicTime::Delta::FromSeconds(2));
|
| + config_.SetMaxStreamsPerConnection(4, 2);
|
| config_.SetSocketReceiveBufferToSend(kDefaultSocketReceiveBuffer);
|
| CryptoHandshakeMessage msg;
|
| config_.ToHandshakeMessage(&msg);
|
| @@ -80,11 +80,11 @@ TEST_F(QuicConfigTest, ProcessClientHello) {
|
| QuicConfig client_config;
|
| QuicTagVector cgst;
|
| cgst.push_back(kQBIC);
|
| - client_config.set_congestion_feedback(cgst, kQBIC);
|
| - client_config.set_idle_connection_state_lifetime(
|
| + client_config.SetCongestionFeedback(cgst, kQBIC);
|
| + client_config.SetIdleConnectionStateLifetime(
|
| QuicTime::Delta::FromSeconds(2 * kMaximumIdleTimeoutSecs),
|
| QuicTime::Delta::FromSeconds(kMaximumIdleTimeoutSecs));
|
| - client_config.set_max_streams_per_connection(
|
| + client_config.SetMaxStreamsPerConnection(
|
| 2 * kDefaultMaxStreamsPerConnection, kDefaultMaxStreamsPerConnection);
|
| client_config.SetInitialRoundTripTimeUsToSend(
|
| 10 * base::Time::kMicrosecondsPerMillisecond);
|
| @@ -106,12 +106,12 @@ TEST_F(QuicConfigTest, ProcessClientHello) {
|
| config_.ProcessPeerHello(msg, CLIENT, &error_details);
|
| EXPECT_EQ(QUIC_NO_ERROR, error);
|
| EXPECT_TRUE(config_.negotiated());
|
| - EXPECT_EQ(kQBIC, config_.congestion_feedback());
|
| + EXPECT_EQ(kQBIC, config_.CongestionFeedback());
|
| EXPECT_EQ(QuicTime::Delta::FromSeconds(kMaximumIdleTimeoutSecs),
|
| - config_.idle_connection_state_lifetime());
|
| + config_.IdleConnectionStateLifetime());
|
| EXPECT_EQ(kDefaultMaxStreamsPerConnection,
|
| - config_.max_streams_per_connection());
|
| - EXPECT_EQ(QuicTime::Delta::FromSeconds(0), config_.keepalive_timeout());
|
| + config_.MaxStreamsPerConnection());
|
| + EXPECT_EQ(QuicTime::Delta::FromSeconds(0), config_.KeepaliveTimeout());
|
| EXPECT_EQ(10 * base::Time::kMicrosecondsPerMillisecond,
|
| config_.ReceivedInitialRoundTripTimeUs());
|
| EXPECT_TRUE(config_.HasReceivedConnectionOptions());
|
| @@ -132,11 +132,11 @@ TEST_F(QuicConfigTest, ProcessServerHello) {
|
| QuicConfig server_config;
|
| QuicTagVector cgst;
|
| cgst.push_back(kQBIC);
|
| - server_config.set_congestion_feedback(cgst, kQBIC);
|
| - server_config.set_idle_connection_state_lifetime(
|
| + server_config.SetCongestionFeedback(cgst, kQBIC);
|
| + server_config.SetIdleConnectionStateLifetime(
|
| QuicTime::Delta::FromSeconds(kMaximumIdleTimeoutSecs / 2),
|
| QuicTime::Delta::FromSeconds(kMaximumIdleTimeoutSecs / 2));
|
| - server_config.set_max_streams_per_connection(
|
| + server_config.SetMaxStreamsPerConnection(
|
| kDefaultMaxStreamsPerConnection / 2,
|
| kDefaultMaxStreamsPerConnection / 2);
|
| server_config.SetInitialCongestionWindowToSend(kDefaultInitialWindow / 2);
|
| @@ -156,14 +156,14 @@ TEST_F(QuicConfigTest, ProcessServerHello) {
|
| config_.ProcessPeerHello(msg, SERVER, &error_details);
|
| EXPECT_EQ(QUIC_NO_ERROR, error);
|
| EXPECT_TRUE(config_.negotiated());
|
| - EXPECT_EQ(kQBIC, config_.congestion_feedback());
|
| + EXPECT_EQ(kQBIC, config_.CongestionFeedback());
|
| EXPECT_EQ(QuicTime::Delta::FromSeconds(kMaximumIdleTimeoutSecs / 2),
|
| - config_.idle_connection_state_lifetime());
|
| + config_.IdleConnectionStateLifetime());
|
| EXPECT_EQ(kDefaultMaxStreamsPerConnection / 2,
|
| - config_.max_streams_per_connection());
|
| + config_.MaxStreamsPerConnection());
|
| EXPECT_EQ(kDefaultInitialWindow / 2,
|
| config_.ReceivedInitialCongestionWindow());
|
| - EXPECT_EQ(QuicTime::Delta::FromSeconds(0), config_.keepalive_timeout());
|
| + EXPECT_EQ(QuicTime::Delta::FromSeconds(0), config_.KeepaliveTimeout());
|
| EXPECT_EQ(10 * base::Time::kMicrosecondsPerMillisecond,
|
| config_.ReceivedInitialRoundTripTimeUs());
|
| EXPECT_EQ(config_.ReceivedInitialFlowControlWindowBytes(),
|
| @@ -236,7 +236,7 @@ TEST_F(QuicConfigTest, MissingValueInSHLO) {
|
|
|
| TEST_F(QuicConfigTest, OutOfBoundSHLO) {
|
| QuicConfig server_config;
|
| - server_config.set_idle_connection_state_lifetime(
|
| + server_config.SetIdleConnectionStateLifetime(
|
| QuicTime::Delta::FromSeconds(2 * kMaximumIdleTimeoutSecs),
|
| QuicTime::Delta::FromSeconds(2 * kMaximumIdleTimeoutSecs));
|
|
|
| @@ -253,7 +253,7 @@ TEST_F(QuicConfigTest, MultipleNegotiatedValuesInVectorTag) {
|
| QuicTagVector cgst;
|
| cgst.push_back(kQBIC);
|
| cgst.push_back(kTBBR);
|
| - server_config.set_congestion_feedback(cgst, kQBIC);
|
| + server_config.SetCongestionFeedback(cgst, kQBIC);
|
|
|
| CryptoHandshakeMessage msg;
|
| server_config.ToHandshakeMessage(&msg);
|
| @@ -268,7 +268,7 @@ TEST_F(QuicConfigTest, NoOverLapInCGST) {
|
| server_config.SetDefaults();
|
| QuicTagVector cgst;
|
| cgst.push_back(kTBBR);
|
| - server_config.set_congestion_feedback(cgst, kTBBR);
|
| + server_config.SetCongestionFeedback(cgst, kTBBR);
|
|
|
| CryptoHandshakeMessage msg;
|
| string error_details;
|
|
|