diff options
-rw-r--r-- | net/quic/bidirectional_stream_quic_impl_unittest.cc | 8 | ||||
-rw-r--r-- | net/quic/quic_http_stream_test.cc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net/quic/bidirectional_stream_quic_impl_unittest.cc b/net/quic/bidirectional_stream_quic_impl_unittest.cc index 4f32425..b394ed8 100644 --- a/net/quic/bidirectional_stream_quic_impl_unittest.cc +++ b/net/quic/bidirectional_stream_quic_impl_unittest.cc @@ -323,19 +323,19 @@ class BidirectionalStreamQuicImplTest socket_data_.reset(new StaticSocketDataProvider( nullptr, 0, mock_writes_.get(), writes_.size())); - MockUDPClientSocket* socket = new MockUDPClientSocket( - socket_data_.get(), net_log().bound().net_log()); + scoped_ptr<MockUDPClientSocket> socket(new MockUDPClientSocket( + socket_data_.get(), net_log().bound().net_log())); socket->Connect(peer_addr_); runner_ = new TestTaskRunner(&clock_); helper_.reset(new QuicChromiumConnectionHelper(runner_.get(), &clock_, &random_generator_)); connection_ = new QuicConnection( connection_id_, peer_addr_, helper_.get(), - new QuicChromiumPacketWriter(socket), true /* owns_writer */, + new QuicChromiumPacketWriter(socket.get()), true /* owns_writer */, Perspective::IS_CLIENT, SupportedVersions(GetParam())); session_.reset(new QuicChromiumClientSession( - connection_, scoped_ptr<DatagramClientSocket>(socket), + connection_, std::move(socket), /*stream_factory=*/nullptr, &crypto_client_stream_factory_, &clock_, &transport_security_state_, make_scoped_ptr((QuicServerInfo*)nullptr), QuicServerId(kDefaultServerHostName, kDefaultServerPort, diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index cafeb0c..3e2c444 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc @@ -196,8 +196,8 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> { socket_data_.reset(new StaticSocketDataProvider( nullptr, 0, mock_writes_.get(), writes_.size())); - MockUDPClientSocket* socket = - new MockUDPClientSocket(socket_data_.get(), net_log_.bound().net_log()); + scoped_ptr<MockUDPClientSocket> socket(new MockUDPClientSocket( + socket_data_.get(), net_log_.bound().net_log())); socket->Connect(peer_addr_); runner_ = new TestTaskRunner(&clock_); send_algorithm_ = new MockSendAlgorithm(); @@ -220,7 +220,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> { &random_generator_)); connection_ = new TestQuicConnection( SupportedVersions(GetParam()), connection_id_, peer_addr_, - helper_.get(), new QuicChromiumPacketWriter(socket)); + helper_.get(), new QuicChromiumPacketWriter(socket.get())); connection_->set_visitor(&visitor_); connection_->SetSendAlgorithm(send_algorithm_); @@ -234,7 +234,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> { crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_); session_.reset(new QuicChromiumClientSession( - connection_, scoped_ptr<DatagramClientSocket>(socket), + connection_, std::move(socket), /*stream_factory=*/nullptr, &crypto_client_stream_factory_, &clock_, &transport_security_state_, make_scoped_ptr((QuicServerInfo*)nullptr), QuicServerId(kDefaultServerHostName, kDefaultServerPort, |