diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 03:19:43 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-10 03:19:43 +0000 |
| commit | 8b18dd4aafe74e21929d8291e8544481cb98ba42 (patch) | |
| tree | 20146a73280eda9295ff1193008c87f70fbbcf94 /base/metrics/field_trial.cc | |
| parent | 4f15bb568f02c479ba56b40e3f17210414163d96 (diff) | |
| download | chromium_src-8b18dd4aafe74e21929d8291e8544481cb98ba42.zip chromium_src-8b18dd4aafe74e21929d8291e8544481cb98ba42.tar.gz chromium_src-8b18dd4aafe74e21929d8291e8544481cb98ba42.tar.bz2 | |
Make it so disabled field trials are not reported as active.
BUG=160310
TEST=New FieldTrialTest.DisabledTrialNotActive test and updated existing tests.
Review URL: https://chromiumcodereview.appspot.com/11359136
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics/field_trial.cc')
| -rw-r--r-- | base/metrics/field_trial.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc index cdefc25..3214f63 100644 --- a/base/metrics/field_trial.cc +++ b/base/metrics/field_trial.cc @@ -145,7 +145,8 @@ int FieldTrial::AppendGroup(const std::string& name, int FieldTrial::group() { FinalizeGroupChoice(); if (!group_reported_) { - FieldTrialList::NotifyFieldTrialGroupSelection(name_, group_name_); + if (enable_field_trial_) + FieldTrialList::NotifyFieldTrialGroupSelection(name_, group_name_); group_reported_ = true; } return group_; @@ -209,7 +210,7 @@ void FieldTrial::FinalizeGroupChoice() { } bool FieldTrial::GetActiveGroup(ActiveGroup* active_group) const { - if (!group_reported_) + if (!group_reported_ || !enable_field_trial_) return false; DCHECK_NE(group_, kNotFinalized); active_group->trial = name_; |