| Index: net/tools/quic/test_tools/quic_test_client.cc
|
| diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc
|
| index b304df9a3e08c8da5a63ba5980b5bfe4eb6774b6..585efd7cd3ee41ac781491d667746ff7419e7fbd 100644
|
| --- a/net/tools/quic/test_tools/quic_test_client.cc
|
| +++ b/net/tools/quic/test_tools/quic_test_client.cc
|
| @@ -107,13 +107,11 @@ MockableQuicClient::MockableQuicClient(
|
| const QuicServerId& server_id,
|
| const QuicVersionVector& supported_versions,
|
| EpollServer* epoll_server)
|
| - : QuicClient(server_address,
|
| - server_id,
|
| - supported_versions,
|
| - epoll_server,
|
| - new RecordingProofVerifier()),
|
| - override_connection_id_(0),
|
| - test_writer_(nullptr) {}
|
| + : MockableQuicClient(server_address,
|
| + server_id,
|
| + QuicConfig(),
|
| + supported_versions,
|
| + epoll_server) {}
|
|
|
| MockableQuicClient::MockableQuicClient(
|
| IPEndPoint server_address,
|
| @@ -163,33 +161,26 @@ void MockableQuicClient::UseConnectionId(QuicConnectionId connection_id) {
|
| QuicTestClient::QuicTestClient(IPEndPoint server_address,
|
| const string& server_hostname,
|
| const QuicVersionVector& supported_versions)
|
| + : QuicTestClient(server_address,
|
| + server_hostname,
|
| + QuicConfig(),
|
| + supported_versions) {}
|
| +
|
| +QuicTestClient::QuicTestClient(IPEndPoint server_address,
|
| + const string& server_hostname,
|
| + const QuicConfig& config,
|
| + const QuicVersionVector& supported_versions)
|
| : client_(new MockableQuicClient(server_address,
|
| QuicServerId(server_hostname,
|
| server_address.port(),
|
| PRIVACY_MODE_DISABLED),
|
| + config,
|
| supported_versions,
|
| &epoll_server_)) {
|
| Initialize();
|
| }
|
|
|
| -QuicTestClient::QuicTestClient(
|
| - IPEndPoint server_address,
|
| - const string& server_hostname,
|
| - const QuicConfig& config,
|
| - const QuicVersionVector& supported_versions)
|
| - : client_(
|
| - new MockableQuicClient(server_address,
|
| - QuicServerId(server_hostname,
|
| - server_address.port(),
|
| - PRIVACY_MODE_DISABLED),
|
| - config,
|
| - supported_versions,
|
| - &epoll_server_)) {
|
| - Initialize();
|
| -}
|
| -
|
| -QuicTestClient::QuicTestClient() {
|
| -}
|
| +QuicTestClient::QuicTestClient() {}
|
|
|
| QuicTestClient::~QuicTestClient() {
|
| if (stream_) {
|
|
|