diff options
Diffstat (limited to 'chromium/net/tools/quic/quic_simple_server_test.cc')
-rw-r--r-- | chromium/net/tools/quic/quic_simple_server_test.cc | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/chromium/net/tools/quic/quic_simple_server_test.cc b/chromium/net/tools/quic/quic_simple_server_test.cc index 9681310e155..5bc56f8001e 100644 --- a/chromium/net/tools/quic/quic_simple_server_test.cc +++ b/chromium/net/tools/quic/quic_simple_server_test.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "net/quic/address_utils.h" #include "net/third_party/quiche/src/quiche/quic/core/crypto/quic_random.h" +#include "net/third_party/quiche/src/quiche/quic/core/deterministic_connection_id_generator.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_crypto_stream.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_test.h" @@ -31,28 +32,32 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test { quic::test::crypto_test_utils::ProofSourceForTesting(), quic::KeyExchangeSource::Default()), version_manager_(quic::AllSupportedVersions()), - dispatcher_(&config_, - &crypto_config_, - &version_manager_, - std::make_unique<quic::test::MockQuicConnectionHelper>(), - std::make_unique<QuicSimpleServerSessionHelper>( - quic::QuicRandom::GetInstance()), - std::make_unique<quic::test::MockAlarmFactory>(), - &memory_cache_backend_) { - dispatcher_.InitializeWithWriter(nullptr); + connection_id_generator_(quic::kQuicDefaultConnectionIdLength), + dispatcher_(std::make_unique<quic::test::MockQuicDispatcher>( + &config_, + &crypto_config_, + &version_manager_, + std::make_unique<quic::test::MockQuicConnectionHelper>(), + std::make_unique<QuicSimpleServerSessionHelper>( + quic::QuicRandom::GetInstance()), + std::make_unique<quic::test::MockAlarmFactory>(), + &memory_cache_backend_, + connection_id_generator_)) { + dispatcher_->InitializeWithWriter(nullptr); } void DispatchPacket(const quic::QuicReceivedPacket& packet) { IPEndPoint client_addr, server_addr; - dispatcher_.ProcessPacket(ToQuicSocketAddress(server_addr), - ToQuicSocketAddress(client_addr), packet); + dispatcher_->ProcessPacket(ToQuicSocketAddress(server_addr), + ToQuicSocketAddress(client_addr), packet); } protected: quic::QuicConfig config_; quic::QuicCryptoServerConfig crypto_config_; quic::QuicVersionManager version_manager_; - quic::test::MockQuicDispatcher dispatcher_; + quic::DeterministicConnectionIdGenerator connection_id_generator_; + std::unique_ptr<quic::test::MockQuicDispatcher> dispatcher_; quic::QuicMemoryCacheBackend memory_cache_backend_; }; @@ -70,7 +75,7 @@ TEST_F(QuicChromeServerDispatchPacketTest, DispatchPacket) { reinterpret_cast<char*>(valid_packet), std::size(valid_packet), quic::QuicTime::Zero(), false); - EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _)).Times(1); + EXPECT_CALL(*dispatcher_, ProcessPacket(_, _, _)).Times(1); DispatchPacket(encrypted_valid_packet); } |