Remove some dead code from X509Certificate

BUG=none


Review URL: http://codereview.chromium.org/8416063

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

3 files changed, 17 insertions, 38 deletions

diff --git a/net/base/x509_certificate.cc b/net/base/x509_certificate.cc
index 6624493..e1fca4e 100644
--- a/net/base/x509_certificate.cc
+++ b/net/base/x509_certificate.cc
@@ -444,22 +444,6 @@ bool X509Certificate::Equals(const X509Certificate* other) const {
   return IsSameOSCert(cert_handle_, other->cert_handle_);
 }
 
-bool X509Certificate::HasIntermediateCertificate(OSCertHandle cert) {
-  for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) {
-    if (IsSameOSCert(cert, intermediate_ca_certs_[i]))
-      return true;
-  }
-  return false;
-}
-
-bool X509Certificate::HasIntermediateCertificates(const OSCertHandles& certs) {
-  for (size_t i = 0; i < certs.size(); ++i) {
-    if (!HasIntermediateCertificate(certs[i]))
-      return false;
-  }
-  return true;
-}
-
 // static
 bool X509Certificate::VerifyHostname(
     const std::string& hostname,
diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h
index 6d34437..8337c7b 100644
--- a/net/base/x509_certificate.h
+++ b/net/base/x509_certificate.h
@@ -242,12 +242,6 @@ class NET_EXPORT X509Certificate
     return intermediate_ca_certs_;
   }
 
-  // Returns true if I already contain the given intermediate cert.
-  bool HasIntermediateCertificate(OSCertHandle cert);
-
-  // Returns true if I already contain all the given intermediate certs.
-  bool HasIntermediateCertificates(const OSCertHandles& certs);
-
 #if defined(OS_MACOSX)
   // Does this certificate's usage allow SSL client authentication?
   bool SupportsSSLClientAuth() const;
diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc
index 21416b1..17bb919 100644
--- a/net/base/x509_certificate_unittest.cc
+++ b/net/base/x509_certificate_unittest.cc
@@ -832,8 +832,15 @@ TEST(X509CertificateTest, Pickle) {
   ASSERT_NE(static_cast<X509Certificate*>(NULL), cert_from_pickle);
   EXPECT_TRUE(X509Certificate::IsSameOSCert(
       cert->os_cert_handle(), cert_from_pickle->os_cert_handle()));
-  EXPECT_TRUE(cert->HasIntermediateCertificates(
-      cert_from_pickle->GetIntermediateCertificates()));
+  const X509Certificate::OSCertHandles& cert_intermediates =
+      cert->GetIntermediateCertificates();
+  const X509Certificate::OSCertHandles& pickle_intermediates =
+      cert_from_pickle->GetIntermediateCertificates();
+  ASSERT_EQ(cert_intermediates.size(), pickle_intermediates.size());
+  for (size_t i = 0; i < cert_intermediates.size(); ++i) {
+    EXPECT_TRUE(X509Certificate::IsSameOSCert(cert_intermediates[i],
+                                              pickle_intermediates[i]));
+  }
 }
 
 TEST(X509CertificateTest, Policy) {
@@ -881,11 +888,6 @@ TEST(X509CertificateTest, IntermediateCertificates) {
       X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(thawte_der), sizeof(thawte_der)));
 
-  scoped_refptr<X509Certificate> paypal_cert(
-      X509Certificate::CreateFromBytes(
-          reinterpret_cast<const char*>(paypal_null_der),
-          sizeof(paypal_null_der)));
-
   X509Certificate::OSCertHandle google_handle;
   // Create object with no intermediates:
   google_handle = X509Certificate::CreateOSCertHandleFromBytes(
@@ -893,9 +895,7 @@ TEST(X509CertificateTest, IntermediateCertificates) {
   X509Certificate::OSCertHandles intermediates1;
   scoped_refptr<X509Certificate> cert1;
   cert1 = X509Certificate::CreateFromHandle(google_handle, intermediates1);
-  EXPECT_TRUE(cert1->HasIntermediateCertificates(intermediates1));
-  EXPECT_FALSE(cert1->HasIntermediateCertificate(
-      webkit_cert->os_cert_handle()));
+  EXPECT_EQ(0u, cert1->GetIntermediateCertificates().size());
 
   // Create object with 2 intermediates:
   X509Certificate::OSCertHandles intermediates2;
@@ -905,12 +905,13 @@ TEST(X509CertificateTest, IntermediateCertificates) {
   cert2 = X509Certificate::CreateFromHandle(google_handle, intermediates2);
 
   // Verify it has all the intermediates:
-  EXPECT_TRUE(cert2->HasIntermediateCertificate(
-      webkit_cert->os_cert_handle()));
-  EXPECT_TRUE(cert2->HasIntermediateCertificate(
-      thawte_cert->os_cert_handle()));
-  EXPECT_FALSE(cert2->HasIntermediateCertificate(
-      paypal_cert->os_cert_handle()));
+  const X509Certificate::OSCertHandles& cert2_intermediates =
+      cert2->GetIntermediateCertificates();
+  ASSERT_EQ(2u, cert2_intermediates.size());
+  EXPECT_TRUE(X509Certificate::IsSameOSCert(cert2_intermediates[0],
+                                            webkit_cert->os_cert_handle()));
+  EXPECT_TRUE(X509Certificate::IsSameOSCert(cert2_intermediates[1],
+                                            thawte_cert->os_cert_handle()));
 
   // Cleanup
   X509Certificate::FreeOSCertHandle(google_handle);