Index: remoting/host/native_messaging/native_messaging_reader.cc |
diff --git a/remoting/host/native_messaging/native_messaging_reader.cc b/remoting/host/native_messaging/native_messaging_reader.cc |
index f7df74d59dbbc9527c724d36b4969807f3507922..ffb553e909c0aa2cbb577b436d820a1090dd00d8 100644 |
--- a/remoting/host/native_messaging/native_messaging_reader.cc |
+++ b/remoting/host/native_messaging/native_messaging_reader.cc |
@@ -7,6 +7,7 @@ |
#include <stdint.h> |
#include <string> |
+#include <utility> |
#include "base/bind.h" |
#include "base/files/file.h" |
@@ -70,7 +71,7 @@ NativeMessagingReader::Core::Core( |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
scoped_refptr<base::SequencedTaskRunner> read_task_runner, |
base::WeakPtr<NativeMessagingReader> reader) |
- : read_stream_(file.Pass()), |
+ : read_stream_(std::move(file)), |
reader_(reader), |
caller_task_runner_(caller_task_runner), |
read_task_runner_(read_task_runner) { |
@@ -138,7 +139,7 @@ NativeMessagingReader::NativeMessagingReader(base::File file) |
weak_factory_(this) { |
reader_thread_.Start(); |
read_task_runner_ = reader_thread_.task_runner(); |
- core_.reset(new Core(file.Pass(), base::ThreadTaskRunnerHandle::Get(), |
+ core_.reset(new Core(std::move(file), base::ThreadTaskRunnerHandle::Get(), |
read_task_runner_, weak_factory_.GetWeakPtr())); |
} |
@@ -160,7 +161,7 @@ void NativeMessagingReader::Start(MessageCallback message_callback, |
void NativeMessagingReader::InvokeMessageCallback( |
scoped_ptr<base::Value> message) { |
- message_callback_.Run(message.Pass()); |
+ message_callback_.Run(std::move(message)); |
} |
void NativeMessagingReader::InvokeEofCallback() { |