Index: media/cast/net/cast_transport_impl_unittest.cc |
diff --git a/media/cast/net/cast_transport_impl_unittest.cc b/media/cast/net/cast_transport_impl_unittest.cc |
index 39b4f4529db26b05259d5bb88789b8c833696c8e..6b13aed2ef3640f67ae25adffae9fe1e1a346ff2 100644 |
--- a/media/cast/net/cast_transport_impl_unittest.cc |
+++ b/media/cast/net/cast_transport_impl_unittest.cc |
@@ -11,7 +11,7 @@ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "base/test/simple_test_tick_clock.h" |
#include "base/values.h" |
#include "media/base/fake_single_thread_task_runner.h" |
@@ -28,6 +28,17 @@ const int64_t kStartMillisecond = INT64_C(12345678900000); |
const uint32_t kVideoSsrc = 1; |
const uint32_t kAudioSsrc = 2; |
+class RtcpObserver : public SenderRtcpObserver { |
miu
2016/04/25 23:23:53
naming nit: How about StubRtcpObserver? (and a co
xjz
2016/04/29 19:15:49
Renamed. I don't quite get this comment. CastTrans
miu
2016/05/02 21:30:01
What I meant was that, for this test code, there a
xjz
2016/05/03 18:13:27
Got it. Thanks for the explanation.:)
|
+ public: |
+ RtcpObserver() {} |
+ |
+ void OnCastMessageReceived(const RtcpCastMessage& cast_message) final {} |
+ void OnRttReceived(base::TimeDelta round_trip_time) final {} |
+ void OnPliReceived() final {} |
+ |
+ DISALLOW_COPY_AND_ASSIGN(RtcpObserver); |
+}; |
+ |
} // namespace |
class FakePacketSender : public PacketTransport { |
@@ -94,8 +105,8 @@ class CastTransportImplTest : public ::testing::Test { |
rtp_config.ssrc = kVideoSsrc; |
rtp_config.feedback_ssrc = 2; |
rtp_config.rtp_payload_type = 3; |
- transport_sender_->InitializeVideo(rtp_config, RtcpCastMessageCallback(), |
- RtcpRttCallback(), RtcpPliCallback()); |
+ transport_sender_->InitializeVideo(rtp_config, |
+ base::WrapUnique(new RtcpObserver())); |
} |
void InitializeAudio() { |
@@ -103,13 +114,13 @@ class CastTransportImplTest : public ::testing::Test { |
rtp_config.ssrc = kAudioSsrc; |
rtp_config.feedback_ssrc = 3; |
rtp_config.rtp_payload_type = 4; |
- transport_sender_->InitializeAudio(rtp_config, RtcpCastMessageCallback(), |
- RtcpRttCallback(), RtcpPliCallback()); |
+ transport_sender_->InitializeAudio(rtp_config, |
+ base::WrapUnique(new RtcpObserver())); |
} |
base::SimpleTestTickClock testing_clock_; |
scoped_refptr<FakeSingleThreadTaskRunner> task_runner_; |
- scoped_ptr<CastTransportImpl> transport_sender_; |
+ std::unique_ptr<CastTransportImpl> transport_sender_; |
FakePacketSender* transport_; // Owned by CastTransport. |
int num_times_logging_callback_called_; |
}; |
@@ -124,12 +135,12 @@ class TransportClient : public CastTransport::Client { |
void OnStatusChanged(CastTransportStatus status) final{}; |
void OnLoggingEventsReceived( |
- scoped_ptr<std::vector<FrameEvent>> frame_events, |
- scoped_ptr<std::vector<PacketEvent>> packet_events) final { |
+ std::unique_ptr<std::vector<FrameEvent>> frame_events, |
+ std::unique_ptr<std::vector<PacketEvent>> packet_events) final { |
CHECK(cast_transport_sender_impl_test_); |
cast_transport_sender_impl_test_->ReceivedLoggingEvents(); |
}; |
- void ProcessRtpPacket(scoped_ptr<Packet> packet) final{}; |
+ void ProcessRtpPacket(std::unique_ptr<Packet> packet) final{}; |
private: |
CastTransportImplTest* const cast_transport_sender_impl_test_; |
@@ -143,13 +154,13 @@ void CastTransportImplTest::InitWithoutLogging() { |
transport_ = new FakePacketSender(); |
transport_sender_.reset( |
new CastTransportImpl(&testing_clock_, base::TimeDelta(), |
- make_scoped_ptr(new TransportClient(nullptr)), |
- make_scoped_ptr(transport_), task_runner_)); |
+ base::WrapUnique(new TransportClient(nullptr)), |
+ base::WrapUnique(transport_), task_runner_)); |
task_runner_->RunTasks(); |
} |
void CastTransportImplTest::InitWithOptions() { |
- scoped_ptr<base::DictionaryValue> options(new base::DictionaryValue); |
+ std::unique_ptr<base::DictionaryValue> options(new base::DictionaryValue); |
options->SetBoolean("disable_wifi_scan", true); |
options->SetBoolean("media_streaming_mode", true); |
options->SetInteger("pacer_target_burst_size", 20); |
@@ -157,8 +168,8 @@ void CastTransportImplTest::InitWithOptions() { |
transport_ = new FakePacketSender(); |
transport_sender_.reset( |
new CastTransportImpl(&testing_clock_, base::TimeDelta(), |
- make_scoped_ptr(new TransportClient(nullptr)), |
- make_scoped_ptr(transport_), task_runner_)); |
+ base::WrapUnique(new TransportClient(nullptr)), |
+ base::WrapUnique(transport_), task_runner_)); |
transport_sender_->SetOptions(*options); |
task_runner_->RunTasks(); |
} |
@@ -167,7 +178,7 @@ void CastTransportImplTest::InitWithLogging() { |
transport_ = new FakePacketSender(); |
transport_sender_.reset(new CastTransportImpl( |
&testing_clock_, base::TimeDelta::FromMilliseconds(10), |
- make_scoped_ptr(new TransportClient(this)), make_scoped_ptr(transport_), |
+ base::WrapUnique(new TransportClient(this)), base::WrapUnique(transport_), |
task_runner_)); |
task_runner_->RunTasks(); |
} |
@@ -221,8 +232,7 @@ TEST_F(CastTransportImplTest, NacksCancelRetransmits) { |
cast_message.remote_ssrc = kVideoSsrc; |
cast_message.ack_frame_id = 1; |
cast_message.missing_frames_and_packets[1].insert(3); |
- transport_sender_->OnReceivedCastMessage( |
- kVideoSsrc, RtcpCastMessageCallback(), cast_message); |
+ transport_sender_->OnReceivedCastMessage(kVideoSsrc, cast_message); |
transport_->SetPaused(false); |
task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10)); |
EXPECT_EQ(3, num_times_logging_callback_called_); |
@@ -340,8 +350,7 @@ TEST_F(CastTransportImplTest, DedupRetransmissionWithAudio) { |
RtcpCastMessage cast_message; |
cast_message.remote_ssrc = kAudioSsrc; |
cast_message.ack_frame_id = 1; |
- transport_sender_->OnReceivedCastMessage( |
- kAudioSsrc, RtcpCastMessageCallback(), cast_message); |
+ transport_sender_->OnReceivedCastMessage(kAudioSsrc, cast_message); |
task_runner_->RunTasks(); |
EXPECT_EQ(2, transport_->packets_sent()); |
EXPECT_EQ(0, num_times_logging_callback_called_); // Only 4 ms since last. |
@@ -361,8 +370,7 @@ TEST_F(CastTransportImplTest, DedupRetransmissionWithAudio) { |
cast_message.ack_frame_id = 0; |
cast_message.missing_frames_and_packets[1].insert(3); |
task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10)); |
- transport_sender_->OnReceivedCastMessage( |
- kVideoSsrc, RtcpCastMessageCallback(), cast_message); |
+ transport_sender_->OnReceivedCastMessage(kVideoSsrc, cast_message); |
task_runner_->RunTasks(); |
EXPECT_EQ(6, transport_->packets_sent()); |
EXPECT_EQ(1, num_times_logging_callback_called_); |
@@ -372,8 +380,7 @@ TEST_F(CastTransportImplTest, DedupRetransmissionWithAudio) { |
cast_message.ack_frame_id = 2; |
cast_message.missing_frames_and_packets.clear(); |
task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2)); |
- transport_sender_->OnReceivedCastMessage( |
- kAudioSsrc, RtcpCastMessageCallback(), cast_message); |
+ transport_sender_->OnReceivedCastMessage(kAudioSsrc, cast_message); |
task_runner_->RunTasks(); |
EXPECT_EQ(6, transport_->packets_sent()); |
EXPECT_EQ(1, num_times_logging_callback_called_); // Only 6 ms since last. |
@@ -383,8 +390,7 @@ TEST_F(CastTransportImplTest, DedupRetransmissionWithAudio) { |
cast_message.ack_frame_id = 1; |
cast_message.missing_frames_and_packets[1].insert(3); |
task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2)); |
- transport_sender_->OnReceivedCastMessage( |
- kVideoSsrc, RtcpCastMessageCallback(), cast_message); |
+ transport_sender_->OnReceivedCastMessage(kVideoSsrc, cast_message); |
task_runner_->RunTasks(); |
EXPECT_EQ(7, transport_->packets_sent()); |
EXPECT_EQ(1, num_times_logging_callback_called_); // Only 8 ms since last. |