[MO] Merge AMS's two entries in fieldtrial_testing_config.json

Merge "PartitionAllocSchedulerLoopQuarantine" and "PartitionAllocZappingByFreeFlags". Bug: 1462223 Change-Id: I324c6582cd1df21564a38a65cbaa77027b5bf68f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5087013 Commit-Queue: Mikihito Matsuura <mikt@google.com> Reviewed-by: Keishi Hattori <keishi@chromium.org> Cr-Commit-Position: refs/heads/main@{#1233785}
qweri0p · Dec 6, 2023 · 639a005 · 639a005
1 parent 55d2457
commit 639a005
Showing 1 changed file with 26 additions and 45 deletions.
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
@@ -12596,6 +12596,32 @@
             ]
         }
     ],
+    "PartitionAllocAdvancedMemorySafetyChecks": [
+        {
+            "platforms": [
+                "android",
+                "android_webview",
+                "chromeos",
+                "chromeos_lacros",
+                "fuchsia",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "params": {
+                        "PartitionAllocSchedulerLoopQuarantineCapacity": "1048576"
+                    },
+                    "enable_features": [
+                        "PartitionAllocSchedulerLoopQuarantine",
+                        "PartitionAllocZappingByFreeFlags"
+                    ]
+                }
+            ]
+        }
+    ],
     "PartitionAllocBackupRefPtr16BRefcount": [
         {
             "platforms": [
@@ -12809,30 +12835,6 @@
             ]
         }
     ],
-    "PartitionAllocSchedulerLoopQuarantine": [
-        {
-            "platforms": [
-                "android",
-                "chromeos",
-                "chromeos_lacros",
-                "fuchsia",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "params": {
-                        "PartitionAllocSchedulerLoopQuarantineCapacity": "1048576"
-                    },
-                    "enable_features": [
-                        "PartitionAllocSchedulerLoopQuarantine"
-                    ]
-                }
-            ]
-        }
-    ],
     "PartitionAllocUnretainedDanglingPtr": [
         {
             "platforms": [
@@ -12857,27 +12859,6 @@
             ]
         }
     ],
-    "PartitionAllocZappingByFreeFlags": [
-        {
-            "platforms": [
-                "android",
-                "chromeos",
-                "chromeos_lacros",
-                "fuchsia",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "PartitionAllocZappingByFreeFlags"
-                    ]
-                }
-            ]
-        }
-    ],
     "PartitionAllocatorAlternateBucketDist": [
         {
             "platforms": [