diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-11-04 12:30:10 +0000 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-11-04 12:30:10 +0000 |
| commit | fae709c2c4f0f14317e26be25b156b4ceb5572aa (patch) | |
| tree | 5c49c2395077ff33b5dd5e7d45303719b89a6ed6 /net/base | |
| parent | 2a3fa35dc168f711f2d6a07c66614f236b2202f3 (diff) | |
| download | external_chromium-fae709c2c4f0f14317e26be25b156b4ceb5572aa.zip external_chromium-fae709c2c4f0f14317e26be25b156b4ceb5572aa.tar.gz external_chromium-fae709c2c4f0f14317e26be25b156b4ceb5572aa.tar.bz2 | |
Remove unneeded local changes
Our local changes are in chromium, so we have them twice
Change-Id: I5dd1dd6d61555b114341fde11bd5336146b9b9fa
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/x509_certificate.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h index 8540ad6..577de92 100644 --- a/net/base/x509_certificate.h +++ b/net/base/x509_certificate.h @@ -28,9 +28,6 @@ struct x509_st; #elif defined(USE_NSS) // Forward declaration; real one in <cert.h> struct CERTCertificateStr; -#elif defined(USE_OPENSSL) && defined(ANDROID) -// real dec in x509.h -struct x509_st; #endif class Pickle; @@ -55,8 +52,6 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> { typedef struct x509_st* OSCertHandle; #elif defined(USE_NSS) typedef struct CERTCertificateStr* OSCertHandle; -#elif defined(USE_OPENSSL) && defined(ANDROID) - typedef struct x509_st* OSCertHandle; #else // TODO(ericroman): not implemented typedef void* OSCertHandle; |