Add a test helper method to construct a full CHLO.

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 aaafbbc4fe09e9a1201a100457cfbb0b437d3dab..1c7c0179649cba690df38962d829959a392f0854 100644
--- a/net/quic/test_tools/crypto_test_utils.cc
+++ b/net/quic/test_tools/crypto_test_utils.cc
@@ -269,6 +269,74 @@ CryptoTestUtils::FakeClientOptions::FakeClientOptions()
       channel_id_source_async(false),
       token_binding_enabled(false) {}
 
+namespace {
+// This class is used by GenerateFullCHLO() to extract SCID and STK from
+// REJ/SREJ and to construct a full CHLO with these fields and given inchoate
+// CHLO.
+class FullChloGenerator : public ValidateClientHelloResultCallback {
+ public:
+  FullChloGenerator(QuicCryptoServerConfig* crypto_config,
+                    IPAddress server_ip,
+                    IPEndPoint client_addr,
+                    const QuicClock* clock,
+                    QuicCryptoProof* proof,
+                    QuicCompressedCertsCache* compressed_certs_cache,
+                    CryptoHandshakeMessage* out)
+      : crypto_config_(crypto_config),
+        server_ip_(server_ip),
+        client_addr_(client_addr),
+        clock_(clock),
+        proof_(proof),
+        compressed_certs_cache_(compressed_certs_cache),
+        out_(out) {}
+
+  void RunImpl(
+      const CryptoHandshakeMessage& client_hello,
+      const ValidateClientHelloResultCallback::Result& result) override {
+    QuicCryptoNegotiatedParameters params;
+    string error_details;
+    DiversificationNonce diversification_nonce;
+    CryptoHandshakeMessage rej;
+    crypto_config_->ProcessClientHello(
+        result, /*reject_only=*/false, /*connection_id=*/1, server_ip_,
+        client_addr_, QuicSupportedVersions().front(), QuicSupportedVersions(),
+        /*use_stateless_rejects=*/true, /*server_designated_connection_id=*/0,
+        clock_, QuicRandom::GetInstance(), compressed_certs_cache_, &params,
+        proof_, &rej, &diversification_nonce, &error_details);
+    // Verify output is a REJ or SREJ.
+    EXPECT_THAT(rej.tag(),
+                testing::AnyOf(testing::Eq(kSREJ), testing::Eq(kREJ)));
+
+    VLOG(1) << "Extract valid STK and SCID from\n" << rej.DebugString();
+    StringPiece srct;
+    ASSERT_TRUE(rej.GetStringPiece(kSourceAddressTokenTag, &srct));
+
+    StringPiece scfg;
+    ASSERT_TRUE(rej.GetStringPiece(kSCFG, &scfg));
+    std::unique_ptr<CryptoHandshakeMessage> server_config(
+        CryptoFramer::ParseMessage(scfg));
+
+    StringPiece scid;
+    ASSERT_TRUE(server_config->GetStringPiece(kSCID, &scid));
+
+    *out_ = client_hello;
+    out_->SetStringPiece(kSCID, scid);
+    out_->SetStringPiece(kSourceAddressTokenTag, srct);
+    uint64_t xlct = CryptoTestUtils::LeafCertHashForTesting();
+    out_->SetValue(kXLCT, xlct);
+  }
+
+ protected:
+  QuicCryptoServerConfig* crypto_config_;
+  IPAddress server_ip_;
+  IPEndPoint client_addr_;
+  const QuicClock* clock_;
+  QuicCryptoProof* proof_;
+  QuicCompressedCertsCache* compressed_certs_cache_;
+  CryptoHandshakeMessage* out_;
+};
+}  // namespace
+
 // static
 int CryptoTestUtils::HandshakeWithFakeServer(
     QuicConfig* server_quic_config,
@@ -827,5 +895,23 @@ void CryptoTestUtils::MovePackets(PacketSavingConnection* source_conn,
   }
 }
 
+// static
+void CryptoTestUtils::GenerateFullCHLO(
+    const CryptoHandshakeMessage& inchoate_chlo,
+    QuicCryptoServerConfig* crypto_config,
+    IPAddress server_ip,
+    IPEndPoint client_addr,
+    QuicVersion version,
+    const QuicClock* clock,
+    QuicCryptoProof* proof,
+    QuicCompressedCertsCache* compressed_certs_cache,
+    CryptoHandshakeMessage* out) {
+  // Pass a inchoate CHLO.
+  crypto_config->ValidateClientHello(
+      inchoate_chlo, client_addr.address(), server_ip, version, clock, proof,
+      new FullChloGenerator(crypto_config, server_ip, client_addr, clock, proof,
+                            compressed_certs_cache, out));
+}
+
 }  // namespace test
 }  // namespace net