Cleanup after debugging with the XP builder.

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

2 files changed, 3 insertions, 23 deletions

diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc
index acf5ddf..cb7a1c7 100644
--- a/net/base/x509_certificate_unittest.cc
+++ b/net/base/x509_certificate_unittest.cc
@@ -1462,9 +1462,7 @@ TEST(X509CertificateTest, CRLSet) {
 
   error = google_full_chain->Verify(
       "www.google.com", 0, crl_set.get(), &verify_result);
-  LOG(ERROR) << "Thawte SPKI test: " << error;
-  // TODO(agl): disabled in order to debug this test on WinXP bots.
-  // EXPECT_EQ(ERR_CERT_REVOKED, error);
+  EXPECT_EQ(ERR_CERT_REVOKED, error);
 
   // Second, test revocation by serial number of a cert directly under the
   // root.
@@ -1475,9 +1473,7 @@ TEST(X509CertificateTest, CRLSet) {
 
   error = google_full_chain->Verify(
       "www.google.com", 0, crl_set.get(), &verify_result);
-  LOG(ERROR) << "Thawte Serial test: " << error;
-  // TODO(agl): disabled in order to debug this test on WinXP bots.
-  // EXPECT_EQ(ERR_CERT_REVOKED, error);
+  EXPECT_EQ(ERR_CERT_REVOKED, error);
 
   // Lastly, test revocation by serial number of a certificate not under the
   // root.
@@ -1488,9 +1484,7 @@ TEST(X509CertificateTest, CRLSet) {
 
   error = google_full_chain->Verify(
       "www.google.com", 0, crl_set.get(), &verify_result);
-  LOG(ERROR) << "Leaf serial: " << error;
-  // TODO(agl): disabled in order to debug this test on WinXP bots.
-  // EXPECT_EQ(ERR_CERT_REVOKED, error);
+  EXPECT_EQ(ERR_CERT_REVOKED, error);
 }
 #endif
 
diff --git a/net/base/x509_certificate_win.cc b/net/base/x509_certificate_win.cc
index 6e143d9..add61b4 100644
--- a/net/base/x509_certificate_win.cc
+++ b/net/base/x509_certificate_win.cc
@@ -15,7 +15,6 @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/string_number_conversions.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/scoped_capi_types.h"
 #include "crypto/sha2.h"
@@ -481,28 +480,15 @@ bool CheckRevocationWithCRLSet(PCCERT_CHAIN_CONTEXT chain,
         reinterpret_cast<const char*>(cert->pbCertEncoded),
         cert->cbCertEncoded);
 
-    LOG(ERROR) << "#" << i << " cert: "
-               << base::HexEncode(der_bytes.data(), der_bytes.size());
-
     base::StringPiece spki;
     if (!asn1::ExtractSPKIFromDERCert(der_bytes, &spki)) {
       NOTREACHED();
       continue;
     }
 
-    LOG(ERROR) << "#" << i << " spki: "
-               << base::HexEncode(spki.data(), spki.size());
-
     const std::string spki_hash = crypto::SHA256HashString(spki);
 
-    LOG(ERROR) << "#" << i << " spki_hash: "
-               << base::HexEncode(spki_hash.data(), spki_hash.size());
-
     const CRYPT_INTEGER_BLOB* serial_blob = &cert->pCertInfo->SerialNumber;
-    // FIXME(agl): I'm in the middle of debugging this on the builders.
-    LOG(ERROR) << "#" << i << " serial blob: "
-               << base::HexEncode(serial_blob->pbData, serial_blob->cbData);
-
     scoped_array<uint8> serial_bytes(new uint8[serial_blob->cbData]);
     // The bytes of the serial number are stored little-endian.
     for (unsigned j = 0; j < serial_blob->cbData; j++)