Add a filedtrial_testing_config entry for SafetyCheckChromeCleanerChild

Since this file has a limited maximum size, a new entry can only be
added if one previous one is removed.

We remove the FriendlySettingsHats entry, as this study has been fully
launched and all corresponding features are enabled by default on
Desktop platforms.

Bug: 1097757
Change-Id: I59024c59c7c7754051fff90e194b40dea2b83a3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377935Reviewed-by: Sean Harrison <harrisonsean@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805165}

chrome/common/chrome_features.cc

@@ -653,7 +653,7 @@ const base::Feature kSafetyCheckAndroid{"SafetyCheckAndroid",
 
 #if defined(OS_WIN)
 const base::Feature kSafetyCheckChromeCleanerChild{
-    "SafetyCheckChromeCleanerChild", base::FEATURE_ENABLED_BY_DEFAULT};
+    "SafetyCheckChromeCleanerChild", base::FEATURE_DISABLED_BY_DEFAULT};
 #endif
 
 #if defined(OS_CHROMEOS)

testing/variations/fieldtrial_testing_config.json

@@ -2788,26 +2788,6 @@
             ]
         }
     ],
-    "FriendlySettingsHats": [
-        {
-            "platforms": [
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Launched_20200616",
-                    "enable_features": [
-                        "PrivacySettingsRedesign",
-                        "SafeBrowsingEnhancedProtection",
-                        "SyncSetupFriendlySettings"
-                    ]
-                }
-            ]
-        }
-    ],
     "FullscreenBrowserScope": [
         {
             "platforms": [
@@ -6228,6 +6208,24 @@
             ]
         }
     ],
+    "SafetyCheckChromeCleanerChild": [
+        {
+            "platforms": [
+                "chromeos",
+                "linux",
+                "mac",
+                "windows"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "SafetyCheckChromeCleanerChild"
+                    ]
+                }
+            ]
+        }
+    ],
     "SameSiteByDefaultCookies_AndroidAw": [
         {
             "platforms": [