| Index: remoting/host/audio_pump.cc
|
| diff --git a/remoting/host/audio_pump.cc b/remoting/host/audio_pump.cc
|
| index 2a18bed8235f42bd01a54cad76006634e3137b50..10e62a96245f17cd5b416f08188652235af9b879 100644
|
| --- a/remoting/host/audio_pump.cc
|
| +++ b/remoting/host/audio_pump.cc
|
| @@ -57,8 +57,8 @@ AudioPump::Core::Core(base::WeakPtr<AudioPump> pump,
|
| scoped_ptr<AudioEncoder> audio_encoder)
|
| : pump_(pump),
|
| pump_task_runner_(base::ThreadTaskRunnerHandle::Get()),
|
| - audio_capturer_(audio_capturer.Pass()),
|
| - audio_encoder_(audio_encoder.Pass()),
|
| + audio_capturer_(std::move(audio_capturer)),
|
| + audio_encoder_(std::move(audio_encoder)),
|
| enabled_(true),
|
| bytes_pending_(0) {
|
| thread_checker_.DetachFromThread();
|
| @@ -98,7 +98,7 @@ void AudioPump::Core::EncodeAudioPacket(scoped_ptr<AudioPacket> packet) {
|
| return;
|
|
|
| scoped_ptr<AudioPacket> encoded_packet =
|
| - audio_encoder_->Encode(packet.Pass());
|
| + audio_encoder_->Encode(std::move(packet));
|
|
|
| // The audio encoder returns a null audio packet if there's no audio to send.
|
| if (!encoded_packet)
|
| @@ -122,8 +122,8 @@ AudioPump::AudioPump(
|
| weak_factory_(this) {
|
| DCHECK(audio_stub_);
|
|
|
| - core_.reset(new Core(weak_factory_.GetWeakPtr(), audio_capturer.Pass(),
|
| - audio_encoder.Pass()));
|
| + core_.reset(new Core(weak_factory_.GetWeakPtr(), std::move(audio_capturer),
|
| + std::move(audio_encoder)));
|
|
|
| audio_task_runner_->PostTask(
|
| FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get())));
|
| @@ -148,7 +148,7 @@ void AudioPump::SendAudioPacket(scoped_ptr<AudioPacket> packet, int size) {
|
| DCHECK(packet);
|
|
|
| audio_stub_->ProcessAudioPacket(
|
| - packet.Pass(),
|
| + std::move(packet),
|
| base::Bind(&AudioPump::OnPacketSent, weak_factory_.GetWeakPtr(), size));
|
| }
|
|
|
|
|