Commit 012b0b50 authored by Victor Vasiliev's avatar Victor Vasiliev Committed by Commit Bot

Use MockQuicContext in quic_stream_factory_fuzzer

Regression introduced in https://chromium.googlesource.com/chromium/src/+/7752898dcc9445b41397a9a75bd7e5cb4f1c10bb

R=rch@chromium.org

Bug: 1026194
Change-Id: I5b1c3b193d2d4dcb0aa17af4d8b7a3eca82c33a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1932419Reviewed-by: default avatarRyan Hamilton <rch@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720713}
parent 210100a9
...@@ -3306,6 +3306,8 @@ source_set("quic_test_tools") { ...@@ -3306,6 +3306,8 @@ source_set("quic_test_tools") {
"quic/mock_decrypter.h", "quic/mock_decrypter.h",
"quic/mock_encrypter.cc", "quic/mock_encrypter.cc",
"quic/mock_encrypter.h", "quic/mock_encrypter.h",
"quic/mock_quic_context.cc",
"quic/mock_quic_context.h",
"quic/platform/impl/quic_epoll_test_tools_impl.h", "quic/platform/impl/quic_epoll_test_tools_impl.h",
"quic/platform/impl/quic_expect_bug_impl.h", "quic/platform/impl/quic_expect_bug_impl.h",
"quic/platform/impl/quic_mock_log_impl.h", "quic/platform/impl/quic_mock_log_impl.h",
...@@ -5248,8 +5250,6 @@ test("net_unittests") { ...@@ -5248,8 +5250,6 @@ test("net_unittests") {
"quic/bidirectional_stream_quic_impl_unittest.cc", "quic/bidirectional_stream_quic_impl_unittest.cc",
"quic/crypto/proof_test_chromium.cc", "quic/crypto/proof_test_chromium.cc",
"quic/crypto/proof_verifier_chromium_test.cc", "quic/crypto/proof_verifier_chromium_test.cc",
"quic/mock_quic_context.cc",
"quic/mock_quic_context.h",
"quic/mock_quic_data.cc", "quic/mock_quic_data.cc",
"quic/mock_quic_data.h", "quic/mock_quic_data.h",
"quic/network_connection_unittest.cc", "quic/network_connection_unittest.cc",
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "net/http/http_server_properties.h" #include "net/http/http_server_properties.h"
#include "net/http/transport_security_state.h" #include "net/http/transport_security_state.h"
#include "net/quic/mock_crypto_client_stream_factory.h" #include "net/quic/mock_crypto_client_stream_factory.h"
#include "net/quic/quic_context.h" #include "net/quic/mock_quic_context.h"
#include "net/quic/quic_http_stream.h" #include "net/quic/quic_http_stream.h"
#include "net/quic/test_task_runner.h" #include "net/quic/test_task_runner.h"
#include "net/socket/fuzzed_datagram_client_socket.h" #include "net/socket/fuzzed_datagram_client_socket.h"
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include "net/socket/socket_tag.h" #include "net/socket/socket_tag.h"
#include "net/ssl/ssl_config_service_defaults.h" #include "net/ssl/ssl_config_service_defaults.h"
#include "net/test/gtest_util.h" #include "net/test/gtest_util.h"
#include "net/third_party/quiche/src/quic/test_tools/mock_clock.h"
#include "net/third_party/quiche/src/quic/test_tools/mock_random.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
namespace net { namespace net {
...@@ -54,8 +52,8 @@ const int kCertVerifyFlags = 0; ...@@ -54,8 +52,8 @@ const int kCertVerifyFlags = 0;
// Static initialization for persistent factory data // Static initialization for persistent factory data
struct Env { struct Env {
Env() : host_port_pair(kServerHostName, kServerPort), random_generator(0) { Env() : host_port_pair(kServerHostName, kServerPort) {
clock.AdvanceTime(quic::QuicTime::Delta::FromSeconds(1)); quic_context.AdvanceTime(quic::QuicTime::Delta::FromSeconds(1));
ssl_config_service = std::make_unique<SSLConfigServiceDefaults>(); ssl_config_service = std::make_unique<SSLConfigServiceDefaults>();
crypto_client_stream_factory.set_use_mock_crypter(true); crypto_client_stream_factory.set_use_mock_crypter(true);
cert_verifier = std::make_unique<MockCertVerifier>(); cert_verifier = std::make_unique<MockCertVerifier>();
...@@ -66,12 +64,10 @@ struct Env { ...@@ -66,12 +64,10 @@ struct Env {
verify_details.cert_verify_result.is_issued_by_known_root = true; verify_details.cert_verify_result.is_issued_by_known_root = true;
} }
quic::MockClock clock;
std::unique_ptr<SSLConfigService> ssl_config_service; std::unique_ptr<SSLConfigService> ssl_config_service;
ProofVerifyDetailsChromium verify_details; ProofVerifyDetailsChromium verify_details;
MockCryptoClientStreamFactory crypto_client_stream_factory; MockCryptoClientStreamFactory crypto_client_stream_factory;
HostPortPair host_port_pair; HostPortPair host_port_pair;
quic::test::MockRandom random_generator;
NetLogWithSource net_log; NetLogWithSource net_log;
std::unique_ptr<CertVerifier> cert_verifier; std::unique_ptr<CertVerifier> cert_verifier;
TransportSecurityState transport_security_state; TransportSecurityState transport_security_state;
...@@ -79,7 +75,7 @@ struct Env { ...@@ -79,7 +75,7 @@ struct Env {
quic::QuicTagVector client_connection_options; quic::QuicTagVector client_connection_options;
std::unique_ptr<CTVerifier> cert_transparency_verifier; std::unique_ptr<CTVerifier> cert_transparency_verifier;
DefaultCTPolicyEnforcer ct_policy_enforcer; DefaultCTPolicyEnforcer ct_policy_enforcer;
QuicContext quic_context; MockQuicContext quic_context;
}; };
static struct Env* env = new Env(); static struct Env* env = new Env();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment