QUIC - delete #ifdef USE_OPENSSL in unittests

net/quic/test_tools/crypto_test_utils.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 
 #include <stdarg.h>
 
 #include <utility>
@@ skipping 109 matching lines @@
   // Returns the value for the tag |tag| in the tag value map of |message|.
   static std::string GetValueForTag(const CryptoHandshakeMessage& message,
                                     QuicTag tag);
 
   // Returns a |ProofSource| that serves up test certificates.
   static ProofSource* ProofSourceForTesting();
 
   // Returns a |ProofVerifier| that uses the QUIC testing root CA.
   static ProofVerifier* ProofVerifierForTesting();
 
+  // Returns a real ProofVerifier (not a fake proof verifier) for testing.
+  static ProofVerifier* ProofVerifierRealForTesting();

[Ryan Hamilton, 2015/11/05 05:26:47]

nit: How about RealProofVerifierForTesting()?

[ramant (doing other things), 2015/11/05 17:36:43]

Done.

+
   // Returns a |ProofVerifyContext| that must be used with the verifier
   // returned by |ProofVerifierForTesting|.
   static ProofVerifyContext* ProofVerifyContextForTesting();
 
-  // These functions return a fake |ProofSource|, |ProofVerifier|, or
-  // |ProofVerifyContext| that works with each other. These are suitable for
-  // unit tests that aren't concerned with |ProofSource| and |ProofVerifier|.
-  // TODO(wtc): delete these when Chromium has a working
-  // ProofSourceForTesting().
-  static ProofSource* FakeProofSourceForTesting();
-  static ProofVerifier* FakeProofVerifierForTesting();
-  static ProofVerifyContext* FakeProofVerifyContextForTesting();
-
   // MockCommonCertSets returns a CommonCertSets that contains a single set with
   // hash |hash|, consisting of the certificate |cert| at index |index|.
   static CommonCertSets* MockCommonCertSets(base::StringPiece cert,
                                             uint64 hash,
                                             uint32 index);
 
   // ParseTag returns a QuicTag from parsing |tagstr|. |tagstr| may either be
   // in the format "EXMP" (i.e. ASCII format), or "#11223344" (an explicit hex
   // format). It CHECK fails if there's a parse error.
   static QuicTag ParseTag(const char* tagstr);
@@ skipping 23 matching lines @@
                                          QuicCryptoServerStream* server);
 
   DISALLOW_COPY_AND_ASSIGN(CryptoTestUtils);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_