Introduce USE_OPENSSL_CERTS for certificate handling.

net/cert/cert_verify_proc.cc

Index: net/cert/cert_verify_proc.cc
diff --git a/net/cert/cert_verify_proc.cc b/net/cert/cert_verify_proc.cc
index 04f330ff88f969e4f1cb3ee4c62c18cb62fd73cd..54dd58490bfff46478f6ef8de1f66a39bddaf79d 100644
--- a/net/cert/cert_verify_proc.cc
+++ b/net/cert/cert_verify_proc.cc
@@ -20,7 +20,7 @@
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #include "net/cert/cert_verify_proc_nss.h"
-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
+#elif defined(USE_OPENSSL_CERTS)

[Ryan Sleevi, 2014/03/21 19:47:51]

Shouldn't you still have a !defined(OS_ANDROID) here?

[haavardm, 2014/03/24 18:48:52]

Currently you are wrong. The way I  set this up, USE_OPENSSL_CERTS is off on
OS_ANDROID. I will change this though, as wtc suggested. After that change you
are right :)

[haavardm, 2014/03/24 18:48:52]

Done.

 #include "net/cert/cert_verify_proc_openssl.h"
 #elif defined(OS_ANDROID)
 #include "net/cert/cert_verify_proc_android.h"
@@ -167,7 +167,7 @@ bool ExaminePublicKeys(const scoped_refptr<X509Certificate>& cert,
 CertVerifyProc* CertVerifyProc::CreateDefault() {
 #if defined(USE_NSS) || defined(OS_IOS)
   return new CertVerifyProcNSS();
-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
+#elif defined(USE_OPENSSL_CERTS)

[Ryan Sleevi, 2014/03/21 19:47:51]

ditto

[haavardm, 2014/03/24 18:48:52]

Done.

   return new CertVerifyProcOpenSSL();
 #elif defined(OS_ANDROID)
   return new CertVerifyProcAndroid();