Index: chrome/browser/io_thread_unittest.cc |
diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc |
index 80a589d7fec4914a372114463365c06240088286..672a451b0bd4e7a430608cea478d6ce199dae959 100644 |
--- a/chrome/browser/io_thread_unittest.cc |
+++ b/chrome/browser/io_thread_unittest.cc |
@@ -135,6 +135,7 @@ TEST_F(IOThreadTest, EnableQuicFromFieldTrialGroup) { |
EXPECT_EQ(0, params.quic_load_server_info_timeout_ms); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
EXPECT_EQ(0.0f, params.quic_load_server_info_timeout_srtt_multiplier); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, EnableQuicFromCommandLine) { |
@@ -145,6 +146,7 @@ TEST_F(IOThreadTest, EnableQuicFromCommandLine) { |
InitializeNetworkSessionParams(¶ms); |
EXPECT_TRUE(params.enable_quic); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, EnablePacingFromCommandLine) { |
@@ -158,6 +160,7 @@ TEST_F(IOThreadTest, EnablePacingFromCommandLine) { |
options.push_back(net::kPACE); |
EXPECT_EQ(options, params.quic_connection_options); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, EnablePacingFromFieldTrialParams) { |
@@ -171,6 +174,7 @@ TEST_F(IOThreadTest, EnablePacingFromFieldTrialParams) { |
options.push_back(net::kPACE); |
EXPECT_EQ(options, params.quic_connection_options); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, PacketLengthFromCommandLine) { |
@@ -182,6 +186,7 @@ TEST_F(IOThreadTest, PacketLengthFromCommandLine) { |
InitializeNetworkSessionParams(¶ms); |
EXPECT_EQ(1450u, params.quic_max_packet_length); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, PacketLengthFromFieldTrialParams) { |
@@ -193,6 +198,7 @@ TEST_F(IOThreadTest, PacketLengthFromFieldTrialParams) { |
InitializeNetworkSessionParams(¶ms); |
EXPECT_EQ(1450u, params.quic_max_packet_length); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicVersionFromCommandLine) { |
@@ -208,6 +214,7 @@ TEST_F(IOThreadTest, QuicVersionFromCommandLine) { |
supported_versions.push_back(net::QuicSupportedVersions().back()); |
EXPECT_EQ(supported_versions, params.quic_supported_versions); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicVersionFromFieldTrialParams) { |
@@ -222,6 +229,7 @@ TEST_F(IOThreadTest, QuicVersionFromFieldTrialParams) { |
supported_versions.push_back(net::QuicSupportedVersions().back()); |
EXPECT_EQ(supported_versions, params.quic_supported_versions); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicConnectionOptionsFromCommandLine) { |
@@ -240,6 +248,7 @@ TEST_F(IOThreadTest, QuicConnectionOptionsFromCommandLine) { |
options.push_back(net::kREJ); |
EXPECT_EQ(options, params.quic_connection_options); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicConnectionOptionsFromFieldTrialParams) { |
@@ -257,6 +266,7 @@ TEST_F(IOThreadTest, QuicConnectionOptionsFromFieldTrialParams) { |
options.push_back(net::kREJ); |
EXPECT_EQ(options, params.quic_connection_options); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicConnectionOptionsFromDeprecatedFieldTrialParams) { |
@@ -274,6 +284,7 @@ TEST_F(IOThreadTest, QuicConnectionOptionsFromDeprecatedFieldTrialParams) { |
options.push_back(net::kREJ); |
EXPECT_EQ(options, params.quic_connection_options); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, |
@@ -285,6 +296,7 @@ TEST_F(IOThreadTest, |
InitializeNetworkSessionParams(¶ms); |
EXPECT_TRUE(params.quic_always_require_handshake_confirmation); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, |
@@ -296,6 +308,7 @@ TEST_F(IOThreadTest, |
InitializeNetworkSessionParams(¶ms); |
EXPECT_TRUE(params.quic_disable_connection_pooling); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicLoadServerInfoTimeoutFromFieldTrialParams) { |
@@ -306,6 +319,7 @@ TEST_F(IOThreadTest, QuicLoadServerInfoTimeoutFromFieldTrialParams) { |
InitializeNetworkSessionParams(¶ms); |
EXPECT_EQ(50, params.quic_load_server_info_timeout_ms); |
EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicDisableLoadingServerInfoForNewServers) { |
@@ -315,6 +329,7 @@ TEST_F(IOThreadTest, QuicDisableLoadingServerInfoForNewServers) { |
net::HttpNetworkSession::Params params; |
InitializeNetworkSessionParams(¶ms); |
EXPECT_TRUE(params.quic_disable_loading_server_info_for_new_servers); |
+ EXPECT_FALSE(params.quic_disable_truncated_connection_ids); |
} |
TEST_F(IOThreadTest, QuicLoadServerInfoTimeToSmoothedRttFromFieldTrialParams) { |
@@ -326,6 +341,15 @@ TEST_F(IOThreadTest, QuicLoadServerInfoTimeToSmoothedRttFromFieldTrialParams) { |
EXPECT_EQ(0.5f, params.quic_load_server_info_timeout_srtt_multiplier); |
} |
+TEST_F(IOThreadTest, QuicDisableTruncatedConnectionIds) { |
+ field_trial_group_ = "Enabled"; |
+ field_trial_params_["disable_truncated_connection_ids"] = "true"; |
+ ConfigureQuicGlobals(); |
+ net::HttpNetworkSession::Params params; |
+ InitializeNetworkSessionParams(¶ms); |
+ EXPECT_TRUE(params.quic_disable_truncated_connection_ids); |
+} |
+ |
TEST_F(IOThreadTest, |
AlternateProtocolProbabilityThresholdFromFlag) { |
command_line_.AppendSwitchASCII("alternate-protocol-probability-threshold", |