Refactoring: CastTransport InitializeAudio/InitializeVideo.

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 "media/cast/sender/video_sender.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 116 matching lines @@
                     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);
+    EXPECT_EQ(TRANSPORT_STREAM_INITIALIZED, status);
   };
   void OnLoggingEventsReceived(
       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(
             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(),
-                              base::WrapUnique(new TransportClient()),
-                              base::WrapUnique(transport_), task_runner_));
+    transport_sender_.reset(new CastTransportImpl(
+        testing_clock_, base::TimeDelta(), base::MakeUnique<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.
@@ skipping 456 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