| Index: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
|
| index 4e88200b2542b94cccae3ef1f44db22feda2ce10..a370ccf52dd06120edbb185cfdea8592782657da 100644
|
| --- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| @@ -210,7 +212,7 @@ void VideoCaptureGpuJpegDecoder::GpuChannelEstablishedOnUIThread(
|
| BrowserGpuChannelHostFactory::instance()->GetGpuChannel());
|
| task_runner->PostTask(
|
| FROM_HERE, base::Bind(&VideoCaptureGpuJpegDecoder::FinishInitialization,
|
| - weak_this, base::Passed(&gpu_channel_host)));
|
| + weak_this, std::move(gpu_channel_host)));
|
| }
|
|
|
| void VideoCaptureGpuJpegDecoder::FinishInitialization(
|
| @@ -220,7 +222,7 @@ void VideoCaptureGpuJpegDecoder::FinishInitialization(
|
| if (!gpu_channel_host) {
|
| LOG(ERROR) << "Failed to establish GPU channel for JPEG decoder";
|
| } else if (gpu_channel_host->gpu_info().jpeg_decode_accelerator_supported) {
|
| - gpu_channel_host_ = gpu_channel_host.Pass();
|
| + gpu_channel_host_ = std::move(gpu_channel_host);
|
| decoder_ = gpu_channel_host_->CreateJpegDecoder(this);
|
| }
|
| decoder_status_ = decoder_ ? INIT_PASSED : FAILED;
|
|
|