Refactoring: CastTransport InitializeAudio/InitializeVideo.

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 <memory>
@@ skipping 89 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 = RtpPayloadType::VIDEO_VP8;
-    transport_sender_->InitializeVideo(
-        rtp_config, base::WrapUnique(new StubRtcpObserver()));
+    transport_sender_->InitializeStream(rtp_config,
+                                        base::MakeUnique<StubRtcpObserver>());
   }
 
   void InitializeAudio() {
     CastTransportRtpConfig rtp_config;
     rtp_config.ssrc = kAudioSsrc;
     rtp_config.feedback_ssrc = 3;
     rtp_config.rtp_payload_type = RtpPayloadType::AUDIO_OPUS;
-    transport_sender_->InitializeAudio(
-        rtp_config, base::WrapUnique(new StubRtcpObserver()));
+    transport_sender_->InitializeStream(rtp_config,
+                                        base::MakeUnique<StubRtcpObserver>());
   }
 
   base::SimpleTestTickClock testing_clock_;
   scoped_refptr<FakeSingleThreadTaskRunner> task_runner_;
   std::unique_ptr<CastTransportImpl> transport_sender_;
   FakePacketSender* transport_;  // Owned by CastTransport.
   int num_times_logging_callback_called_;
 };
 
 namespace {
@@ skipping 18 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TransportClient);
 };
 
 }  // namespace
 
 void CastTransportImplTest::InitWithoutLogging() {
   transport_ = new FakePacketSender();
   transport_sender_.reset(
       new CastTransportImpl(&testing_clock_, base::TimeDelta(),
-                            base::WrapUnique(new TransportClient(nullptr)),
+                            base::MakeUnique<TransportClient>(nullptr),
                             base::WrapUnique(transport_), task_runner_));
   task_runner_->RunTasks();
 }
 
 void CastTransportImplTest::InitWithOptions() {
   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(),
-                            base::WrapUnique(new TransportClient(nullptr)),
+                            base::MakeUnique<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),
-      base::WrapUnique(new TransportClient(this)), base::WrapUnique(transport_),
+      base::MakeUnique<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 207 matching lines @@
   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