| Index: content/renderer/media/android/media_source_delegate.cc
|
| diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
|
| index 8b234088a39db17329da48391e5397e7906bfd00..e29125d77bdb50e892504cedeac8549f31ce6ea4 100644
|
| --- a/content/renderer/media/android/media_source_delegate.cc
|
| +++ b/content/renderer/media/android/media_source_delegate.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <limits>
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -342,7 +343,7 @@ void MediaSourceDelegate::OnReadFromDemuxer(media::DemuxerStream::Type type) {
|
| scoped_ptr<DemuxerData> data(new DemuxerData());
|
| data->type = type;
|
| data->access_units.resize(access_unit_size_);
|
| - ReadFromDemuxerStream(type, data.Pass(), 0);
|
| + ReadFromDemuxerStream(type, std::move(data), 0);
|
| }
|
|
|
| void MediaSourceDelegate::ReadFromDemuxerStream(media::DemuxerStream::Type type,
|
| @@ -449,7 +450,7 @@ void MediaSourceDelegate::OnBufferReady(
|
| buffer->decrypt_config()->subsamples();
|
| }
|
| if (++index < data->access_units.size()) {
|
| - ReadFromDemuxerStream(type, data.Pass(), index);
|
| + ReadFromDemuxerStream(type, std::move(data), index);
|
| return;
|
| }
|
| break;
|
|
|