Enable CertVerifierBuiltin by default on Linux, disable TrialComparis…

…onCertVerifier on Linux Bug: 973650 Change-Id: I10d86d2fa7a573f2f22abdb09878ceeca05a0411 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1985033 Reviewed-by: Ryan Sleevi <rsleevi@chromium.org> Reviewed-by: Ilya Sherman <isherman@chromium.org> Auto-Submit: Matt Mueller <mattm@chromium.org> Commit-Queue: Matt Mueller <mattm@chromium.org> Cr-Commit-Position: refs/heads/master@{#728744}
marcosholgado · Jan 7, 2020 · c136bf5 · c136bf5
1 parent d097f13
commit c136bf5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 20 deletions.
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
@@ -142,7 +142,7 @@ const base::Feature kThirdPartyModulesBlocking{
 const base::Feature kTLS13HardeningForLocalAnchors{
     "TLS13HardeningForLocalAnchors", base::FEATURE_ENABLED_BY_DEFAULT};
 
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+#if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED)
 // Enables the dual certificate verification trial feature.
 // https://crbug.com/649026
 const base::Feature kCertDualVerificationTrialFeature{

diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h
@@ -81,7 +81,7 @@ extern const base::Feature kBundledConnectionHelpFeature;
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kCaptionSettings;
 
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+#if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED)
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kCertDualVerificationTrialFeature;
 #endif

diff --git a/net/base/features.cc b/net/base/features.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "net/base/features.h"
+#include "build/build_config.h"
 
 namespace net {
 namespace features {
@@ -87,7 +88,7 @@ const base::FeatureParam<int>
 #if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED)
 const base::Feature kCertVerifierBuiltinFeature {
   "CertVerifierBuiltin",
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
       base::FEATURE_ENABLED_BY_DEFAULT
 #else
       base::FEATURE_DISABLED_BY_DEFAULT

diff --git a/net/features.gni b/net/features.gni
@@ -38,7 +38,7 @@ declare_args() {
 
   # Platforms where the cert verifier comparison trial is supported.
   # See https://crbug.com/649026.
-  trial_comparison_cert_verifier_supported = is_desktop_linux || is_mac
+  trial_comparison_cert_verifier_supported = is_mac
 
   # Platforms where both the builtin cert verifier and a platform verifier are
   # supported and may be switched between using the CertVerifierBuiltin feature

diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
@@ -1535,7 +1535,6 @@
     "CertDualVerificationTrial": [
         {
             "platforms": [
-                "linux",
                 "mac"
             ],
             "experiments": [
@@ -1548,21 +1547,6 @@
             ]
         }
     ],
-    "CertVerifierBuiltin": [
-        {
-            "platforms": [
-                "linux"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled_V2",
-                    "enable_features": [
-                        "CertVerifierBuiltin"
-                    ]
-                }
-            ]
-        }
-    ],
     "ChromeCleanupDistribution": [
         {
             "platforms": [