| Index: base/metrics/field_trial.cc
|
| diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
|
| index f718ab0371fa3b05cc6be4e0a0ab254e820c1e71..54b95211470ffc4acc0ea793895de4c939e889ec 100644
|
| --- a/base/metrics/field_trial.cc
|
| +++ b/base/metrics/field_trial.cc
|
| @@ -399,8 +399,10 @@ void FieldTrialList::GetActiveFieldTrialGroups(
|
| }
|
|
|
| // static
|
| -bool FieldTrialList::CreateTrialsFromString(const std::string& trials_string,
|
| - FieldTrialActivationMode mode) {
|
| +bool FieldTrialList::CreateTrialsFromString(
|
| + const std::string& trials_string,
|
| + FieldTrialActivationMode mode,
|
| + const std::set<std::string>& ignored_trial_names) {
|
| DCHECK(global_);
|
| if (trials_string.empty() || !global_)
|
| return true;
|
| @@ -419,6 +421,9 @@ bool FieldTrialList::CreateTrialsFromString(const std::string& trials_string,
|
| group_name_end - name_end - 1);
|
| next_item = group_name_end + 1;
|
|
|
| + if (ignored_trial_names.find(name) != ignored_trial_names.end())
|
| + continue;
|
| +
|
| FieldTrial* trial = CreateFieldTrial(name, group_name);
|
| if (!trial)
|
| return false;
|
|
|