diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/metrics/field_trial.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/metrics/field_trial.cc')
| -rw-r--r-- | chromium/base/metrics/field_trial.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chromium/base/metrics/field_trial.cc b/chromium/base/metrics/field_trial.cc index 05470a4deec..9799bfc9713 100644 --- a/chromium/base/metrics/field_trial.cc +++ b/chromium/base/metrics/field_trial.cc @@ -719,9 +719,7 @@ void FieldTrialList::GetInitiallyActiveFieldTrials( } // static -bool FieldTrialList::CreateTrialsFromString( - const std::string& trials_string, - const std::set<std::string>& ignored_trial_names) { +bool FieldTrialList::CreateTrialsFromString(const std::string& trials_string) { DCHECK(global_); if (trials_string.empty() || !global_) return true; @@ -734,14 +732,6 @@ bool FieldTrialList::CreateTrialsFromString( const std::string trial_name = entry.trial_name.as_string(); const std::string group_name = entry.group_name.as_string(); - if (Contains(ignored_trial_names, trial_name)) { - // This is to warn that the field trial forced through command-line - // input is unforcable. - // Use --enable-logging or --enable-logging=stderr to see this warning. - LOG(WARNING) << "Field trial: " << trial_name << " cannot be forced."; - continue; - } - FieldTrial* trial = CreateFieldTrial(trial_name, group_name); if (!trial) return false; @@ -787,8 +777,7 @@ void FieldTrialList::CreateTrialsFromCommandLine( if (cmd_line.HasSwitch(switches::kForceFieldTrials)) { bool result = FieldTrialList::CreateTrialsFromString( - cmd_line.GetSwitchValueASCII(switches::kForceFieldTrials), - std::set<std::string>()); + cmd_line.GetSwitchValueASCII(switches::kForceFieldTrials)); UMA_HISTOGRAM_BOOLEAN("ChildProcess.FieldTrials.CreateFromSwitchSuccess", result); DCHECK(result); |