Separate CertVerifyProcAndroid from CertVerifyProcOpenSSL

net/base/cert_verify_proc.cc

Index: net/base/cert_verify_proc.cc
diff --git a/net/base/cert_verify_proc.cc b/net/base/cert_verify_proc.cc
index 31ff0d51a678915665a9032f719bdfd551374a2c..7fa8cb4f44fee3af4848b19de90a827c8e15358f 100644
--- a/net/base/cert_verify_proc.cc
+++ b/net/base/cert_verify_proc.cc
@@ -16,8 +16,10 @@
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #include "net/base/cert_verify_proc_nss.h"
-#elif defined(USE_OPENSSL)
+#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
 #include "net/base/cert_verify_proc_openssl.h"
+#elif defined(OS_ANDROID)
+#include "net/base/cert_verify_proc_android.h"
 #elif defined(OS_MACOSX)
 #include "net/base/cert_verify_proc_mac.h"
 #elif defined(OS_WIN)
@@ -51,8 +53,10 @@ bool IsWeakKey(X509Certificate::PublicKeyType type, size_t size_bits) {
 CertVerifyProc* CertVerifyProc::CreateDefault() {
 #if defined(USE_NSS) || defined(OS_IOS)
   return new CertVerifyProcNSS();
-#elif defined(USE_OPENSSL)
+#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
   return new CertVerifyProcOpenSSL();
+#elif defined(OS_ANDROID)
+  return new CertVerifyProcAndroid();
 #elif defined(OS_MACOSX)
   return new CertVerifyProcMac();
 #elif defined(OS_WIN)