Introduce a new FieldTrialList::IsTrialActive() API.

components/variations/variations_associated_data_unittest.cc

Index: components/variations/variations_associated_data_unittest.cc
diff --git a/components/variations/variations_associated_data_unittest.cc b/components/variations/variations_associated_data_unittest.cc
index 21d0ff04d39e6abae9f511408e8b2be36ed72dcb..770267cc8a29964bc073a924886bdc5ba92ce03b 100644
--- a/components/variations/variations_associated_data_unittest.cc
+++ b/components/variations/variations_associated_data_unittest.cc
@@ -20,17 +20,6 @@ VariationID GetIDForTrial(IDCollectionKey key, base::FieldTrial* trial) {
   return GetGoogleVariationID(key, trial->trial_name(), trial->group_name());
 }
 
-// Tests whether a field trial is active (i.e. group() has been called on it).
-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;
-}
-
 // Call FieldTrialList::FactoryGetFieldTrial() with a future expiry date.
 scoped_refptr<base::FieldTrial> CreateFieldTrial(
     const std::string& trial_name,
@@ -299,15 +288,15 @@ TEST_F(VariationsAssociatedDataTest,
        AssociateVariationParams_DoesntActivateTrial) {
   const std::string kTrialName = "AssociateVariationParams_DoesntActivateTrial";
 
-  ASSERT_FALSE(IsFieldTrialActive(kTrialName));
+  ASSERT_FALSE(base::FieldTrialList::IsTrialActive(kTrialName));
   scoped_refptr<base::FieldTrial> trial(
       CreateFieldTrial(kTrialName, 100, "A", NULL));
-  ASSERT_FALSE(IsFieldTrialActive(kTrialName));
+  ASSERT_FALSE(base::FieldTrialList::IsTrialActive(kTrialName));
 
   std::map<std::string, std::string> params;
   params["a"] = "10";
   EXPECT_TRUE(AssociateVariationParams(kTrialName, "A", params));
-  ASSERT_FALSE(IsFieldTrialActive(kTrialName));
+  ASSERT_FALSE(base::FieldTrialList::IsTrialActive(kTrialName));
 }
 
 TEST_F(VariationsAssociatedDataTest, GetVariationParams_NoTrial) {
@@ -333,27 +322,27 @@ TEST_F(VariationsAssociatedDataTest, GetVariationParams_NoParams) {
 TEST_F(VariationsAssociatedDataTest, GetVariationParams_ActivatesTrial) {
   const std::string kTrialName = "GetVariationParams_ActivatesTrial";
 
-  ASSERT_FALSE(IsFieldTrialActive(kTrialName));
+  ASSERT_FALSE(base::FieldTrialList::IsTrialActive(kTrialName));
   scoped_refptr<base::FieldTrial> trial(
       CreateFieldTrial(kTrialName, 100, "A", NULL));
-  ASSERT_FALSE(IsFieldTrialActive(kTrialName));
+  ASSERT_FALSE(base::FieldTrialList::IsTrialActive(kTrialName));
 
   std::map<std::string, std::string> params;
   EXPECT_FALSE(GetVariationParams(kTrialName, &params));
-  ASSERT_TRUE(IsFieldTrialActive(kTrialName));
+  ASSERT_TRUE(base::FieldTrialList::IsTrialActive(kTrialName));
 }
 
 TEST_F(VariationsAssociatedDataTest, GetVariationParamValue_ActivatesTrial) {
   const std::string kTrialName = "GetVariationParamValue_ActivatesTrial";
 
-  ASSERT_FALSE(IsFieldTrialActive(kTrialName));
+  ASSERT_FALSE(base::FieldTrialList::IsTrialActive(kTrialName));
   scoped_refptr<base::FieldTrial> trial(
       CreateFieldTrial(kTrialName, 100, "A", NULL));
-  ASSERT_FALSE(IsFieldTrialActive(kTrialName));
+  ASSERT_FALSE(base::FieldTrialList::IsTrialActive(kTrialName));
 
   std::map<std::string, std::string> params;
   EXPECT_EQ(std::string(), GetVariationParamValue(kTrialName, "x"));
-  ASSERT_TRUE(IsFieldTrialActive(kTrialName));
+  ASSERT_TRUE(base::FieldTrialList::IsTrialActive(kTrialName));
 }
 
 }  // namespace variations