Commit 98dc7a60 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/feature_engagement

This CL was uploaded by git cl split.

R=dtrainor@chromium.org

Bug: 1018667
Change-Id: Ic7b64d20d6fd796de890a3a069af4385df8bb28c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1917523
Auto-Submit: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715945}
parent dc839f9b
...@@ -45,7 +45,7 @@ SessionRateImpact CreateSessionRateImpactExplicit( ...@@ -45,7 +45,7 @@ SessionRateImpact CreateSessionRateImpactExplicit(
class ChromeVariationsConfigurationTest : public ::testing::Test { class ChromeVariationsConfigurationTest : public ::testing::Test {
public: public:
ChromeVariationsConfigurationTest() : field_trials_(nullptr) { ChromeVariationsConfigurationTest() {
base::FieldTrial* foo_trial = base::FieldTrial* foo_trial =
base::FieldTrialList::CreateFieldTrial(kFooTrialName, kGroupName); base::FieldTrialList::CreateFieldTrial(kFooTrialName, kGroupName);
base::FieldTrial* bar_trial = base::FieldTrial* bar_trial =
...@@ -67,7 +67,7 @@ class ChromeVariationsConfigurationTest : public ::testing::Test { ...@@ -67,7 +67,7 @@ class ChromeVariationsConfigurationTest : public ::testing::Test {
kChromeTestFeatureQux.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE, kChromeTestFeatureQux.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE,
qux_trial); qux_trial);
scoped_feature_list.InitWithFeatureList(std::move(feature_list)); scoped_feature_list_.InitWithFeatureList(std::move(feature_list));
EXPECT_EQ(foo_trial, EXPECT_EQ(foo_trial,
base::FeatureList::GetFieldTrial(kChromeTestFeatureFoo)); base::FeatureList::GetFieldTrial(kChromeTestFeatureFoo));
EXPECT_EQ(bar_trial, EXPECT_EQ(bar_trial,
...@@ -111,9 +111,8 @@ class ChromeVariationsConfigurationTest : public ::testing::Test { ...@@ -111,9 +111,8 @@ class ChromeVariationsConfigurationTest : public ::testing::Test {
ChromeVariationsConfiguration configuration_; ChromeVariationsConfiguration configuration_;
private: private:
base::FieldTrialList field_trials_; base::test::ScopedFeatureList scoped_feature_list_;
std::map<std::string, base::FieldTrial*> trials_; std::map<std::string, base::FieldTrial*> trials_;
base::test::ScopedFeatureList scoped_feature_list;
DISALLOW_COPY_AND_ASSIGN(ChromeVariationsConfigurationTest); DISALLOW_COPY_AND_ASSIGN(ChromeVariationsConfigurationTest);
}; };
......
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