Introduce USE_OPENSSL_CERTS for certificate handling.

net/cert/test_root_certs.h

Index: net/cert/test_root_certs.h
diff --git a/net/cert/test_root_certs.h b/net/cert/test_root_certs.h
index cf35a2af126a0422db2b9517550a2cda7c99f4c0..d2fcb61ee021373b56ed7f8ede472c43084506f9 100644
--- a/net/cert/test_root_certs.h
+++ b/net/cert/test_root_certs.h
@@ -12,7 +12,7 @@
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #include <list>
-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
+#elif defined(USE_OPENSSL_CERTS)

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

I don't understand why no more OS_ANDROID check?

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

Because USE_OPENSSL_CERTS meant use OpenSSL for certificate verification.
Changed now, so it follows your understanding.

 #include <vector>
 #elif defined(OS_WIN)
 #include <windows.h>
@@ -25,7 +25,7 @@
 
 #if defined(USE_NSS)
 typedef struct CERTCertificateStr CERTCertificate;
-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
+#elif defined(USE_OPENSSL_CERTS)
 typedef struct x509_st X509;
 #endif
 
@@ -78,7 +78,7 @@ class NET_EXPORT TestRootCerts {
   // be trusted. By default, this is true, indicating that the TestRootCerts
   // are used in addition to OS trust store.
   void SetAllowSystemTrust(bool allow_system_trust);
-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
+#elif defined(USE_OPENSSL_CERTS)
   const std::vector<scoped_refptr<X509Certificate> >&
       temporary_roots() const { return temporary_roots_; }
   bool Contains(X509* cert) const;
@@ -106,7 +106,7 @@ class NET_EXPORT TestRootCerts {
   // settings, in order to restore them when Clear() is called.
   class TrustEntry;
   std::list<TrustEntry*> trust_cache_;
-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
+#elif defined(USE_OPENSSL_CERTS)
   std::vector<scoped_refptr<X509Certificate> > temporary_roots_;
 #elif defined(OS_WIN)
   HCERTSTORE temporary_roots_;