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

tools/variations/fieldtrial_to_struct.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 import itertools
 import json
 import os.path
 import sys
 import optparse
@@ skipping 43 matching lines @@
   iterates through all of the experiment_configs for |study_name| and picks out
   the applicable experiments based off of the valid platforms.
   """
   platform_experiment_lists = [
       config['experiments'] for config in experiment_configs
       if platform in config['platforms']]
   platform_experiments = list(itertools.chain.from_iterable(
       platform_experiment_lists))
   return {
     'name': study_name,
-    'groups': [_CreateExperiment(experiment)
-               for experiment in platform_experiments],
+    'experiments': [_CreateExperiment(experiment)
+                    for experiment in platform_experiments],
   }
 
 def _GenerateTrials(config, platform):
   for study_name in sorted(config.keys()):
     study = _CreateTrial(study_name, config[study_name], platform)
-    # To avoid converting studies with empty groups (e.g. the study doesn't
+    # To avoid converting studies with empty experiments (e.g. the study doesn't
     # apply to the target platform), this generator only yields studies that
-    # have non-empty groups.
-    if study['groups']:
+    # have non-empty experiments.
+    if study['experiments']:
       yield study
 
 def _FieldTrialConfigToDescription(config, platform):
   return {
     'elements': {
       'kFieldTrialConfig': {
-        'trials': [study for study in _GenerateTrials(config, platform)]
+        'studies': [study for study in _GenerateTrials(config, platform)]
       }
     }
   }
 
 def main(arguments):
   parser = optparse.OptionParser(
       description='Generates a struct from a JSON description.',
       usage='usage: %prog [option] -s schema -p platform description')
   parser.add_option('-b', '--destbase',
       help='base directory of generated files.')
@@ skipping 36 matching lines @@
 
   schema = _Load(opts.schema)
   description = _LoadFieldTrialConfig(description_filename, opts.platform)
   json_to_struct.GenerateStruct(
       basepath, output_root, opts.namespace, schema, description,
       os.path.split(description_filename)[1], os.path.split(opts.schema)[1],
       opts.year)
 
 if __name__ == '__main__':
   main(sys.argv[1:])