Enable CertVerifierBuiltin by default on ChromeOS

Bug: 973650
Change-Id: I2582de3119a22fb32385ed8eb22d097a112d316c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1925222Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Reviewed-by: Nik Bhagat <nikunjb@chromium.org>
Auto-Submit: Matt Mueller <mattm@chromium.org>
Commit-Queue: Mark Pearson <mpearson@chromium.org>
Commit-Queue: Nik Bhagat <nikunjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718239}

net/base/features.cc

@@ -74,8 +74,14 @@ const base::Feature kSameSiteDefaultChecksMethodRigorously{
     "SameSiteDefaultChecksMethodRigorously", base::FEATURE_DISABLED_BY_DEFAULT};
 
 #if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED)
-const base::Feature kCertVerifierBuiltinFeature{
-    "CertVerifierBuiltin", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kCertVerifierBuiltinFeature {
+  "CertVerifierBuiltin",
+#if defined(OS_CHROMEOS)
+      base::FEATURE_ENABLED_BY_DEFAULT
+#else
+      base::FEATURE_DISABLED_BY_DEFAULT
+#endif
+};
 #endif
 
 const base::Feature kAppendFrameOriginToNetworkIsolationKey{

testing/variations/fieldtrial_testing_config.json

@@ -1504,19 +1504,6 @@
         }
     ],
     "CertVerifierBuiltin": [
-        {
-            "platforms": [
-                "chromeos"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "CertVerifierBuiltin"
-                    ]
-                }
-            ]
-        },
         {
             "platforms": [
                 "linux"