Commit 4d3dfa37 authored by Mikel Astiz's avatar Mikel Astiz Committed by Commit Bot

Do not instantiate base::FieldTrialList explicitly in tests

The test suite already instantiates a FieldTrialList as per
https://chromium-review.googlesource.com/c/chromium/src/+/1883567 so
it's no longer necessary to do so explicitly in tests.

This patch addresses unit tests under:
/components/data_reduction_proxy

This CL was uploaded by git cl split.

Bug: 1018667
Change-Id: I9685de8a0463ad7645e27d21474511ed8a030e99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1916468Reviewed-by: default avatarTarun Bansal <tbansal@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Auto-Submit: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719343}
parent afc005c8
...@@ -213,7 +213,6 @@ class DataReductionProxyConfigTest : public testing::Test { ...@@ -213,7 +213,6 @@ class DataReductionProxyConfigTest : public testing::Test {
}; };
TEST_F(DataReductionProxyConfigTest, TestReloadConfigHoldback) { TEST_F(DataReductionProxyConfigTest, TestReloadConfigHoldback) {
base::FieldTrialList field_trial_list(nullptr);
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"DataCompressionProxyHoldback", "Enabled")); "DataCompressionProxyHoldback", "Enabled"));
...@@ -405,6 +404,9 @@ TEST_F(DataReductionProxyConfigTest, DISABLED_WarmupURL) { ...@@ -405,6 +404,9 @@ TEST_F(DataReductionProxyConfigTest, DISABLED_WarmupURL) {
ResetSettings(); ResetSettings();
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.Init();
variations::testing::ClearAllVariationParams(); variations::testing::ClearAllVariationParams();
std::map<std::string, std::string> variation_params; std::map<std::string, std::string> variation_params;
...@@ -413,7 +415,6 @@ TEST_F(DataReductionProxyConfigTest, DISABLED_WarmupURL) { ...@@ -413,7 +415,6 @@ TEST_F(DataReductionProxyConfigTest, DISABLED_WarmupURL) {
ASSERT_TRUE(variations::AssociateVariationParams( ASSERT_TRUE(variations::AssociateVariationParams(
params::GetQuicFieldTrialName(), "Enabled", variation_params)); params::GetQuicFieldTrialName(), "Enabled", variation_params));
base::FieldTrialList field_trial_list(nullptr);
base::FieldTrialList::CreateFieldTrial(params::GetQuicFieldTrialName(), base::FieldTrialList::CreateFieldTrial(params::GetQuicFieldTrialName(),
"Enabled"); "Enabled");
......
...@@ -130,7 +130,6 @@ TEST_F(DataReductionProxyServiceTest, TestResetBadProxyListOnDisableDataSaver) { ...@@ -130,7 +130,6 @@ TEST_F(DataReductionProxyServiceTest, TestResetBadProxyListOnDisableDataSaver) {
} }
TEST_F(DataReductionProxyServiceTest, HoldbackConfiguresProxies) { TEST_F(DataReductionProxyServiceTest, HoldbackConfiguresProxies) {
base::FieldTrialList field_trial_list(nullptr);
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"DataCompressionProxyHoldback", "Enabled")); "DataCompressionProxyHoldback", "Enabled"));
std::unique_ptr<DataReductionProxyTestContext> drp_test_context = std::unique_ptr<DataReductionProxyTestContext> drp_test_context =
......
...@@ -201,6 +201,9 @@ TEST_F(DataReductionProxyParamsTest, QuicFieldTrial) { ...@@ -201,6 +201,9 @@ TEST_F(DataReductionProxyParamsTest, QuicFieldTrial) {
ASSERT_FALSE(base::CommandLine::ForCurrentProcess()->HasSwitch( ASSERT_FALSE(base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableDataReductionProxyWarmupURLFetch)); switches::kDisableDataReductionProxyWarmupURLFetch));
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.Init();
variations::testing::ClearAllVariationParams(); variations::testing::ClearAllVariationParams();
std::map<std::string, std::string> variation_params; std::map<std::string, std::string> variation_params;
if (!test.enable_warmup_url) if (!test.enable_warmup_url)
...@@ -214,7 +217,6 @@ TEST_F(DataReductionProxyParamsTest, QuicFieldTrial) { ...@@ -214,7 +217,6 @@ TEST_F(DataReductionProxyParamsTest, QuicFieldTrial) {
params::GetQuicFieldTrialName(), test.trial_group_name, params::GetQuicFieldTrialName(), test.trial_group_name,
variation_params)); variation_params));
base::FieldTrialList field_trial_list(nullptr);
base::FieldTrialList::CreateFieldTrial(params::GetQuicFieldTrialName(), base::FieldTrialList::CreateFieldTrial(params::GetQuicFieldTrialName(),
test.trial_group_name); test.trial_group_name);
...@@ -275,6 +277,9 @@ TEST_F(DataReductionProxyParamsTest, QuicEnableNonCoreProxies) { ...@@ -275,6 +277,9 @@ TEST_F(DataReductionProxyParamsTest, QuicEnableNonCoreProxies) {
}; };
for (const auto& test : tests) { for (const auto& test : tests) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.Init();
variations::testing::ClearAllVariationParams(); variations::testing::ClearAllVariationParams();
std::map<std::string, std::string> variation_params; std::map<std::string, std::string> variation_params;
...@@ -282,7 +287,6 @@ TEST_F(DataReductionProxyParamsTest, QuicEnableNonCoreProxies) { ...@@ -282,7 +287,6 @@ TEST_F(DataReductionProxyParamsTest, QuicEnableNonCoreProxies) {
params::GetQuicFieldTrialName(), test.trial_group_name, params::GetQuicFieldTrialName(), test.trial_group_name,
variation_params)); variation_params));
base::FieldTrialList field_trial_list(nullptr);
base::FieldTrialList::CreateFieldTrial(params::GetQuicFieldTrialName(), base::FieldTrialList::CreateFieldTrial(params::GetQuicFieldTrialName(),
test.trial_group_name); test.trial_group_name);
...@@ -302,7 +306,8 @@ TEST_F(DataReductionProxyParamsTest, HoldbackEnabledFieldTrial) { ...@@ -302,7 +306,8 @@ TEST_F(DataReductionProxyParamsTest, HoldbackEnabledFieldTrial) {
}; };
for (const auto& test : tests) { for (const auto& test : tests) {
base::FieldTrialList field_trial_list(nullptr); base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.Init();
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"DataCompressionProxyHoldback", test.trial_group_name)); "DataCompressionProxyHoldback", test.trial_group_name));
...@@ -324,7 +329,8 @@ TEST_F(DataReductionProxyParamsTest, PromoFieldTrial) { ...@@ -324,7 +329,8 @@ TEST_F(DataReductionProxyParamsTest, PromoFieldTrial) {
}; };
for (const auto& test : tests) { for (const auto& test : tests) {
base::FieldTrialList field_trial_list(nullptr); base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.Init();
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"DataCompressionProxyPromoVisibility", test.trial_group_name)); "DataCompressionProxyPromoVisibility", test.trial_group_name));
...@@ -345,7 +351,8 @@ TEST_F(DataReductionProxyParamsTest, FREPromoFieldTrial) { ...@@ -345,7 +351,8 @@ TEST_F(DataReductionProxyParamsTest, FREPromoFieldTrial) {
}; };
for (const auto& test : tests) { for (const auto& test : tests) {
base::FieldTrialList field_trial_list(nullptr); base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.Init();
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
"DataReductionProxyFREPromo", test.trial_group_name)); "DataReductionProxyFREPromo", test.trial_group_name));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment