Refactor: simplify interface of SenderRtcpSession and CastTransport.

media/cast/sender/video_sender_unittest.cc

Index: media/cast/sender/video_sender_unittest.cc
diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc
index 2ba93208c7987ccdcf8b82b48e29844cdabcf653..dc57fd52a6823ba0bce2e2348d12868bdf5d50a2 100644
--- a/media/cast/sender/video_sender_unittest.cc
+++ b/media/cast/sender/video_sender_unittest.cc
@@ -9,7 +9,7 @@
 
 #include "base/bind.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 "media/base/fake_single_thread_task_runner.h"
 #include "media/base/video_frame.h"
@@ -107,26 +107,6 @@ class TestPacketSender : public PacketTransport {
 void IgnorePlayoutDelayChanges(base::TimeDelta unused_playout_delay) {
 }
 
-class PeerVideoSender : public VideoSender {
- public:
-  PeerVideoSender(
-      scoped_refptr<CastEnvironment> cast_environment,
-      const VideoSenderConfig& video_config,
-      const StatusChangeCallback& status_change_cb,
-      const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
-      const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb,
-      CastTransport* const transport_sender)
-      : VideoSender(cast_environment,
-                    video_config,
-                    status_change_cb,
-                    create_vea_cb,
-                    create_video_encode_mem_cb,
-                    transport_sender,
-                    base::Bind(&IgnorePlayoutDelayChanges)) {}
-  using VideoSender::OnReceivedCastFeedback;
-  using VideoSender::OnReceivedPli;
-};
-
 class TransportClient : public CastTransport::Client {
  public:
   TransportClient() {}
@@ -135,9 +115,9 @@ class TransportClient : public CastTransport::Client {
     EXPECT_EQ(TRANSPORT_VIDEO_INITIALIZED, status);
   };
   void OnLoggingEventsReceived(
-      scoped_ptr<std::vector<FrameEvent>> frame_events,
-      scoped_ptr<std::vector<PacketEvent>> packet_events) final{};
-  void ProcessRtpPacket(scoped_ptr<Packet> packet) final{};
+      std::unique_ptr<std::vector<FrameEvent>> frame_events,
+      std::unique_ptr<std::vector<PacketEvent>> packet_events) final{};
+  void ProcessRtpPacket(std::unique_ptr<Packet> packet) final{};
 
   DISALLOW_COPY_AND_ASSIGN(TransportClient);
 };
@@ -149,11 +129,11 @@ class VideoSenderTest : public ::testing::Test {
   VideoSenderTest()
       : testing_clock_(new base::SimpleTestTickClock()),
         task_runner_(new FakeSingleThreadTaskRunner(testing_clock_)),
-        cast_environment_(
-            new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_),
-                                task_runner_,
-                                task_runner_,
-                                task_runner_)),
+        cast_environment_(new CastEnvironment(
+            std::unique_ptr<base::TickClock>(testing_clock_),
+            task_runner_,
+            task_runner_,
+            task_runner_)),
         operational_status_(STATUS_UNINITIALIZED),
         vea_factory_(task_runner_) {
     testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
@@ -162,8 +142,8 @@ class VideoSenderTest : public ::testing::Test {
     transport_ = new TestPacketSender();
     transport_sender_.reset(
         new CastTransportImpl(testing_clock_, base::TimeDelta(),
-                              make_scoped_ptr(new TransportClient()),
-                              make_scoped_ptr(transport_), task_runner_));
+                              base::WrapUnique(new TransportClient()),
+                              base::WrapUnique(transport_), task_runner_));
   }
 
   ~VideoSenderTest() override {}
@@ -183,24 +163,22 @@ class VideoSenderTest : public ::testing::Test {
 
     if (external) {
       vea_factory_.SetInitializationWillSucceed(expect_init_success);
-      video_sender_.reset(new PeerVideoSender(
-          cast_environment_,
-          video_config,
+      video_sender_.reset(new VideoSender(
+          cast_environment_, video_config,
           base::Bind(&SaveOperationalStatus, &operational_status_),
           base::Bind(
               &FakeVideoEncodeAcceleratorFactory::CreateVideoEncodeAccelerator,
               base::Unretained(&vea_factory_)),
           base::Bind(&FakeVideoEncodeAcceleratorFactory::CreateSharedMemory,
                      base::Unretained(&vea_factory_)),
-          transport_sender_.get()));
+          transport_sender_.get(), base::Bind(&IgnorePlayoutDelayChanges)));
     } else {
-      video_sender_.reset(new PeerVideoSender(
-          cast_environment_,
-          video_config,
+      video_sender_.reset(new VideoSender(
+          cast_environment_, video_config,
           base::Bind(&SaveOperationalStatus, &operational_status_),
           CreateDefaultVideoEncodeAcceleratorCallback(),
-          CreateDefaultVideoEncodeMemoryCallback(),
-          transport_sender_.get()));
+          CreateDefaultVideoEncodeMemoryCallback(), transport_sender_.get(),
+          base::Bind(&IgnorePlayoutDelayChanges)));
     }
     task_runner_->RunTasks();
   }
@@ -239,8 +217,8 @@ class VideoSenderTest : public ::testing::Test {
   OperationalStatus operational_status_;
   FakeVideoEncodeAcceleratorFactory vea_factory_;
   TestPacketSender* transport_;  // Owned by CastTransport.
-  scoped_ptr<CastTransportImpl> transport_sender_;
-  scoped_ptr<PeerVideoSender> video_sender_;
+  std::unique_ptr<CastTransportImpl> transport_sender_;
+  std::unique_ptr<VideoSender> video_sender_;
   int last_pixel_value_;
   base::TimeTicks first_frame_timestamp_;