[go: nahoru, domu]

Remove code for using NSS builtin roots

Bug: 1412591
Change-Id: I88ddea378602ec435fa40b77f5950fbe09c6ecde
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4902161
Reviewed-by: Hubert Chao <hchao@chromium.org>
Commit-Queue: Matt Mueller <mattm@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1205302}
diff --git a/net/features.gni b/net/features.gni
index 62407a0..a120775 100644
--- a/net/features.gni
+++ b/net/features.gni
@@ -45,12 +45,11 @@
   # flag is false, verification may be done with the platform verifier or the
   # builtin verifier using platform roots, depending on the platform.
   # See https://crbug.com/1216547 for status.
-  chrome_root_store_optional =
-      (is_android && !is_cronet_build) || is_linux || is_chromeos
+  chrome_root_store_optional = is_android && !is_cronet_build
 
   # Platforms for which certificate verification can only be performed using
   # the builtin cert verifier with the Chrome Root Store.
-  chrome_root_store_only = is_win || is_mac
+  chrome_root_store_only = is_win || is_mac || is_linux || is_chromeos
 }
 
 assert(!chrome_root_store_optional || !chrome_root_store_only,