summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testing/legion/examples/http_example/http_test.py1
-rw-r--r--testing/variations/PRESUBMIT.py50
-rw-r--r--testing/variations/fieldtrial_testing_config_android.json346
-rw-r--r--testing/variations/fieldtrial_testing_config_chromeos.json28
-rw-r--r--testing/variations/fieldtrial_testing_config_ios.json24
-rw-r--r--testing/variations/fieldtrial_testing_config_linux.json46
-rw-r--r--testing/variations/fieldtrial_testing_config_mac.json62
-rw-r--r--testing/variations/fieldtrial_testing_config_win.json78
8 files changed, 340 insertions, 295 deletions
diff --git a/testing/legion/examples/http_example/http_test.py b/testing/legion/examples/http_example/http_test.py
index 9b729ac..789bcf3 100644
--- a/testing/legion/examples/http_example/http_test.py
+++ b/testing/legion/examples/http_example/http_test.py
@@ -33,6 +33,7 @@ class HttpTest(legion_test_case.TestCase):
def CreateTask(cls, name, task_hash, os_type):
"""Create a new task."""
#pylint: disable=unexpected-keyword-arg,no-value-for-parameter
+ #pylint: disable=arguments-differ
task = super(HttpTest, cls).CreateTask(
name=name,
isolated_hash=task_hash,
diff --git a/testing/variations/PRESUBMIT.py b/testing/variations/PRESUBMIT.py
index 9e565e0..003e611 100644
--- a/testing/variations/PRESUBMIT.py
+++ b/testing/variations/PRESUBMIT.py
@@ -1,13 +1,29 @@
# 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.
-
"""Presubmit script validating field trial configs.
See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
for more details on the presubmit API built into depot_tools.
"""
+import json
+import sys
+
+
+def PrettyPrint(contents):
+ """Pretty prints a fieldtrial configuration.
+
+ Args:
+ contents: File contents as a string.
+
+ Returns:
+ Pretty printed file contents.
+ """
+ return json.dumps(json.loads(contents),
+ sort_keys=True, indent=4,
+ separators=(',', ': ')) + '\n'
+
def ValidateData(json_data, file_path, message_type):
"""Validates the format of a fieldtrial configuration.
@@ -59,6 +75,26 @@ def ValidateData(json_data, file_path, message_type):
study))]
return []
+def CheckPretty(contents, file_path, message_type):
+ """Validates the pretty printing of fieldtrial configuration.
+
+ Args:
+ contents: File contents as a string.
+ file_path: String representing the path to the JSON file.
+ message_type: Type of message from |output_api| to return in the case of
+ errors/warnings.
+
+ Returns:
+ A list of |message_type| messages. In the case of all tests passing with no
+ warnings/errors, this will return [].
+ """
+ pretty = PrettyPrint(contents)
+ if contents != pretty:
+ return [message_type(
+ 'Pretty printing error: Run '
+ 'python testing/variations/PRESUBMIT.py %s' % file_path)]
+ return []
+
def CommonChecks(input_api, output_api):
affected_files = input_api.AffectedFiles(
include_deletes=False,
@@ -67,6 +103,9 @@ def CommonChecks(input_api, output_api):
contents = input_api.ReadFile(f)
try:
json_data = input_api.json.loads(contents)
+ result = CheckPretty(contents, f.LocalPath(), output_api.PresubmitError)
+ if len(result):
+ return result
result = ValidateData(json_data, f.LocalPath(),
output_api.PresubmitError)
if len(result):
@@ -81,3 +120,12 @@ def CheckChangeOnUpload(input_api, output_api):
def CheckChangeOnCommit(input_api, output_api):
return CommonChecks(input_api, output_api)
+
+
+def main(argv):
+ content = open(argv[1]).read()
+ pretty = PrettyPrint(content)
+ open(argv[1],'w').write(pretty)
+
+if __name__ == "__main__":
+ sys.exit(main(sys.argv))
diff --git a/testing/variations/fieldtrial_testing_config_android.json b/testing/variations/fieldtrial_testing_config_android.json
index 1bea149..1060794 100644
--- a/testing/variations/fieldtrial_testing_config_android.json
+++ b/testing/variations/fieldtrial_testing_config_android.json
@@ -1,23 +1,90 @@
{
- "EnhancedBookmarks": [
+ "AutofillFieldMetadata": [
{
- "group_name": "EnableEnhancedBookmarks",
+ "group_name": "Enabled"
+ }
+ ],
+ "BackgroundHtmlParserTokenLimits": [
+ {
+ "group_name": "Session_10",
"params": {
- "id": "Fake_id_to_trigger_experiment_code"
+ "backgroundHtmlParserOutstandingTokenLimit": "10",
+ "backgroundHtmlParserPendingTokenLimit": "10"
}
},
{
- "group_name": "EnableEnhancedBookmarksGrid",
+ "group_name": "Session_50",
"params": {
- "DefaultViewMode": "Grid",
- "id": "Fake_id_to_trigger_experiment_code"
+ "backgroundHtmlParserOutstandingTokenLimit": "50",
+ "backgroundHtmlParserPendingTokenLimit": "50"
}
},
{
- "group_name": "EnableEnhancedBookmarksList",
+ "group_name": "Session_100",
"params": {
- "DefaultViewMode": "List",
- "id": "Fake_id_to_trigger_experiment_code"
+ "backgroundHtmlParserOutstandingTokenLimit": "100",
+ "backgroundHtmlParserPendingTokenLimit": "100"
+ }
+ },
+ {
+ "group_name": "Session_300",
+ "params": {
+ "backgroundHtmlParserOutstandingTokenLimit": "300",
+ "backgroundHtmlParserPendingTokenLimit": "100"
+ }
+ },
+ {
+ "group_name": "Session_500",
+ "params": {
+ "backgroundHtmlParserOutstandingTokenLimit": "500",
+ "backgroundHtmlParserPendingTokenLimit": "100"
+ }
+ },
+ {
+ "group_name": "Session_1000",
+ "params": {
+ "backgroundHtmlParserOutstandingTokenLimit": "1000",
+ "backgroundHtmlParserPendingTokenLimit": "100"
+ }
+ },
+ {
+ "group_name": "Session_2500",
+ "params": {
+ "backgroundHtmlParserOutstandingTokenLimit": "2500",
+ "backgroundHtmlParserPendingTokenLimit": "100"
+ }
+ },
+ {
+ "group_name": "Session_5000",
+ "params": {
+ "backgroundHtmlParserOutstandingTokenLimit": "5000",
+ "backgroundHtmlParserPendingTokenLimit": "100"
+ }
+ },
+ {
+ "group_name": "Session_10000",
+ "params": {
+ "backgroundHtmlParserOutstandingTokenLimit": "10000",
+ "backgroundHtmlParserPendingTokenLimit": "100"
+ }
+ }
+ ],
+ "ContextualSearch": [
+ {
+ "group_name": "OptOut",
+ "params": {
+ "contextual_search_arrow_icon_enabled": "true",
+ "contextual_search_narrow_panel_supported": "true",
+ "contextual_search_side_search_provider_icon_enabled": "true",
+ "disable_for_cjk": "true",
+ "enabled": "true",
+ "promo_on_limited_taps": "true",
+ "promo_opt_out": "true",
+ "tap_preload_limit_for_decided": "50",
+ "tap_preload_limit_for_undecided": "20",
+ "tap_resolve_limit_for_decided": "50",
+ "tap_resolve_limit_for_undecided": "20",
+ "tap_triggered_promo_limit": "50"
}
}
],
@@ -36,14 +103,19 @@
{
"group_name": "Enabled",
"params": {
- "rtt_msec": "2000",
- "hysteresis_period_seconds": "120"
+ "hysteresis_period_seconds": "120",
+ "rtt_msec": "2000"
}
}
],
+ "DataReductionProxyConfigService": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
"DataReductionProxyUseDataSaverOnVPN": [
{
- "group_name": "Enabled"
+ "group_name": "Enabled"
}
],
"DataReductionProxyUseQuic": [
@@ -51,45 +123,96 @@
"group_name": "Enabled"
}
],
- "DataReductionProxyConfigService": [
+ "EnhancedBookmarks": [
+ {
+ "group_name": "EnableEnhancedBookmarks",
+ "params": {
+ "id": "Fake_id_to_trigger_experiment_code"
+ }
+ },
{
- "group_name": "Enabled"
- }
+ "group_name": "EnableEnhancedBookmarksGrid",
+ "params": {
+ "DefaultViewMode": "Grid",
+ "id": "Fake_id_to_trigger_experiment_code"
+ }
+ },
+ {
+ "group_name": "EnableEnhancedBookmarksList",
+ "params": {
+ "DefaultViewMode": "List",
+ "id": "Fake_id_to_trigger_experiment_code"
+ }
+ }
+ ],
+ "IconNTP": [
+ {
+ "group_name": "Enabled",
+ "params": {
+ "state": "enabled"
+ }
+ }
+ ],
+ "InvalidationsGCMUpstream": [
+ {
+ "group_name": "Enabled"
+ },
+ {
+ "group_name": "Control"
+ },
+ {
+ "group_name": "Disabled"
+ }
],
"LimitSyncPassphrasePrompt": [
{
"group_name": "Enabled"
}
],
+ "MenuTrimming": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
+ "MobileModerateBinding": [
+ {
+ "group_name": "Ratio_25_50"
+ }
+ ],
"NetworkQualityEstimator": [
{
"group_name": "Enabled",
"params": {
- "Unknown.DefaultMedianRTTMsec": "121",
- "Unknown.DefaultMedianKbps": "1916",
- "Ethernet.DefaultMedianRTTMsec": "106",
- "Ethernet.DefaultMedianKbps": "3263",
- "WiFi.DefaultMedianRTTMsec": "168",
- "WiFi.DefaultMedianKbps": "2736",
- "2G.DefaultMedianRTTMsec": "1337",
"2G.DefaultMedianKbps": "81",
- "3G.DefaultMedianRTTMsec": "297",
+ "2G.DefaultMedianRTTMsec": "1337",
"3G.DefaultMedianKbps": "658",
- "4G.DefaultMedianRTTMsec": "159",
+ "3G.DefaultMedianRTTMsec": "297",
"4G.DefaultMedianKbps": "1756",
- "None.DefaultMedianRTTMsec": "272",
- "None.DefaultMedianKbps": "567",
- "Bluetooth.DefaultMedianRTTMsec": "135",
+ "4G.DefaultMedianRTTMsec": "159",
"Bluetooth.DefaultMedianKbps": "449",
- "HalfLifeSeconds": "60"
+ "Bluetooth.DefaultMedianRTTMsec": "135",
+ "Ethernet.DefaultMedianKbps": "3263",
+ "Ethernet.DefaultMedianRTTMsec": "106",
+ "HalfLifeSeconds": "60",
+ "None.DefaultMedianKbps": "567",
+ "None.DefaultMedianRTTMsec": "272",
+ "Unknown.DefaultMedianKbps": "1916",
+ "Unknown.DefaultMedianRTTMsec": "121",
+ "WiFi.DefaultMedianKbps": "2736",
+ "WiFi.DefaultMedianRTTMsec": "168"
}
}
],
+ "Precache": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
"QUIC": [
{
"group_name": "Enabled",
"params": {
- "alternate_protocol_probability_threshold": "0.01"
+ "alternate_protocol_probability_threshold": "0.01"
}
}
],
@@ -101,25 +224,6 @@
"group_name": "DoNotShow"
}
],
- "ContextualSearch": [
- {
- "group_name": "OptOut",
- "params": {
- "enabled": "true",
- "disable_for_cjk": "true",
- "promo_opt_out": "true",
- "promo_on_limited_taps": "true",
- "tap_triggered_promo_limit": "50",
- "tap_preload_limit_for_undecided": "20",
- "tap_resolve_limit_for_undecided": "20",
- "tap_preload_limit_for_decided": "50",
- "tap_resolve_limit_for_decided": "50",
- "contextual_search_side_search_provider_icon_enabled": "true",
- "contextual_search_arrow_icon_enabled": "true",
- "contextual_search_narrow_panel_supported": "true"
- }
- }
- ],
"ReportCertificateErrors": [
{
"group_name": "ShowAndPossiblySend",
@@ -149,69 +253,20 @@
"group_name": "DontShowAndDontSend"
}
],
- "BackgroundHtmlParserTokenLimits": [
- {
- "group_name": "Session_10",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "10",
- "backgroundHtmlParserPendingTokenLimit": "10"
- }
- },
- {
- "group_name": "Session_50",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "50",
- "backgroundHtmlParserPendingTokenLimit": "50"
- }
- },
- {
- "group_name": "Session_100",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "100",
- "backgroundHtmlParserPendingTokenLimit": "100"
- }
- },
- {
- "group_name": "Session_300",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "300",
- "backgroundHtmlParserPendingTokenLimit": "100"
- }
- },
- {
- "group_name": "Session_500",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "500",
- "backgroundHtmlParserPendingTokenLimit": "100"
- }
- },
+ "SafeBrowsingReportPhishingErrorLink": [
{
- "group_name": "Session_1000",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "1000",
- "backgroundHtmlParserPendingTokenLimit": "100"
- }
+ "group_name": "Enabled"
},
{
- "group_name": "Session_2500",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "2500",
- "backgroundHtmlParserPendingTokenLimit": "100"
- }
+ "group_name": "Control"
},
{
- "group_name": "Session_5000",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "5000",
- "backgroundHtmlParserPendingTokenLimit": "100"
- }
- },
+ "group_name": "Disabled"
+ }
+ ],
+ "SdchPersistence": [
{
- "group_name": "Session_10000",
- "params": {
- "backgroundHtmlParserOutstandingTokenLimit": "10000",
- "backgroundHtmlParserPendingTokenLimit": "100"
- }
+ "group_name": "Enabled"
}
],
"SpeculativeResourcePrefetching": [
@@ -219,41 +274,24 @@
"group_name": "v=1a:Prefetching=Enabled:Predictor=Url"
},
{
- "group_name":
- "v=1b:Prefetching=Enabled:Predictor=Url:Confidence=High"
+ "group_name": "v=1b:Prefetching=Enabled:Predictor=Url:Confidence=High"
},
{
- "group_name":
- "v=1c:Prefetching=Enabled:Predictor=Url:Confidence=Low"
+ "group_name": "v=1c:Prefetching=Enabled:Predictor=Url:Confidence=Low"
},
{
"group_name": "v=1d:Prefetching=Enabled:Predictor=Host"
},
{
- "group_name":
- "v=1e:Prefetching=Enabled:Predictor=Host:Confidence=High"
+ "group_name": "v=1e:Prefetching=Enabled:Predictor=Host:Confidence=High"
},
{
- "group_name":
- "v=1f:Prefetching=Enabled:Predictor=Host:Confidence=Low"
+ "group_name": "v=1f:Prefetching=Enabled:Predictor=Host:Confidence=Low"
},
{
"group_name": "v=1:Prefetching=Learning"
}
],
- "SdchPersistence": [
- {
- "group_name": "Enabled"
- }
- ],
- "IconNTP": [
- {
- "group_name": "Enabled",
- "params": {
- "state": "enabled"
- }
- }
- ],
"SyncHttpContentCompression": [
{
"group_name": "Enabled"
@@ -262,45 +300,6 @@
"group_name": "Disabled"
}
],
- "AutofillFieldMetadata": [
- {
- "group_name": "Enabled"
- }
- ],
- "VarationsServiceControl": [
- {
- "group_name": "Interval_30min",
- "params": {
- "fetch_period_min": "30"
- }
- }
- ],
- "Precache": [
- {
- "group_name": "Enabled"
- }
- ],
- "MenuTrimming": [
- {
- "group_name": "Enabled"
- }
- ],
- "MobileModerateBinding": [
- {
- "group_name": "Ratio_25_50"
- }
- ],
- "InvalidationsGCMUpstream": [
- {
- "group_name": "Enabled"
- },
- {
- "group_name": "Control"
- },
- {
- "group_name": "Disabled"
- }
- ],
"TabSyncByRecency": [
{
"group_name": "Enabled"
@@ -311,20 +310,17 @@
"group_name": "Enabled",
"params": {
"Enabled": "true",
- "Sample_Probability": "100",
- "Optimize": "true"
+ "Optimize": "true",
+ "Sample_Probability": "100"
}
}
],
- "SafeBrowsingReportPhishingErrorLink": [
- {
- "group_name": "Enabled"
- },
- {
- "group_name": "Control"
- },
+ "VarationsServiceControl": [
{
- "group_name": "Disabled"
+ "group_name": "Interval_30min",
+ "params": {
+ "fetch_period_min": "30"
+ }
}
]
}
diff --git a/testing/variations/fieldtrial_testing_config_chromeos.json b/testing/variations/fieldtrial_testing_config_chromeos.json
index d9bbc4f..7d81fce 100644
--- a/testing/variations/fieldtrial_testing_config_chromeos.json
+++ b/testing/variations/fieldtrial_testing_config_chromeos.json
@@ -1,9 +1,22 @@
{
+ "AutofillFieldMetadata": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
"CaptivePortalInterstitial": [
{
"group_name": "Enabled"
}
],
+ "QUIC": [
+ {
+ "group_name": "Enabled",
+ "params": {
+ "alternate_protocol_probability_threshold": "0.01"
+ }
+ }
+ ],
"ReportCertificateErrors": [
{
"group_name": "ShowAndPossiblySend",
@@ -46,7 +59,7 @@
"group_name": "Disabled"
}
],
- "AutofillFieldMetadata": [
+ "TabSyncByRecency": [
{
"group_name": "Enabled"
}
@@ -56,19 +69,6 @@
"group_name": "DefaultEnabled"
}
],
- "QUIC": [
- {
- "group_name": "Enabled",
- "params": {
- "alternate_protocol_probability_threshold": "0.01"
- }
- }
- ],
- "TabSyncByRecency": [
- {
- "group_name": "Enabled"
- }
- ],
"VarationsServiceControl": [
{
"group_name": "Interval_30min",
diff --git a/testing/variations/fieldtrial_testing_config_ios.json b/testing/variations/fieldtrial_testing_config_ios.json
index 81726b5..df922fe 100644
--- a/testing/variations/fieldtrial_testing_config_ios.json
+++ b/testing/variations/fieldtrial_testing_config_ios.json
@@ -1,28 +1,28 @@
{
- "SdchPersistence": [
+ "AutofillFieldMetadata": [
{
"group_name": "Enabled"
}
],
- "SyncHttpContentCompression": [
- {
- "group_name": "Enabled"
- },
+ "QUIC": [
{
- "group_name": "Disabled"
+ "group_name": "Enabled",
+ "params": {
+ "alternate_protocol_probability_threshold": "0.01"
+ }
}
],
- "AutofillFieldMetadata": [
+ "SdchPersistence": [
{
"group_name": "Enabled"
}
],
- "QUIC": [
+ "SyncHttpContentCompression": [
{
- "group_name": "Enabled",
- "params": {
- "alternate_protocol_probability_threshold": "0.01"
- }
+ "group_name": "Enabled"
+ },
+ {
+ "group_name": "Disabled"
}
],
"TabSyncByRecency": [
diff --git a/testing/variations/fieldtrial_testing_config_linux.json b/testing/variations/fieldtrial_testing_config_linux.json
index 4b14eee..1be6b86 100644
--- a/testing/variations/fieldtrial_testing_config_linux.json
+++ b/testing/variations/fieldtrial_testing_config_linux.json
@@ -1,25 +1,25 @@
{
- "CaptivePortalInterstitial": [
+ "AutofillFieldMetadata": [
{
"group_name": "Enabled"
}
],
- "DataReductionProxyUseDataSaverOnVPN": [
+ "CaptivePortalInterstitial": [
{
- "group_name": "Enabled"
+ "group_name": "Enabled"
}
],
- "EnableSessionCrashedBubbleUI": [
+ "DataReductionProxyUseDataSaverOnVPN": [
{
"group_name": "Enabled"
}
],
- "InstanceID": [
+ "EnableSessionCrashedBubbleUI": [
{
"group_name": "Enabled"
}
],
- "RefreshTokenDeviceId": [
+ "InstanceID": [
{
"group_name": "Enabled"
}
@@ -28,10 +28,15 @@
{
"group_name": "Enabled",
"params": {
- "alternate_protocol_probability_threshold": "0.01"
+ "alternate_protocol_probability_threshold": "0.01"
}
}
],
+ "RefreshTokenDeviceId": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
"ReportCertificateErrors": [
{
"group_name": "ShowAndPossiblySend",
@@ -61,6 +66,17 @@
"group_name": "DontShowAndDontSend"
}
],
+ "SafeBrowsingReportPhishingErrorLink": [
+ {
+ "group_name": "Enabled"
+ },
+ {
+ "group_name": "Control"
+ },
+ {
+ "group_name": "Disabled"
+ }
+ ],
"SdchPersistence": [
{
"group_name": "Enabled"
@@ -74,11 +90,6 @@
"group_name": "Disabled"
}
],
- "AutofillFieldMetadata": [
- {
- "group_name": "Enabled"
- }
- ],
"TabSyncByRecency": [
{
"group_name": "Enabled"
@@ -96,16 +107,5 @@
"fetch_period_min": "30"
}
}
- ],
- "SafeBrowsingReportPhishingErrorLink": [
- {
- "group_name": "Enabled"
- },
- {
- "group_name": "Control"
- },
- {
- "group_name": "Disabled"
- }
]
}
diff --git a/testing/variations/fieldtrial_testing_config_mac.json b/testing/variations/fieldtrial_testing_config_mac.json
index e41b708..1a552ac 100644
--- a/testing/variations/fieldtrial_testing_config_mac.json
+++ b/testing/variations/fieldtrial_testing_config_mac.json
@@ -1,4 +1,9 @@
{
+ "AutofillFieldMetadata": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
"AutomaticTabDiscarding": [
{
"group_name": "Enabled"
@@ -9,17 +14,22 @@
"group_name": "Enabled"
}
],
- "InstanceID": [
+ "ExtensionDeveloperModeWarning": [
{
"group_name": "Enabled"
}
],
- "IntelligentSessionRestore": [
+ "ExtensionInstallVerification": [
+ {
+ "group_name": "Enforce"
+ }
+ ],
+ "InstanceID": [
{
"group_name": "Enabled"
}
],
- "RefreshTokenDeviceId": [
+ "IntelligentSessionRestore": [
{
"group_name": "Enabled"
}
@@ -28,10 +38,15 @@
{
"group_name": "Enabled",
"params": {
- "alternate_protocol_probability_threshold": "0.01"
+ "alternate_protocol_probability_threshold": "0.01"
}
}
],
+ "RefreshTokenDeviceId": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
"ReportCertificateErrors": [
{
"group_name": "ShowAndPossiblySend",
@@ -61,6 +76,17 @@
"group_name": "DontShowAndDontSend"
}
],
+ "SafeBrowsingReportPhishingErrorLink": [
+ {
+ "group_name": "Enabled"
+ },
+ {
+ "group_name": "Control"
+ },
+ {
+ "group_name": "Disabled"
+ }
+ ],
"SdchPersistence": [
{
"group_name": "Enabled"
@@ -74,7 +100,7 @@
"group_name": "Disabled"
}
],
- "AutofillFieldMetadata": [
+ "TabSyncByRecency": [
{
"group_name": "Enabled"
}
@@ -91,31 +117,5 @@
"fetch_period_min": "30"
}
}
- ],
- "ExtensionInstallVerification": [
- {
- "group_name": "Enforce"
- }
- ],
- "ExtensionDeveloperModeWarning": [
- {
- "group_name": "Enabled"
- }
- ],
- "TabSyncByRecency": [
- {
- "group_name": "Enabled"
- }
- ],
- "SafeBrowsingReportPhishingErrorLink": [
- {
- "group_name": "Enabled"
- },
- {
- "group_name": "Control"
- },
- {
- "group_name": "Disabled"
- }
]
}
diff --git a/testing/variations/fieldtrial_testing_config_win.json b/testing/variations/fieldtrial_testing_config_win.json
index 7e73d3e..3678cb8 100644
--- a/testing/variations/fieldtrial_testing_config_win.json
+++ b/testing/variations/fieldtrial_testing_config_win.json
@@ -1,4 +1,9 @@
{
+ "AutofillFieldMetadata": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
"AutomaticTabDiscarding": [
{
"group_name": "Enabled"
@@ -63,23 +68,23 @@
{
"group_name": "Enabled",
"params": {
- "Unknown.DefaultMedianRTTMsec": "121",
- "Unknown.DefaultMedianKbps": "1916",
- "Ethernet.DefaultMedianRTTMsec": "106",
- "Ethernet.DefaultMedianKbps": "3263",
- "WiFi.DefaultMedianRTTMsec": "168",
- "WiFi.DefaultMedianKbps": "2736",
- "2G.DefaultMedianRTTMsec": "1337",
"2G.DefaultMedianKbps": "81",
- "3G.DefaultMedianRTTMsec": "297",
+ "2G.DefaultMedianRTTMsec": "1337",
"3G.DefaultMedianKbps": "658",
- "4G.DefaultMedianRTTMsec": "159",
+ "3G.DefaultMedianRTTMsec": "297",
"4G.DefaultMedianKbps": "1756",
- "None.DefaultMedianRTTMsec": "272",
- "None.DefaultMedianKbps": "567",
- "Bluetooth.DefaultMedianRTTMsec": "135",
+ "4G.DefaultMedianRTTMsec": "159",
"Bluetooth.DefaultMedianKbps": "449",
- "HalfLifeSeconds": "60"
+ "Bluetooth.DefaultMedianRTTMsec": "135",
+ "Ethernet.DefaultMedianKbps": "3263",
+ "Ethernet.DefaultMedianRTTMsec": "106",
+ "HalfLifeSeconds": "60",
+ "None.DefaultMedianKbps": "567",
+ "None.DefaultMedianRTTMsec": "272",
+ "Unknown.DefaultMedianKbps": "1916",
+ "Unknown.DefaultMedianRTTMsec": "121",
+ "WiFi.DefaultMedianKbps": "2736",
+ "WiFi.DefaultMedianRTTMsec": "168"
}
}
],
@@ -97,7 +102,7 @@
{
"group_name": "Enabled",
"params": {
- "alternate_protocol_probability_threshold": "0.01"
+ "alternate_protocol_probability_threshold": "0.01"
}
}
],
@@ -106,16 +111,6 @@
"group_name": "Enabled"
}
],
- "SRTPromptFieldTrial": [
- {
- "group_name": "Default"
- }
- ],
- "SettingsEnforcement": [
- {
- "group_name": "enforce_always_with_extensions_and_dse"
- }
- ],
"ReportCertificateErrors": [
{
"group_name": "ShowAndPossiblySend",
@@ -145,22 +140,38 @@
"group_name": "DontShowAndDontSend"
}
],
- "SdchPersistence": [
+ "SRTPromptFieldTrial": [
{
- "group_name": "Enabled"
+ "group_name": "Default"
}
],
- "SyncHttpContentCompression": [
+ "SafeBrowsingReportPhishingErrorLink": [
{
"group_name": "Enabled"
},
{
+ "group_name": "Control"
+ },
+ {
"group_name": "Disabled"
}
],
- "AutofillFieldMetadata": [
+ "SdchPersistence": [
+ {
+ "group_name": "Enabled"
+ }
+ ],
+ "SettingsEnforcement": [
+ {
+ "group_name": "enforce_always_with_extensions_and_dse"
+ }
+ ],
+ "SyncHttpContentCompression": [
{
"group_name": "Enabled"
+ },
+ {
+ "group_name": "Disabled"
}
],
"TabSyncByRecency": [
@@ -180,16 +191,5 @@
"fetch_period_min": "30"
}
}
- ],
- "SafeBrowsingReportPhishingErrorLink": [
- {
- "group_name": "Enabled"
- },
- {
- "group_name": "Control"
- },
- {
- "group_name": "Disabled"
- }
]
}