Make OpenSSL UpdateServerCert() OS independent.

net/cert/x509_certificate_mac.cc

Index: net/cert/x509_certificate_mac.cc
diff --git a/net/cert/x509_certificate_mac.cc b/net/cert/x509_certificate_mac.cc
index 1d874c4b023b29541eb0dc5883e34c5d78c00335..f49587b17d97a8e4e12f58f7419b375d76828b7e 100644
--- a/net/cert/x509_certificate_mac.cc
+++ b/net/cert/x509_certificate_mac.cc
@@ -8,8 +8,6 @@
 #include <CoreServices/CoreServices.h>
 #include <Security/Security.h>
 
-#include <cert.h>
-
 #include <vector>
 
 #include "base/lazy_instance.h"
@@ -206,18 +204,6 @@ struct CSSMOIDString {
 
 typedef std::vector<CSSMOIDString> CSSMOIDStringVector;
 
-class ScopedCertName {
- public:
-  explicit ScopedCertName(CERTName* name) : name_(name) { }
-  ~ScopedCertName() {
-    if (name_) CERT_DestroyName(name_);
-  }
-  operator CERTName*() { return name_; }
-
- private:
-  CERTName* name_;
-};

[Ryan Sleevi, 2014/02/21 22:34:38]

Unrelated cleanups are best left for a separate CL.

-
 class ScopedEncodedCertResults {
  public:
   explicit ScopedEncodedCertResults(CSSM_TP_RESULT_SET* results)