| Index: remoting/host/desktop_session_win.cc
|
| diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
|
| index 6005b301c6c05b50274057502e9138dbda3a88f6..b1477836e157a6f011bb9e8ac7e9eb379f12bfa1 100644
|
| --- a/remoting/host/desktop_session_win.cc
|
| +++ b/remoting/host/desktop_session_win.cc
|
| @@ -375,7 +375,7 @@ scoped_ptr<DesktopSession> DesktopSessionWin::CreateForConsole(
|
| caller_task_runner, io_task_runner, daemon_process, id,
|
| HostService::GetInstance()));
|
|
|
| - return session.PassAs<DesktopSession>();
|
| + return session.Pass();
|
| }
|
|
|
| // static
|
| @@ -389,9 +389,9 @@ scoped_ptr<DesktopSession> DesktopSessionWin::CreateForVirtualTerminal(
|
| caller_task_runner, io_task_runner, daemon_process, id,
|
| HostService::GetInstance()));
|
| if (!session->Initialize(resolution))
|
| - return scoped_ptr<DesktopSession>();
|
| + return nullptr;
|
|
|
| - return session.PassAs<DesktopSession>();
|
| + return session.Pass();
|
| }
|
|
|
| DesktopSessionWin::DesktopSessionWin(
|
| @@ -552,8 +552,7 @@ void DesktopSessionWin::OnSessionAttached(uint32 session_id) {
|
| }
|
|
|
| // Create a launcher for the desktop process, using the per-session delegate.
|
| - launcher_.reset(new WorkerProcessLauncher(
|
| - delegate.PassAs<WorkerProcessLauncher::Delegate>(), this));
|
| + launcher_.reset(new WorkerProcessLauncher(delegate.Pass(), this));
|
| }
|
|
|
| void DesktopSessionWin::OnSessionDetached() {
|
|
|