Capture All Groups in the Field Trial For Testing Studies

chrome/common/variations/fieldtrial_testing_config_schema.json

Index: chrome/common/variations/fieldtrial_testing_config_schema.json
diff --git a/chrome/common/variations/fieldtrial_testing_config_schema.json b/chrome/common/variations/fieldtrial_testing_config_schema.json
index 3f165735518e7db198091393739d3099e71b1431..7974e5e0f66a3e972c3d1710cf1a3d6474e54148 100644
--- a/chrome/common/variations/fieldtrial_testing_config_schema.json
+++ b/chrome/common/variations/fieldtrial_testing_config_schema.json
@@ -5,37 +5,47 @@
 {
   "type_name": "FieldTrialTestingConfig",
   "schema": [{
-    "field": "groups",
+    "field": "studies",

[jwd, 2016/08/22 21:54:08]

I disagree with Ilya, the terminology is either (study and experiment) or (field
trial and group). I'd probably have prefered you use study/experiment, but that
would be inconsistent with the testing configs, so I'd like you to change to the
field trial/group consistently, and rename this to "trials" or "field_trials".

[robliao, 2016/08/22 22:55:23]

Done. Variations uses trial and group too, so it makes more sense to stick with
that.

     "type": "array",
     "contents": {
-      "type_name": "FieldTrialTestingGroup",
+      "type_name": "FieldTrialTestingStudy",
       "type": "struct",
       "fields": [
-        {"field": "study", "type": "string"},
-        {"field": "group_name", "type": "string"},
+        {"field": "name", "type": "string"},
         {
-          "field": "params",
+          "field": "groups",
           "type": "array",
           "contents": {
-            "type_name": "FieldTrialGroupParams",
+            "type_name": "FieldTrialTestingGroup",
             "type": "struct",
             "fields": [
-              {"field": "key", "type": "string"},
-              {"field": "value", "type": "string"}
+              {"field": "name", "type": "string"},
+              {
+                "field": "params",
+                "type": "array",
+                "contents": {
+                  "type_name": "FieldTrialTestingGroupParams",
+                  "type": "struct",
+                  "fields": [
+                    {"field": "key", "type": "string"},
+                    {"field": "value", "type": "string"}
+                  ]
+                }
+              },
+              {
+                "field": "enable_features",
+                "type": "array",
+                "contents": { "type": "string"}
+              },
+              {
+                "field": "disable_features",
+                "type": "array",
+                "contents": { "type": "string"}
+              }
             ]
           }
-        },
-        {
-          "field": "enable_features",
-          "type": "array",
-          "contents": { "type": "string"}
-        },
-        {
-          "field": "disable_features",
-          "type": "array",
-          "contents": { "type": "string"}
         }
       ]
     }
   }]
-}
+}