| Index: remoting/host/win/worker_process_launcher.cc
|
| diff --git a/remoting/host/win/worker_process_launcher.cc b/remoting/host/win/worker_process_launcher.cc
|
| index ebb69dd0821a13f4e977878a8d4929d859df9404..941fefba8237230295bf50ce654fd024874670e2 100644
|
| --- a/remoting/host/win/worker_process_launcher.cc
|
| +++ b/remoting/host/win/worker_process_launcher.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "remoting/host/win/worker_process_launcher.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/single_thread_task_runner.h"
|
| @@ -48,14 +50,13 @@ const int kLaunchResultTimeoutSeconds = 5;
|
|
|
| namespace remoting {
|
|
|
| -WorkerProcessLauncher::Delegate::~Delegate() {
|
| -}
|
| +WorkerProcessLauncher::Delegate::~Delegate() {}
|
|
|
| WorkerProcessLauncher::WorkerProcessLauncher(
|
| scoped_ptr<WorkerProcessLauncher::Delegate> launcher_delegate,
|
| WorkerProcessIpcDelegate* ipc_handler)
|
| : ipc_handler_(ipc_handler),
|
| - launcher_delegate_(launcher_delegate.Pass()),
|
| + launcher_delegate_(std::move(launcher_delegate)),
|
| exit_code_(CONTROL_C_EXIT),
|
| ipc_enabled_(false),
|
| kill_process_timeout_(
|
| @@ -119,7 +120,7 @@ void WorkerProcessLauncher::OnProcessLaunched(
|
| }
|
|
|
| ipc_enabled_ = true;
|
| - worker_process_ = worker_process.Pass();
|
| + worker_process_ = std::move(worker_process);
|
| }
|
|
|
| void WorkerProcessLauncher::OnFatalError() {
|
|
|