| Index: chrome/browser/io_thread_unittest.cc
|
| diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc
|
| index ea95288d2e2e2c4d2e7d11001bb33ef6671cd67d..b47018ea26afdb1fba4758a7c1877b1856a562d2 100644
|
| --- a/chrome/browser/io_thread_unittest.cc
|
| +++ b/chrome/browser/io_thread_unittest.cc
|
| @@ -253,7 +253,9 @@ class ConfigureParamsFromFieldTrialsAndCommandLineTest
|
| public:
|
| ConfigureParamsFromFieldTrialsAndCommandLineTest()
|
| : command_line_(base::CommandLine::NO_PROGRAM),
|
| - is_quic_allowed_by_policy_(true) {}
|
| + is_quic_allowed_by_policy_(true) {
|
| + params_.dynamic_shared_params = &dynamic_shared_params_;
|
| + }
|
|
|
| protected:
|
| void ConfigureParamsFromFieldTrialsAndCommandLine() {
|
| @@ -264,13 +266,14 @@ class ConfigureParamsFromFieldTrialsAndCommandLineTest
|
| base::CommandLine command_line_;
|
| bool is_quic_allowed_by_policy_;
|
| net::HttpNetworkSession::Params params_;
|
| + net::HttpNetworkSession::DynamicSharedParams dynamic_shared_params_;
|
| };
|
|
|
| TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest, Default) {
|
| ConfigureParamsFromFieldTrialsAndCommandLine();
|
|
|
| EXPECT_TRUE(params_.enable_http2);
|
| - EXPECT_FALSE(params_.enable_quic);
|
| + EXPECT_FALSE(params_.enable_quic());
|
| EXPECT_TRUE(params_.enable_quic_alternative_service_with_different_host);
|
| EXPECT_EQ(1350u, params_.quic_max_packet_length);
|
| EXPECT_EQ(net::QuicTagVector(), params_.quic_connection_options);
|
| @@ -312,7 +315,7 @@ TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
|
|
|
| ConfigureParamsFromFieldTrialsAndCommandLine();
|
|
|
| - EXPECT_FALSE(params_.enable_quic);
|
| + EXPECT_FALSE(params_.enable_quic());
|
| EXPECT_FALSE(params_.quic_always_require_handshake_confirmation);
|
| EXPECT_TRUE(params_.quic_delay_tcp_race);
|
| EXPECT_TRUE(params_.quic_host_whitelist.empty());
|
| @@ -324,7 +327,7 @@ TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
|
|
|
| ConfigureParamsFromFieldTrialsAndCommandLine();
|
|
|
| - EXPECT_TRUE(params_.enable_quic);
|
| + EXPECT_TRUE(params_.enable_quic());
|
| }
|
|
|
| TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
|
| @@ -333,7 +336,7 @@ TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
|
|
|
| ConfigureParamsFromFieldTrialsAndCommandLine();
|
|
|
| - EXPECT_FALSE(params_.enable_quic);
|
| + EXPECT_FALSE(params_.enable_quic());
|
| EXPECT_TRUE(params_.enable_quic_alternative_service_with_different_host);
|
| }
|
|
|
| @@ -344,7 +347,7 @@ TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
|
|
|
| ConfigureParamsFromFieldTrialsAndCommandLine();
|
|
|
| - EXPECT_TRUE(params_.enable_quic);
|
| + EXPECT_TRUE(params_.enable_quic());
|
| EXPECT_TRUE(params_.enable_quic_alternative_service_with_different_host);
|
| }
|
|
|
| @@ -427,7 +430,7 @@ TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest,
|
|
|
| ConfigureParamsFromFieldTrialsAndCommandLine();
|
|
|
| - EXPECT_FALSE(params_.enable_quic);
|
| + EXPECT_FALSE(params_.enable_quic());
|
| }
|
|
|
| TEST_F(ConfigureParamsFromFieldTrialsAndCommandLineTest, QuicMaxPacketLength) {
|
|
|