gfe-relnote: Move QuicCryptoServerStream::Helper::GenerateConnectionIdForReject to QuicDispatcher::GenerateNewServerConnectionId. Refactor only.
This function used to be related to reject, but now it is only used to generate server connection ids when the incoming id length is unexpected by the dispatcher.
PiperOrigin-RevId: 263843315
Change-Id: I5405ad8e5712ced51c8090be6a99aff396f5ab32
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index bd30333..b41c57f 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -118,9 +118,10 @@
version_manager,
QuicMakeUnique<MockQuicConnectionHelper>(),
std::unique_ptr<QuicCryptoServerStream::Helper>(
- new QuicSimpleCryptoServerStreamHelper(random)),
+ new QuicSimpleCryptoServerStreamHelper()),
QuicMakeUnique<MockAlarmFactory>(),
- kQuicDefaultConnectionIdLength) {}
+ kQuicDefaultConnectionIdLength),
+ random_(random) {}
MOCK_METHOD4(CreateQuicSession,
QuicServerSessionBase*(QuicConnectionId connection_id,
@@ -131,6 +132,12 @@
MOCK_METHOD1(ShouldCreateOrBufferPacketForConnection,
bool(const ReceivedPacketInfo& packet_info));
+ QuicConnectionId GenerateNewServerConnectionId(
+ ParsedQuicVersion /*version*/,
+ QuicConnectionId /*connection_id*/) const override {
+ return QuicUtils::CreateRandomConnectionId(random_);
+ }
+
struct TestQuicPerPacketContext : public QuicPerPacketContext {
std::string custom_packet_context;
};
@@ -152,6 +159,8 @@
using QuicDispatcher::SetAllowShortInitialServerConnectionIds;
using QuicDispatcher::writer;
+
+ QuicRandom* random_;
};
// A Connection class which unregisters the session from the dispatcher when
@@ -187,9 +196,7 @@
: QuicDispatcherTest(crypto_test_utils::ProofSourceForTesting()) {}
explicit QuicDispatcherTest(std::unique_ptr<ProofSource> proof_source)
- :
-
- version_manager_(AllSupportedVersions()),
+ : version_manager_(AllSupportedVersions()),
crypto_config_(QuicCryptoServerConfig::TESTING,
QuicRandom::GetInstance(),
std::move(proof_source),
