Revert of CT Verify test utilities change - Moved the following common functions

net/test/ct_test_util.h

 // Copyright 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.
 
 #ifndef NET_CERT_CT_TEST_UTIL_H_
 #define NET_CERT_CT_TEST_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "net/cert/signed_certificate_timestamp.h"
 
 namespace net {
 
 namespace ct {
 
-struct CTVerifyResult;
 struct DigitallySigned;
 struct LogEntry;
+struct SignedCertificateTimestamp;
 struct SignedTreeHead;
 
 // Note: unless specified otherwise, all test data is taken from Certificate
 // Transparency test data repository.
 
 // Fills |entry| with test data for an X.509 entry.
 void GetX509CertLogEntry(LogEntry* entry);
 
 // Returns a DER-encoded X509 cert. The SCT provided by
 // GetX509CertSCT is signed over this certificate.
@@ skipping 54 matching lines @@
 // the provided parameters.
 std::string CreateSignedTreeHeadJsonString(size_t tree_size,
                                            int64_t timestamp,
                                            std::string sha256_root_hash,
                                            std::string tree_head_signature);
 
 // Assembles, and returns, a sample consistency proof in JSON format using
 // the provided raw nodes (i.e. the raw nodes will be base64-encoded).
 std::string CreateConsistencyProofJsonString(
     const std::vector<std::string>& raw_nodes);
-
-// Returns SCTList for testing.
-std::string GetSCTListForTesting();
-
-// Returns a corrupted SCTList. This is done by changing a byte inside the
-// Log ID part of the SCT so it does not match the log used in the tests.
-std::string GetSCTListWithInvalidSCT();
-
-// Returns true if |log_description| is in the |result|'s |verified_scts| and
-// number of |verified_scts| in |result| is equal to 1.
-bool CheckForSingleVerifiedSCTInResult(const CTVerifyResult& result,
-                                       const std::string& log_description);
-
-// Returns true if |origin| is in the |result|'s |verified_scts|.
-bool CheckForSCTOrigin(const CTVerifyResult& result,
-                       SignedCertificateTimestamp::Origin origin);
-
 }  // namespace ct
 
 }  // namespace net
 
 #endif  // NET_CERT_CT_TEST_UTIL_H_