Refactor: simplify interface of SenderRtcpSession and CastTransport.

media/cast/sender/video_sender_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 <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #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"
 #include "media/cast/cast_environment.h"
 #include "media/cast/constants.h"
 #include "media/cast/logging/simple_event_subscriber.h"
 #include "media/cast/net/cast_transport_config.h"
 #include "media/cast/net/cast_transport_impl.h"
 #include "media/cast/net/pacing/paced_sender.h"
 #include "media/cast/sender/fake_video_encode_accelerator_factory.h"
@@ skipping 77 matching lines @@
   bool paused_;
   base::Closure callback_;
   PacketRef stored_packet_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPacketSender);
 };
 
 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() {}
 
   void OnStatusChanged(CastTransportStatus status) final {
     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);
 };
 
 }  // namespace
 
 class VideoSenderTest : public ::testing::Test {
  protected:
   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());
     vea_factory_.SetAutoRespond(true);
     last_pixel_value_ = kPixelValue;
     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 {}
 
   void TearDown() final {
     video_sender_.reset();
     task_runner_->RunTasks();
   }
 
   // If |external| is true then external video encoder (VEA) is used.
   // |expect_init_success| is true if initialization is expected to succeed.
   void InitEncoder(bool external, bool expect_init_success) {
     VideoSenderConfig video_config = GetDefaultVideoSenderConfig();
     video_config.use_external_encoder = external;
 
     ASSERT_EQ(operational_status_, STATUS_UNINITIALIZED);
 
     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();
   }
 
   scoped_refptr<media::VideoFrame> GetNewVideoFrame() {
     if (first_frame_timestamp_.is_null())
       first_frame_timestamp_ = testing_clock_->NowTicks();
     gfx::Size size(kWidth, kHeight);
     scoped_refptr<media::VideoFrame> video_frame =
         media::VideoFrame::CreateFrame(
@@ skipping 18 matching lines @@
   void RunTasks(int during_ms) {
     task_runner_->Sleep(base::TimeDelta::FromMilliseconds(during_ms));
   }
 
   base::SimpleTestTickClock* const testing_clock_;  // Owned by CastEnvironment.
   const scoped_refptr<FakeSingleThreadTaskRunner> task_runner_;
   const scoped_refptr<CastEnvironment> cast_environment_;
   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_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoSenderTest);
 };
 
 TEST_F(VideoSenderTest, BuiltInEncoder) {
   InitEncoder(false, true);
   ASSERT_EQ(STATUS_INITIALIZED, operational_status_);
@@ skipping 380 matching lines @@
       video_frame,
       testing_clock_->NowTicks() + base::TimeDelta::FromMilliseconds(1000));
   RunTasks(33);
   transport_->SetPause(false);
   RunTasks(33);
   EXPECT_EQ(2, transport_->number_of_rtp_packets());
 }
 
 }  // namespace cast
 }  // namespace media