Index: components/nacl/loader/nacl_ipc_adapter.cc |
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc |
index 14db5f9b17baa0e063edbf09bed053b5b3f156e8..d8ac1c7f84707b766fcbdc875d048e16c6cf6a3c 100644 |
--- a/components/nacl/loader/nacl_ipc_adapter.cc |
+++ b/components/nacl/loader/nacl_ipc_adapter.cc |
@@ -6,6 +6,7 @@ |
#include <limits.h> |
#include <string.h> |
+#include <utility> |
#include "base/bind.h" |
#include "base/location.h" |
@@ -365,7 +366,7 @@ NaClIPCAdapter::NaClIPCAdapter(scoped_ptr<IPC::Channel> channel, |
cond_var_(&lock_), |
task_runner_(runner), |
locked_data_() { |
- io_thread_data_.channel_ = channel.Pass(); |
+ io_thread_data_.channel_ = std::move(channel); |
} |
void NaClIPCAdapter::ConnectChannel() { |
@@ -636,7 +637,7 @@ scoped_ptr<IPC::Message> CreateOpenResourceReply( |
// Write empty file tokens. |
new_msg->WriteUInt64(0); // token_lo |
new_msg->WriteUInt64(0); // token_hi |
- return new_msg.Pass(); |
+ return new_msg; |
} |
void NaClIPCAdapter::SaveOpenResourceMessage( |