| Index: remoting/host/me2me_desktop_environment.cc
|
| diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
|
| index be41bfb25f5d0bfeb435c58f0c3feef5dc302da2..c8a668c89f84e2ea9be4daad186b807c028cbfb2 100644
|
| --- a/remoting/host/me2me_desktop_environment.cc
|
| +++ b/remoting/host/me2me_desktop_environment.cc
|
| @@ -116,9 +116,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
|
|
|
| disconnect_window_ = HostWindow::CreateDisconnectWindow();
|
| disconnect_window_.reset(new HostWindowProxy(
|
| - caller_task_runner(),
|
| - ui_task_runner(),
|
| - disconnect_window_.Pass()));
|
| + caller_task_runner(), ui_task_runner(), std::move(disconnect_window_)));
|
| disconnect_window_->Start(client_session_control);
|
| }
|
|
|
| @@ -157,7 +155,7 @@ scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
|
| }
|
| desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_);
|
|
|
| - return desktop_environment.Pass();
|
| + return std::move(desktop_environment);
|
| }
|
|
|
| void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
|
|
|