Separate CertVerifyProcAndroid from CertVerifyProcOpenSSL

net/base/cert_verify_proc.cc

 // Copyright (c) 2012 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/base/cert_verify_proc.h"
 
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
 #include "build/build_config.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/crl_set.h"
 #include "net/base/net_errors.h"
 #include "net/base/x509_certificate.h"
 
 #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)
 #include "net/base/cert_verify_proc_mac.h"
 #elif defined(OS_WIN)
 #include "net/base/cert_verify_proc_win.h"
 #else
 #error Implement certificate verification.
 #endif
 
@@ skipping 15 matching lines @@
       return false;
   }
 }
 
 }  // namespace
 
 // static
 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)
   return new CertVerifyProcMac();
 #elif defined(OS_WIN)
   return new CertVerifyProcWin();
 #else
   return NULL;
 #endif
 }
@@ skipping 210 matching lines @@
           memcmp(j->data(), kHashes[i], base::kSHA1Length) == 0) {
         return true;
       }
     }
   }
 
   return false;
 }
 
 }  // namespace net