| Index: base/metrics/field_trial.cc
|
| diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
|
| index d29ed2d68835948b836c1f2d2d1bf7c69b65b160..654746c5558add325e96e36e804ff35aad87566c 100644
|
| --- a/base/metrics/field_trial.cc
|
| +++ b/base/metrics/field_trial.cc
|
| @@ -117,6 +117,14 @@ void FieldTrialList::Register(FieldTrial* trial) {
|
| }
|
|
|
| // static
|
| +FieldTrial* FieldTrialList::Find(const std::string& name) {
|
| + if (!global_)
|
| + return NULL;
|
| + AutoLock auto_lock(global_->lock_);
|
| + return global_->PreLockedFind(name);
|
| +}
|
| +
|
| +// static
|
| int FieldTrialList::FindValue(const std::string& name) {
|
| FieldTrial* field_trial = Find(name);
|
| if (field_trial)
|
| @@ -133,21 +141,6 @@ std::string FieldTrialList::FindFullName(const std::string& name) {
|
| }
|
|
|
| // static
|
| -FieldTrial* FieldTrialList::Find(const std::string& name) {
|
| - if (!global_)
|
| - return NULL;
|
| - AutoLock auto_lock(global_->lock_);
|
| - return global_->PreLockedFind(name);
|
| -}
|
| -
|
| -FieldTrial* FieldTrialList::PreLockedFind(const std::string& name) {
|
| - RegistrationList::iterator it = registered_.find(name);
|
| - if (registered_.end() == it)
|
| - return NULL;
|
| - return it->second;
|
| -}
|
| -
|
| -// static
|
| void FieldTrialList::StatesToString(std::string* output) {
|
| if (!global_)
|
| return;
|
| @@ -210,4 +203,11 @@ size_t FieldTrialList::GetFieldTrialCount() {
|
| return global_->registered_.size();
|
| }
|
|
|
| +FieldTrial* FieldTrialList::PreLockedFind(const std::string& name) {
|
| + RegistrationList::iterator it = registered_.find(name);
|
| + if (registered_.end() == it)
|
| + return NULL;
|
| + return it->second;
|
| +}
|
| +
|
| } // namespace base
|
|
|