Index: remoting/host/setup/me2me_native_messaging_host_main.cc |
diff --git a/remoting/host/setup/me2me_native_messaging_host_main.cc b/remoting/host/setup/me2me_native_messaging_host_main.cc |
index bfc943e57cfcb334038e624781344ca83623d07d..9a8acbd0f8d1f1fd9e3aca9a28a0bae97bc6d257 100644 |
--- a/remoting/host/setup/me2me_native_messaging_host_main.cc |
+++ b/remoting/host/setup/me2me_native_messaging_host_main.cc |
@@ -245,7 +245,7 @@ int StartMe2MeNativeMessagingHost() { |
return kInitializationFailed; |
pairing_registry = |
- new PairingRegistry(io_thread.task_runner(), delegate.Pass()); |
+ new PairingRegistry(io_thread.task_runner(), std::move(delegate)); |
#else // defined(OS_WIN) |
pairing_registry = |
CreatePairingRegistry(io_thread.task_runner()); |
@@ -253,17 +253,13 @@ int StartMe2MeNativeMessagingHost() { |
// Set up the native messaging channel. |
scoped_ptr<extensions::NativeMessagingChannel> channel( |
- new PipeMessagingChannel(read_file.Pass(), write_file.Pass())); |
+ new PipeMessagingChannel(std::move(read_file), std::move(write_file))); |
// Create the native messaging host. |
- scoped_ptr<Me2MeNativeMessagingHost> host( |
- new Me2MeNativeMessagingHost( |
- needs_elevation, |
- static_cast<intptr_t>(native_view_handle), |
- channel.Pass(), |
- daemon_controller, |
- pairing_registry, |
- oauth_client.Pass())); |
+ scoped_ptr<Me2MeNativeMessagingHost> host(new Me2MeNativeMessagingHost( |
+ needs_elevation, static_cast<intptr_t>(native_view_handle), |
+ std::move(channel), daemon_controller, pairing_registry, |
+ std::move(oauth_client))); |
host->Start(run_loop.QuitClosure()); |
// Run the loop until channel is alive. |