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..ce89da5bd31911ba2a83dd6f2f71d976b929d8c7 100644 |
--- a/chrome/browser/io_thread_unittest.cc |
+++ b/chrome/browser/io_thread_unittest.cc |
@@ -176,17 +176,46 @@ 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, |
+ }, |
+ { |
+ "Enabled", true, |
+ }, |
+ { |
+ "EnabledControl", true, |
+ }, |
+ { |
+ "NotEnabled", false, |
+ }, |
+ { |
+ "Control", false, |
+ }, |
+ { |
+ "Disabled", 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; |
Ryan Hamilton
2015/09/21 17:50:47
It doesn't seem like you need to test this here, d
tbansal1
2015/09/21 17:53:15
Removed.
|
+ 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) { |