Unit test now runs on the Mac.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2421 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 11 deletions

diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h
index 763084b..c9f872a 100644
--- a/net/base/x509_certificate.h
+++ b/net/base/x509_certificate.h
@@ -137,7 +137,6 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> {
   // The issuer of the certificate.
   const Principal& issuer() const { return issuer_; }
 
-#if defined(OS_WIN)
   // Time period during which the certificate is valid.  More precisely, this
   // certificate is invalid before the |valid_start| date and invalid after
   // the |valid_expiry| date.
@@ -145,12 +144,6 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> {
   // lacks either date), the date will be null (i.e., is_null() will be true).
   const Time& valid_start() const { return valid_start_; }
   const Time& valid_expiry() const { return valid_expiry_; }
-#elif defined(OS_MACOSX)
-  // These are used only for some UI, where HasExpired is used to disambiguate a
-  // time error on the certificate as a "too old" or "too young" error. On the
-  // Mac you get different codes for those. There's no easy way of pulling dates
-  // out of the cert short of CSSM, so these remain unimplemented for now.
-#endif
 
   // The fingerprint of this certificate.
   const Fingerprint& fingerprint() const { return fingerprint_; }
@@ -161,11 +154,9 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> {
   // Otherwise, it gets the common name in the subject field.
   void GetDNSNames(std::vector<std::string>* dns_names) const;
 
-#if defined(OS_WIN)
   // Convenience method that returns whether this certificate has expired as of
   // now.
   bool HasExpired() const;
-#endif
 
   // Returns true if the certificate is an extended-validation (EV)
   // certificate.
@@ -200,13 +191,11 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> {
   // The issuer of the certificate.
   Principal issuer_;
 
-#if defined(OS_WIN)
   // This certificate is not valid before |valid_start_|
   Time valid_start_;
 
   // This certificate is not valid after |valid_expiry_|
   Time valid_expiry_;
-#endif
 
   // The fingerprint of this certificate.
   Fingerprint fingerprint_;