Refactoring output of ProofSource::GetProof (no functional changes).

net/quic/test_tools/crypto_test_utils.cc

Index: net/quic/test_tools/crypto_test_utils.cc
diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc
index adb68bd22aede52197125c8b902bd405def892d3..38f07ed95f8d2373a2a54aa3f5030ce9de736f05 100644
--- a/net/quic/test_tools/crypto_test_utils.cc
+++ b/net/quic/test_tools/crypto_test_utils.cc
@@ -278,14 +278,14 @@ class FullChloGenerator {
                     IPAddress server_ip,
                     IPEndPoint client_addr,
                     const QuicClock* clock,
-                    scoped_refptr<QuicCryptoProof> proof,
+                    scoped_refptr<QuicSignedServerConfig> signed_config,
                     QuicCompressedCertsCache* compressed_certs_cache,
                     CryptoHandshakeMessage* out)
       : crypto_config_(crypto_config),
         server_ip_(server_ip),
         client_addr_(client_addr),
         clock_(clock),
-        proof_(proof),
+        signed_config_(signed_config),
         compressed_certs_cache_(compressed_certs_cache),
         out_(out),
         params_(new QuicCryptoNegotiatedParameters) {}
@@ -318,7 +318,7 @@ class FullChloGenerator {
         client_addr_, AllSupportedVersions().front(), AllSupportedVersions(),
         /*use_stateless_rejects=*/true, /*server_designated_connection_id=*/0,
         clock_, QuicRandom::GetInstance(), compressed_certs_cache_, params_,
-        proof_, /*total_framing_overhead=*/50, kDefaultMaxPacketSize,
+        signed_config_, /*total_framing_overhead=*/50, kDefaultMaxPacketSize,
         GetProcessClientHelloCallback());
   }
 
@@ -373,7 +373,7 @@ class FullChloGenerator {
   IPAddress server_ip_;
   IPEndPoint client_addr_;
   const QuicClock* clock_;
-  scoped_refptr<QuicCryptoProof> proof_;
+  scoped_refptr<QuicSignedServerConfig> signed_config_;
   QuicCompressedCertsCache* compressed_certs_cache_;
   CryptoHandshakeMessage* out_;
 
@@ -567,12 +567,11 @@ string CryptoTestUtils::GetValueForTag(const CryptoHandshakeMessage& message,
 uint64_t CryptoTestUtils::LeafCertHashForTesting() {
   scoped_refptr<ProofSource::Chain> chain;
   IPAddress server_ip;
-  string sig;
-  string cert_sct;
+  QuicCryptoProof proof;
   std::unique_ptr<ProofSource> proof_source(
       CryptoTestUtils::ProofSourceForTesting());
   if (!proof_source->GetProof(server_ip, "", "", AllSupportedVersions().front(),
-                              "", QuicTagVector(), &chain, &sig, &cert_sct) ||
+                              "", QuicTagVector(), &chain, &proof) ||
       chain->certs.empty()) {
     DCHECK(false) << "Proof generation failed";
     return 0;
@@ -1006,7 +1005,7 @@ void CryptoTestUtils::GenerateFullCHLO(
     IPEndPoint client_addr,
     QuicVersion version,
     const QuicClock* clock,
-    scoped_refptr<QuicCryptoProof> proof,
+    scoped_refptr<QuicSignedServerConfig> proof,
     QuicCompressedCertsCache* compressed_certs_cache,
     CryptoHandshakeMessage* out) {
   // Pass a inchoate CHLO.