Refactor: simplify interface of SenderRtcpSession and CastTransport.

media/cast/net/cast_transport_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/net/cast_transport_impl.h"
 
 #include <gtest/gtest.h>
 #include <stdint.h>
 #include <utility>
 
 #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"
 #include "media/cast/net/cast_transport_config.h"
 #include "media/cast/net/rtcp/rtcp_defines.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 
 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 comment stating that the test
code calls into CastTransportImpl directly, instead of having SenderRtcpSession
call into it through this interface)

[xjz, 2016/04/29 19:15:49]

Renamed. I don't quite get this comment. CastTransportImpl will start the
SenderRtcpSession, which will handle the RTCP messages through this interface as
normal. 

[miu, 2016/05/02 21:30:01]

What I meant was that, for this test code, there are no raw RTCP packets being
passed to SenderRtcpSession (which would then call-back to CastTransportImpl).
Instead, the test code is calling CastTransportImpl directly. For example, on
line 235:

  transport_sender_->OnReceivedCastMessage(kVideoSsrc, cast_message);

So, this RtcpObserver here is just a "placeholder" that isn't used for anything
other than CastTransportSender not accepting a nullptr when calling
InitializeAudio/Video().

[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 {
  public:
   FakePacketSender() : paused_(false), packets_sent_(0), bytes_sent_(0) {}
 
   bool SendPacket(PacketRef packet, const base::Closure& cb) final {
     if (paused_) {
       stored_packet_ = packet;
       callback_ = cb;
@@ skipping 46 matching lines @@
 
   void InitWithoutLogging();
   void InitWithOptions();
   void InitWithLogging();
 
   void InitializeVideo() {
     CastTransportRtpConfig rtp_config;
     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() {
     CastTransportRtpConfig rtp_config;
     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_;
 };
 
 namespace {
 
 class TransportClient : public CastTransport::Client {
  public:
   explicit TransportClient(
       CastTransportImplTest* cast_transport_sender_impl_test)
       : cast_transport_sender_impl_test_(cast_transport_sender_impl_test) {}
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportClient);
 };
 
 }  // namespace
 
 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);
   options->SetInteger("pacer_max_burst_size", 100);
   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();
 }
 
 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();
 }
 
 TEST_F(CastTransportImplTest, InitWithoutLogging) {
   InitWithoutLogging();
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(50));
   EXPECT_EQ(0, num_times_logging_callback_called_);
 }
 
@@ skipping 33 matching lines @@
   transport_sender_->ResendPackets(kVideoSsrc, missing_packets, true,
                                    dedup_info);
 
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(10));
   EXPECT_EQ(2, num_times_logging_callback_called_);
 
   RtcpCastMessage cast_message;
   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_);
 
   // Resend one packet in the socket when unpaused.
   // Resend one more packet from NACK.
   EXPECT_EQ(6, transport_->packets_sent());
 }
 
 TEST_F(CastTransportImplTest, CancelRetransmits) {
@@ skipping 97 matching lines @@
   fake_audio.frame_id = 2;
   fake_audio.reference_time = testing_clock_.NowTicks();
   transport_sender_->InsertFrame(kAudioSsrc, fake_audio);
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2));
   EXPECT_EQ(2, transport_->packets_sent());
 
   // Ack the first audio frame.
   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.
 
   // Send a fake video frame that will be decomposed into 4 packets.
   EncodedFrame fake_video;
   fake_video.frame_id = 1;
   fake_video.dependency = EncodedFrame::KEY;
   fake_video.data.resize(5000, ' ');
   transport_sender_->InsertFrame(kVideoSsrc, fake_video);
   task_runner_->RunTasks();
   EXPECT_EQ(6, transport_->packets_sent());
   EXPECT_EQ(0, num_times_logging_callback_called_);  // Only 4 ms since last.
 
   // Retransmission is reject because audio is not acked yet.
   cast_message.remote_ssrc = kVideoSsrc;
   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_);
 
   // Ack the second audio frame.
   cast_message.remote_ssrc = kAudioSsrc;
   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.
 
   // Retransmission of video packet now accepted.
   cast_message.remote_ssrc = kVideoSsrc;
   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.
 
   task_runner_->Sleep(base::TimeDelta::FromMilliseconds(2));
   EXPECT_EQ(2, num_times_logging_callback_called_);
 }
 
 }  // namespace cast
 }  // namespace media