Upstream: Build net_unittests for Android.

net/base/x509_certificate_openssl.cc

Index: net/base/x509_certificate_openssl.cc
diff --git a/net/base/x509_certificate_openssl.cc b/net/base/x509_certificate_openssl.cc
index 8583e4d0dccda38def3669309e0fea1c65669105..3b6fe0ce5bf341ac69f2cce69e13d75f15b64979 100644
--- a/net/base/x509_certificate_openssl.cc
+++ b/net/base/x509_certificate_openssl.cc
@@ -27,8 +27,6 @@
 
 namespace net {
 
-namespace {
-
 void CreateOSCertHandlesFromPKCS7Bytes(
     const char* data, int length,
     X509Certificate::OSCertHandles* handles) {
@@ -205,11 +203,6 @@ void sk_X509_free_fn(STACK_OF(X509)* st) {
   sk_X509_free(st);
 }
 
-struct DERCache {
-  unsigned char* data;
-  int data_length;
-};
-
 void DERCache_free(void* parent, void* ptr, CRYPTO_EX_DATA* ad, int idx,
                    long argl, void* argp) {
   DERCache* der_cache = static_cast<DERCache*>(ptr);
@@ -300,8 +293,6 @@ bool GetDERAndCacheIfNeeded(X509Certificate::OSCertHandle cert,
   return true;
 }
 
-}  // namespace

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

shouldn't be any need for any of these edits

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

Done.

-
 // static
 X509Certificate::OSCertHandle X509Certificate::DupOSCertHandle(
     OSCertHandle cert_handle) {