Chromium Code Reviews| Index: chrome/browser/io_thread_unittest.cc |
| diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc |
| index bc730062a40578a411999d6b5e370f6c40fde5bc..6685954ea887a7022c652a9b0f931d8225520f2f 100644 |
| --- a/chrome/browser/io_thread_unittest.cc |
| +++ b/chrome/browser/io_thread_unittest.cc |
| @@ -176,17 +176,40 @@ TEST_F(IOThreadTest, EnableQuicFromFieldTrialGroup) { |
| } |
| TEST_F(IOThreadTest, EnableQuicFromQuicProxyFieldTrialGroup) { |
| - base::FieldTrialList field_trial_list(new base::MockEntropyProvider()); |
| - base::FieldTrialList::CreateFieldTrial( |
| - data_reduction_proxy::params::GetQuicFieldTrialName(), "Enabled"); |
| - |
| - ConfigureQuicGlobals(); |
| - net::HttpNetworkSession::Params params; |
| - InitializeNetworkSessionParams(¶ms); |
| - EXPECT_FALSE(params.enable_quic); |
| - EXPECT_TRUE(params.enable_quic_for_proxies); |
| - EXPECT_TRUE(IOThread::ShouldEnableQuicForDataReductionProxy()); |
| - EXPECT_EQ(1024 * 1024, params.quic_socket_receive_buffer_size); |
| + const struct { |
| + std::string field_trial_group_name; |
| + bool expect_enable_quic; |
| + } tests[] = { |
| + { |
| + std::string(), false, |
|
sclittle
2015/09/19 00:45:21
nit: Could these be done in 1 line each, e.g.
{st
tbansal1
2015/09/21 16:55:52
git cl format does not like it, and changes it bac
|
| + }, |
| + { |
| + "Enabled", true, |
| + }, |
| + { |
| + "EnabledControl", true, |
| + }, |
| + { |
| + "NotEnabled", false, |
| + }, |
| + }; |
| + |
| + for (size_t i = 0; i < arraysize(tests); ++i) { |
| + base::FieldTrialList field_trial_list(new base::MockEntropyProvider()); |
| + base::FieldTrialList::CreateFieldTrial( |
| + data_reduction_proxy::params::GetQuicFieldTrialName(), |
| + tests[i].field_trial_group_name); |
| + |
| + ConfigureQuicGlobals(); |
| + net::HttpNetworkSession::Params params; |
| + InitializeNetworkSessionParams(¶ms); |
| + EXPECT_EQ(1024 * 1024, params.quic_socket_receive_buffer_size) << i; |
| + EXPECT_FALSE(params.enable_quic) << i; |
| + EXPECT_EQ(tests[i].expect_enable_quic, params.enable_quic_for_proxies) << i; |
| + EXPECT_EQ(tests[i].expect_enable_quic, |
| + IOThread::ShouldEnableQuicForDataReductionProxy()) |
| + << i; |
| + } |
| } |
| TEST_F(IOThreadTest, EnableQuicFromCommandLine) { |