| Index: media/cast/sender/audio_sender_unittest.cc
|
| diff --git a/media/cast/sender/audio_sender_unittest.cc b/media/cast/sender/audio_sender_unittest.cc
|
| index 21fd266599108b6e80211726ea1b7e4ec9cf2884..68199281238d05bd4bc0a3f8b20e8d2725e63257 100644
|
| --- a/media/cast/sender/audio_sender_unittest.cc
|
| +++ b/media/cast/sender/audio_sender_unittest.cc
|
| @@ -2,7 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "media/cast/sender/audio_sender.h"
|
| +
|
| #include <stdint.h>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -16,7 +19,6 @@
|
| #include "media/cast/constants.h"
|
| #include "media/cast/net/cast_transport_config.h"
|
| #include "media/cast/net/cast_transport_sender_impl.h"
|
| -#include "media/cast/sender/audio_sender.h"
|
| #include "media/cast/test/fake_single_thread_task_runner.h"
|
| #include "media/cast/test/utility/audio_utility.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -75,10 +77,8 @@ class AudioSenderTest : public ::testing::Test {
|
| testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
|
| task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
|
| cast_environment_ =
|
| - new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_).Pass(),
|
| - task_runner_,
|
| - task_runner_,
|
| - task_runner_);
|
| + new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_),
|
| + task_runner_, task_runner_, task_runner_);
|
| audio_config_.codec = CODEC_AUDIO_OPUS;
|
| audio_config_.use_external_encoder = false;
|
| audio_config_.frequency = kDefaultAudioSamplingRate;
|
| @@ -133,7 +133,7 @@ TEST_F(AudioSenderTest, Encode20ms) {
|
| TestAudioBusFactory::kMiddleANoteFreq,
|
| 0.5f).NextAudioBus(kDuration));
|
|
|
| - audio_sender_->InsertAudio(bus.Pass(), testing_clock_->NowTicks());
|
| + audio_sender_->InsertAudio(std::move(bus), testing_clock_->NowTicks());
|
| task_runner_->RunTasks();
|
| EXPECT_LE(1, transport_.number_of_rtp_packets());
|
| EXPECT_LE(1, transport_.number_of_rtcp_packets());
|
| @@ -147,7 +147,7 @@ TEST_F(AudioSenderTest, RtcpTimer) {
|
| TestAudioBusFactory::kMiddleANoteFreq,
|
| 0.5f).NextAudioBus(kDuration));
|
|
|
| - audio_sender_->InsertAudio(bus.Pass(), testing_clock_->NowTicks());
|
| + audio_sender_->InsertAudio(std::move(bus), testing_clock_->NowTicks());
|
| task_runner_->RunTasks();
|
|
|
| // Make sure that we send at least one RTCP packet.
|
|
|