Chromium Code Reviews| Index: net/tools/quic/test_tools/packet_dropping_test_writer.h |
| diff --git a/net/tools/quic/test_tools/packet_dropping_test_writer.h b/net/tools/quic/test_tools/packet_dropping_test_writer.h |
| index 20d2c278e3827a4bdb8f486cdb7cc18d341aeb8b..999825e6c82bbde8b6b9b4866fc76de2bfa1547a 100644 |
| --- a/net/tools/quic/test_tools/packet_dropping_test_writer.h |
| +++ b/net/tools/quic/test_tools/packet_dropping_test_writer.h |
| @@ -13,7 +13,6 @@ |
| #include "base/logging.h" |
| #include "base/macros.h" |
| -#include "base/memory/scoped_ptr.h" |
|
dcheng
2016/04/18 15:36:28
#include <memory>
Ryan Hamilton
2016/04/18 22:01:52
Agreed.
|
| #include "base/synchronization/lock.h" |
| #include "net/base/ip_address.h" |
| #include "net/quic/quic_alarm.h" |
| @@ -153,9 +152,9 @@ class PacketDroppingTestWriter : public QuicPacketWriterWrapper { |
| typedef std::list<DelayedWrite> DelayedPacketList; |
| const QuicClock* clock_; |
| - scoped_ptr<QuicAlarm> write_unblocked_alarm_; |
| - scoped_ptr<QuicAlarm> delay_alarm_; |
| - scoped_ptr<Delegate> on_can_write_; |
| + std::unique_ptr<QuicAlarm> write_unblocked_alarm_; |
| + std::unique_ptr<QuicAlarm> delay_alarm_; |
| + std::unique_ptr<Delegate> on_can_write_; |
| net::test::SimpleRandom simple_random_; |
| // Stored packets delayed by fake packet delay or bandwidth restrictions. |
| DelayedPacketList delayed_packets_; |