Use Study and Experiment Terminology on the C++ Side For Fieldtrials

tools/variations/unittest_data/expected_output.cc

Index: tools/variations/unittest_data/expected_output.cc
diff --git a/tools/variations/unittest_data/expected_output.cc b/tools/variations/unittest_data/expected_output.cc
index aa346a1b51798cd49b21cab413ac2fbe42d0ff19..eb2401809d725d98d1e1bf883ff13d1fc7148b06 100644
--- a/tools/variations/unittest_data/expected_output.cc
+++ b/tools/variations/unittest_data/expected_output.cc
@@ -13,7 +13,7 @@
 const char* const array_kFieldTrialConfig_enable_features_1[] = {
       "X",
 };
-const FieldTrialTestingGroup array_kFieldTrialConfig_groups_1[] = {
+const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
     {
       "TestGroup3",
       NULL,
@@ -31,7 +31,7 @@ const char* const array_kFieldTrialConfig_enable_features_0[] = {
       "D",
       "E",
 };
-const FieldTrialTestingGroupParams array_kFieldTrialConfig_params_0[] = {
+const FieldTrialTestingExperimentParams array_kFieldTrialConfig_params_0[] = {
       {
         "x",
         "3",
@@ -48,7 +48,7 @@ const char* const array_kFieldTrialConfig_enable_features[] = {
       "A",
       "B",
 };
-const FieldTrialTestingGroupParams array_kFieldTrialConfig_params[] = {
+const FieldTrialTestingExperimentParams array_kFieldTrialConfig_params[] = {
       {
         "x",
         "1",
@@ -58,7 +58,7 @@ const FieldTrialTestingGroupParams array_kFieldTrialConfig_params[] = {
         "2",
       },
 };
-const FieldTrialTestingGroup array_kFieldTrialConfig_groups_0[] = {
+const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
     {
       "TestGroup2",
       array_kFieldTrialConfig_params,
@@ -78,7 +78,7 @@ const FieldTrialTestingGroup array_kFieldTrialConfig_groups_0[] = {
       1,
     },
 };
-const FieldTrialTestingGroup array_kFieldTrialConfig_groups[] = {
+const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
     {
       "TestGroup1",
       NULL,
@@ -89,24 +89,24 @@ const FieldTrialTestingGroup array_kFieldTrialConfig_groups[] = {
       0,
     },
 };
-const FieldTrialTestingTrial array_kFieldTrialConfig_trials[] = {
+const FieldTrialTestingStudy array_kFieldTrialConfig_studies[] = {
   {
     "TestTrial1",
-    array_kFieldTrialConfig_groups,
+    array_kFieldTrialConfig_experiments,
     1,
   },
   {
     "TestTrial2",
-    array_kFieldTrialConfig_groups_0,
+    array_kFieldTrialConfig_experiments_0,
     2,
   },
   {
     "TestTrial3",
-    array_kFieldTrialConfig_groups_1,
+    array_kFieldTrialConfig_experiments_1,
     1,
   },
 };
 const FieldTrialTestingConfig kFieldTrialConfig = {
-  array_kFieldTrialConfig_trials,
+  array_kFieldTrialConfig_studies,
   3,
 };