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..8ee406975242f3deff7f826e0db969cc9c36d119 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) && !defined(OS_ANDROID)
 #include "net/cert/cert_verify_proc_openssl.h"
 #elif defined(OS_ANDROID)
 #include "net/cert/cert_verify_proc_android.h"

[wtc, 2014/03/25 17:18:28]

Nit: this can be simplified by careful reordering of the ifdefs:

  #elif defined(OS_ANDROID)
  #include "net/cert/cert_verify_proc_android.h"
  #elif defined(USE_OPENSSL_CERTS)
  #include "net/cert/cert_verify_proc_openssl.h"

If you like this, make the same change to the ifdefs inside
CertVerifyProc::CreateDefault().

[haavardm, 2014/03/25 17:43:04]

The current expression keeps the USE_FOOs, and OS_FOO's separated. The if-else
blocks seems to be  organized this way most places. 

On 2014/03/25 17:18:28, wtc wrote:

@@ -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) && !defined(OS_ANDROID)
   return new CertVerifyProcOpenSSL();
 #elif defined(OS_ANDROID)
   return new CertVerifyProcAndroid();