| Index: remoting/host/daemon_process_win.cc
|
| diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
|
| index e290857cbcba5fad16663b48fa9b4dae44c1dddb..6d651ac321328aa0bf44ba42b394de83c27ce066 100644
|
| --- a/remoting/host/daemon_process_win.cc
|
| +++ b/remoting/host/daemon_process_win.cc
|
| @@ -6,6 +6,8 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <utility>
|
| +
|
| #include "base/base_switches.h"
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -229,8 +231,8 @@ void DaemonProcessWin::LaunchNetworkProcess() {
|
| kCopiedSwitchNames, arraysize(kCopiedSwitchNames));
|
|
|
| scoped_ptr<UnprivilegedProcessDelegate> delegate(
|
| - new UnprivilegedProcessDelegate(io_task_runner(), target.Pass()));
|
| - network_launcher_.reset(new WorkerProcessLauncher(delegate.Pass(), this));
|
| + new UnprivilegedProcessDelegate(io_task_runner(), std::move(target)));
|
| + network_launcher_.reset(new WorkerProcessLauncher(std::move(delegate), this));
|
| }
|
|
|
| scoped_ptr<DaemonProcess> DaemonProcess::Create(
|
| @@ -241,7 +243,7 @@ scoped_ptr<DaemonProcess> DaemonProcess::Create(
|
| new DaemonProcessWin(caller_task_runner, io_task_runner,
|
| stopped_callback));
|
| daemon_process->Initialize();
|
| - return daemon_process.Pass();
|
| + return std::move(daemon_process);
|
| }
|
|
|
| void DaemonProcessWin::DisableAutoStart() {
|
|
|