| Index: media/base/media_file_checker.cc
|
| diff --git a/media/base/media_file_checker.cc b/media/base/media_file_checker.cc
|
| index 0482bc5474d97348dbd6186651af375f01a82279..a04775b76b6a3bf68bf116bde4c58105a81b2f53 100644
|
| --- a/media/base/media_file_checker.cc
|
| +++ b/media/base/media_file_checker.cc
|
| @@ -6,8 +6,8 @@
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| -
|
| #include <map>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/time/time.h"
|
| @@ -24,14 +24,13 @@ static void OnError(bool* called) {
|
| *called = false;
|
| }
|
|
|
| -MediaFileChecker::MediaFileChecker(base::File file) : file_(file.Pass()) {
|
| -}
|
| +MediaFileChecker::MediaFileChecker(base::File file) : file_(std::move(file)) {}
|
|
|
| MediaFileChecker::~MediaFileChecker() {
|
| }
|
|
|
| bool MediaFileChecker::Start(base::TimeDelta check_time) {
|
| - media::FileDataSource source(file_.Pass());
|
| + media::FileDataSource source(std::move(file_));
|
| bool read_ok = true;
|
| media::BlockingUrlProtocol protocol(&source, base::Bind(&OnError, &read_ok));
|
| media::FFmpegGlue glue(&protocol);
|
|
|