Cleanup of OpenSSL/NSS implementation of ProofVerfifier release.

net/quic/crypto/proof_test.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/x509_certificate.h"
 #include "net/quic/crypto/proof_source.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/test/cert_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 using std::string;
 using std::vector;
 
 namespace net {
 namespace test {
 
 TEST(Proof, Verify) {
   // TODO(rtenneti): Enable testing of ProofVerifier.
 #if 0
   scoped_ptr<ProofSource> source(CryptoTestUtils::ProofSourceForTesting());
@@ skipping 227 matching lines @@
     rv = verifier->VerifyProof("foo.com", server_config, wrong_certs, signature,
                                &error_details, callback.callback());
     rv = callback.GetResult(rv);
     ASSERT_EQ(ERR_FAILED, rv);
     ASSERT_NE("", error_details);
   }
 }
 
 // A known answer test that allows us to test ProofVerifier without a working
 // ProofSource.
-// TODO(rtenneti): Enable VerifyECDSAKnownAnswerTest on win_rel and XP.
+// TODO(rtenneti): Enable VerifyECDSAKnownAnswerTest on Windows. Disabled this
+// test because X509Certificate::GetPublicKeyInfo is not returning the correct
+// type for ECDSA certificates.
 #if defined(OS_WIN)
 #define MAYBE_VerifyECDSAKnownAnswerTest DISABLED_VerifyECDSAKnownAnswerTest
 #else
 #define MAYBE_VerifyECDSAKnownAnswerTest VerifyECDSAKnownAnswerTest
 #endif
 TEST(Proof, MAYBE_VerifyECDSAKnownAnswerTest) {
   // These sample signatures were generated by running the Proof.Verify test
   // (modified to use ECDSA for signing proofs) and dumping the bytes of the
   // |signature| output of ProofSource::GetProof().
   static const unsigned char signature_data_0[] = {
@@ skipping 97 matching lines @@
     rv = verifier->VerifyProof("foo.com", server_config, wrong_certs, signature,
                                &error_details, callback.callback());
     rv = callback.GetResult(rv);
     ASSERT_EQ(ERR_FAILED, rv);
     ASSERT_NE("", error_details);
   }
 }
 
 }  // namespace test
 }  // namespace net