Revert of Convert android to use X509CertificateBytes instead of X509CertificateOpenSSL.

net/ssl/openssl_ssl_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/openssl_ssl_util.h"
 
 #include <errno.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 209 matching lines @@
     case TLS1_3_VERSION:
       return SSL_CONNECTION_VERSION_TLS1_3;
     default:
       NOTREACHED();
       return SSL_CONNECTION_VERSION_UNKNOWN;
   }
 }
 
 bssl::UniquePtr<X509> OSCertHandleToOpenSSL(
     X509Certificate::OSCertHandle os_handle) {
-#if BUILDFLAG(USE_BYTE_CERTS)
-  return bssl::UniquePtr<X509>(X509_parse_from_buffer(os_handle));
-#elif defined(USE_OPENSSL_CERTS)
+#if defined(USE_OPENSSL_CERTS)
   return bssl::UniquePtr<X509>(X509Certificate::DupOSCertHandle(os_handle));
-#else   // !defined(USE_OPENSSL_CERTS) && !BUILDFLAG(USE_BYTE_CERTS)
+#else   // !defined(USE_OPENSSL_CERTS)
   std::string der_encoded;
   if (!X509Certificate::GetDEREncoded(os_handle, &der_encoded))
     return bssl::UniquePtr<X509>();
   const uint8_t* bytes = reinterpret_cast<const uint8_t*>(der_encoded.data());
   return bssl::UniquePtr<X509>(d2i_X509(NULL, &bytes, der_encoded.size()));
-#endif  // defined(USE_OPENSSL_CERTS) && BUILDFLAG(USE_BYTE_CERTS)
+#endif  // defined(USE_OPENSSL_CERTS)
 }
 
 bssl::UniquePtr<STACK_OF(X509)> OSCertHandlesToOpenSSL(
     const X509Certificate::OSCertHandles& os_handles) {
   bssl::UniquePtr<STACK_OF(X509)> stack(sk_X509_new_null());
   for (size_t i = 0; i < os_handles.size(); i++) {
     bssl::UniquePtr<X509> x509 = OSCertHandleToOpenSSL(os_handles[i]);
     if (!x509)
       return nullptr;
     sk_X509_push(stack.get(), x509.release());
   }
   return stack;
 }
 
 }  // namespace net