summaryrefslogtreecommitdiff
path: root/chromium/tools/variations
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/tools/variations')
-rwxr-xr-xchromium/tools/variations/fieldtrial_to_struct.py3
-rw-r--r--chromium/tools/variations/unittest_data/expected_output.cc10
-rw-r--r--chromium/tools/variations/unittest_data/expected_output.h1
3 files changed, 14 insertions, 0 deletions
diff --git a/chromium/tools/variations/fieldtrial_to_struct.py b/chromium/tools/variations/fieldtrial_to_struct.py
index 65f9c9ba08a..35bdad1eedb 100755
--- a/chromium/tools/variations/fieldtrial_to_struct.py
+++ b/chromium/tools/variations/fieldtrial_to_struct.py
@@ -108,6 +108,9 @@ def _CreateExperiment(experiment_data,
forcing_flags_data = experiment_data.get('forcing_flag')
if forcing_flags_data:
experiment['forcing_flag'] = forcing_flags_data
+ min_os_version_data = experiment_data.get('min_os_version')
+ if min_os_version_data:
+ experiment['min_os_version'] = min_os_version_data
params_data = experiment_data.get('params')
if (params_data):
experiment['params'] = [{'key': param, 'value': params_data[param]}
diff --git a/chromium/tools/variations/unittest_data/expected_output.cc b/chromium/tools/variations/unittest_data/expected_output.cc
index 1bc17655356..cfb8b37dea7 100644
--- a/chromium/tools/variations/unittest_data/expected_output.cc
+++ b/chromium/tools/variations/unittest_data/expected_output.cc
@@ -30,6 +30,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_5[] = {
0,
base::nullopt,
NULL,
+ NULL,
0,
NULL,
0,
@@ -62,6 +63,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_4[] = {
2,
base::nullopt,
NULL,
+ NULL,
0,
NULL,
0,
@@ -79,6 +81,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_4[] = {
1,
base::nullopt,
NULL,
+ NULL,
0,
NULL,
0,
@@ -103,6 +106,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_3[] = {
0,
base::nullopt,
NULL,
+ NULL,
0,
NULL,
0,
@@ -132,6 +136,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_2[] = {
0,
true,
NULL,
+ NULL,
0,
NULL,
0,
@@ -149,6 +154,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_2[] = {
0,
false,
NULL,
+ NULL,
0,
NULL,
0,
@@ -176,6 +182,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
0,
base::nullopt,
NULL,
+ NULL,
0,
array_kFieldTrialConfig_enable_features_1,
1,
@@ -238,6 +245,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
array_kFieldTrialConfig_form_factors_0,
0,
base::nullopt,
+ NULL,
array_kFieldTrialConfig_params,
2,
array_kFieldTrialConfig_enable_features,
@@ -255,6 +263,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
array_kFieldTrialConfig_form_factors_1,
0,
base::nullopt,
+ NULL,
array_kFieldTrialConfig_params_0,
2,
array_kFieldTrialConfig_enable_features_0,
@@ -280,6 +289,7 @@ const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments[] = {
0,
base::nullopt,
NULL,
+ NULL,
0,
NULL,
0,
diff --git a/chromium/tools/variations/unittest_data/expected_output.h b/chromium/tools/variations/unittest_data/expected_output.h
index 7612fb3c87c..4adf6b3f531 100644
--- a/chromium/tools/variations/unittest_data/expected_output.h
+++ b/chromium/tools/variations/unittest_data/expected_output.h
@@ -32,6 +32,7 @@ struct FieldTrialTestingExperiment {
const Study::FormFactor * form_factors;
const size_t form_factors_size;
const base::Optional<bool> is_low_end_device;
+ const char* const min_os_version;
const FieldTrialTestingExperimentParams * params;
const size_t params_size;
const char* const * enable_features;