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..dfade6b878448f5dd89ac765db7effafad1cb4d9 100644
--- a/net/base/cert_verify_proc.cc
+++ b/net/base/cert_verify_proc.cc
@@ -16,6 +16,8 @@
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #include "net/base/cert_verify_proc_nss.h"
+#elif defined(OS_ANDROID)
+#include "net/base/cert_verify_proc_android.h"
 #elif defined(USE_OPENSSL)
 #include "net/base/cert_verify_proc_openssl.h"
 #elif defined(OS_MACOSX)
@@ -51,6 +53,8 @@ bool IsWeakKey(X509Certificate::PublicKeyType type, size_t size_bits) {
 CertVerifyProc* CertVerifyProc::CreateDefault() {
 #if defined(USE_NSS) || defined(OS_IOS)
   return new CertVerifyProcNSS();
+#elif defined(OS_ANDROID)
+  return new CertVerifyProcAndroid();

[Ryan Sleevi, 2012/12/13 02:16:36]

In "most" places, we try to follow the order of

if USE_X
elif USE Y
elif OS_A
elif OS_B
elif OS_C

so that USE_ directives always take precedence. Mostly due to how OS_ variables
can clash (eg: OS_IOS)

perhaps

#elif defined(USE_OPENSSL) && !defined(USE_ANDROID)

I'm not strictly wedded to this, but I like this style because I think it makes
it clearer the relationship between these two variables then the positional form
(ie: what you have)

[ppi, 2012/12/13 04:49:09]

Thanks, I agree that your suggested form is clearer. Addressed in patch set 2.

 #elif defined(USE_OPENSSL)
   return new CertVerifyProcOpenSSL();
 #elif defined(OS_MACOSX)