Upstream: Build net_unittests for Android.

net/base/x509_certificate.h

Index: net/base/x509_certificate.h
diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h
index 6d344379a701a549ec96b1dca8bf3e5eb9af27ff..529cc0823e65df1845a3042fd0714ddbe391d635 100644
--- a/net/base/x509_certificate.h
+++ b/net/base/x509_certificate.h
@@ -556,6 +556,14 @@ class NET_EXPORT X509Certificate
   DISALLOW_COPY_AND_ASSIGN(X509Certificate);
 };
 
+struct DERCache {
+  unsigned char* data;
+  int data_length;
+};
+
+bool GetDERAndCacheIfNeeded(X509Certificate::OSCertHandle cert,
+                            DERCache* der_cache);

[joth, 2011/11/02 18:57:05]

this doesn't belong here, as it's only needed on the _openssl versions.

I think we can just merge x509_certificate_openssl.cc and
x509_certificate_openssl_android.cc now they are living in the same repo (with
the appropriate internal #ifdefs)

-or- if we want to keep them separete introduce a x509_certificate_openssl.h to
declare the common functions between them.

I prefer the former though, as it will make it easier to share common parts of
VerifyInternal().


Note that either way, the GetChainDEREncodedBytes can be removed from this class
above. That would either live in the new .h file, or just be an internal detail
of the merged .cc

I'm happy to do a patch for this if that's not very clear!

[Jing Zhao, 2011/11/03 17:49:08]

Thanks. Merged as you suggested.

+
 }  // namespace net
 
 #endif  // NET_BASE_X509_CERTIFICATE_H_