| Index: chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| index bb2ee6112b8ec1580d5cca99fc8e1b0ac1120b55..fe76754c1119f22c9ce3fb2bc09ef7b9017b8bca 100644
|
| --- a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
|
|
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| @@ -326,8 +327,8 @@ storage::FileSystemOperation* MediaFileSystemBackend::CreateFileSystemOperation(
|
| scoped_ptr<storage::FileSystemOperationContext> operation_context(
|
| new storage::FileSystemOperationContext(context,
|
| media_task_runner_.get()));
|
| - return storage::FileSystemOperation::Create(
|
| - url, context, operation_context.Pass());
|
| + return storage::FileSystemOperation::Create(url, context,
|
| + std::move(operation_context));
|
| }
|
|
|
| bool MediaFileSystemBackend::SupportsStreaming(
|
| @@ -363,7 +364,7 @@ MediaFileSystemBackend::CreateFileStreamReader(
|
| device_media_async_file_util_->GetFileStreamReader(
|
| url, offset, expected_modification_time, context);
|
| DCHECK(reader);
|
| - return reader.Pass();
|
| + return reader;
|
| }
|
|
|
| return scoped_ptr<storage::FileStreamReader>(
|
|
|