Capture All Groups in the Field Trial For Testing Studies

chrome/common/variations/variations_util_unittest.cc

Index: chrome/common/variations/variations_util_unittest.cc
diff --git a/chrome/common/variations/variations_util_unittest.cc b/chrome/common/variations/variations_util_unittest.cc
index fe70e7295f4710a6f1b77444a93cec340e445824..b28c324fa2cf57480abd9a565bfa4dc629499ff3 100644
--- a/chrome/common/variations/variations_util_unittest.cc
+++ b/chrome/common/variations/variations_util_unittest.cc
@@ -58,16 +58,23 @@ TEST_F(VariationsUtilTest, AssociateParamsFromStringWithSameStudy) {
 }
 
 TEST_F(VariationsUtilTest, AssociateParamsFromFieldTrialConfig) {
-  const FieldTrialGroupParams array_kFieldTrialConfig_params[] = {{"x", "1"},
-                                                                  {"y", "2"}};
-
-  const FieldTrialTestingGroup array_kFieldTrialConfig_groups[] = {
-      {"TestStudy1", "TestGroup1", array_kFieldTrialConfig_params, 2, NULL, 0,
-       NULL, 0},
-      {"TestStudy2", "TestGroup2", NULL, 0, NULL, 0, NULL, 0}};
-
+  const FieldTrialTestingStudyGroupsParams array_kFieldTrialConfig_params_0[] =
+      {{"x", "1"}, {"y", "2"}};
+  const FieldTrialTestingStudyGroup array_kFieldTrialConfig_groups_0[] = {
+      {"TestGroup1", array_kFieldTrialConfig_params_0, 2, NULL, 0, NULL, 0},
+  };
+  const FieldTrialTestingStudyGroupsParams array_kFieldTrialConfig_params_1[] =
+      {{"x", "3"}, {"y", "4"}};
+  const FieldTrialTestingStudyGroup array_kFieldTrialConfig_groups_1[] = {
+      {"TestGroup2", array_kFieldTrialConfig_params_0, 2, NULL, 0, NULL, 0},
+      {"TestGroup2-2", array_kFieldTrialConfig_params_1, 2, NULL, 0, NULL, 0},
+  };
+  const FieldTrialTestingStudy array_kFieldTrialConfig_studies[] = {
+      {"TestStudy1", array_kFieldTrialConfig_groups_0, 1},
+      {"TestStudy2", array_kFieldTrialConfig_groups_1, 2},
+  };
   const FieldTrialTestingConfig kConfig = {
-      array_kFieldTrialConfig_groups, 2,
+      array_kFieldTrialConfig_studies, 2
   };
 
   base::FeatureList feature_list;
@@ -95,12 +102,21 @@ TEST_F(VariationsUtilTest, AssociateFeaturesFromFieldTrialConfig) {
   const char* enable_features[] = {"A", "B"};
   const char* disable_features[] = {"C", "D"};
 
-  const FieldTrialTestingGroup array_kFieldTrialConfig_groups[] = {
-      {"TestStudy1", "TestGroup1", NULL, 0, enable_features, 2, NULL, 0},
-      {"TestStudy2", "TestGroup2", NULL, 0, NULL, 0, disable_features, 2}};
+  const FieldTrialTestingStudyGroup array_kFieldTrialConfig_groups_0[] = {
+      {"TestGroup1", NULL, 0, enable_features, 2, NULL, 0},
+  };
+  const FieldTrialTestingStudyGroup array_kFieldTrialConfig_groups_1[] = {
+      {"TestGroup2", NULL, 0, NULL, 0, disable_features, 2},
+      {"TestGroup2-2", NULL, 0, NULL, 0, NULL, 0},
+  };
+
+  const FieldTrialTestingStudy array_kFieldTrialConfig_studies[] = {
+      {"TestStudy1", array_kFieldTrialConfig_groups_0, 1},
+      {"TestStudy2", array_kFieldTrialConfig_groups_1, 2},
+  };
 
   const FieldTrialTestingConfig kConfig = {
-      array_kFieldTrialConfig_groups, 2,
+      array_kFieldTrialConfig_studies, 2
   };
 
   base::FeatureList::ClearInstanceForTesting();