SSLUITest.SHA1IsDefaultDisabled: fix Mac 10.15 specific expectation when using builtin verifier

Bug: 1108632
Change-Id: Ia1ab7aaabe38f5c9d15fcb781768fae29b59c716
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321555
Commit-Queue: Matt Mueller <mattm@chromium.org>
Commit-Queue: Ryan Sleevi <rsleevi@chromium.org>
Auto-Submit: Matt Mueller <mattm@chromium.org>
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792343}

chrome/browser/ssl/ssl_browsertest.cc

@@ -1609,10 +1609,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, SHA1IsDefaultDisabled) {
 #if defined(OS_MACOSX)
   // On macOS 10.15 (and presumably later) SHA1 certs are considered prima
   // facie invalid by the system verifier.
-  // TODO(https://crbug.com/977767): Reconsider this when the built-in verifier
-  // is used on Mac.
-  if (base::mac::IsAtLeastOS10_15())
+  // TODO(https://crbug.com/977767): Remove this when CertVerifyProcMac is
+  // removed.
+  if (base::mac::IsAtLeastOS10_15() &&
+      !base::FeatureList::IsEnabled(
+          net::features::kCertVerifierBuiltinFeature)) {
     expected_error |= net::CERT_STATUS_INVALID;
+  }
 #endif
 
   ssl_test_util::CheckAuthenticationBrokenState(