Introduce a new FieldTrialList::IsTrialActive() API.

components/variations/variations_associated_data.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/variations/variations_associated_data.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
@@ skipping 98 matching lines @@
   // Retrieve the singleton.
   static VariationsParamAssociator* GetInstance() {
     return base::Singleton<VariationsParamAssociator>::get();
   }
 
   bool AssociateVariationParams(const std::string& trial_name,
                                 const std::string& group_name,
                                 const VariationParams& params) {
     base::AutoLock scoped_lock(lock_);
 
-    if (IsFieldTrialActive(trial_name))
+    if (base::FieldTrialList::IsTrialActive(trial_name))
       return false;
 
     const VariationKey key(trial_name, group_name);
     if (ContainsKey(variation_params_, key))
       return false;
 
     variation_params_[key] = params;
     return true;
   }
 
@@ skipping 15 matching lines @@
     base::AutoLock scoped_lock(lock_);
     variation_params_.clear();
   }
 
  private:
   friend struct base::DefaultSingletonTraits<VariationsParamAssociator>;
 
   VariationsParamAssociator() {}
   ~VariationsParamAssociator() {}
 
-  // Tests whether a field trial is active (i.e. group() has been called on it).
-  // TODO(asvitkine): Expose this as an API on base::FieldTrial.
-  bool IsFieldTrialActive(const std::string& trial_name) {
-    base::FieldTrial::ActiveGroups active_groups;
-    base::FieldTrialList::GetActiveFieldTrialGroups(&active_groups);
-    for (size_t i = 0; i < active_groups.size(); ++i) {
-      if (active_groups[i].trial_name == trial_name)
-        return true;
-    }
-    return false;
-  }
-
   base::Lock lock_;
   std::map<VariationKey, VariationParams> variation_params_;
 
   DISALLOW_COPY_AND_ASSIGN(VariationsParamAssociator);
 };
 
 }  // namespace
 
 void AssociateGoogleVariationID(IDCollectionKey key,
                                 const std::string& trial_name,
@@ skipping 63 matching lines @@
   GroupMapAccessor::GetInstance()->ClearAllMapsForTesting();
 }
 
 void ClearAllVariationParams() {
   VariationsParamAssociator::GetInstance()->ClearAllParamsForTesting();
 }
 
 }  // namespace testing
 
 }  // namespace variations