Index: remoting/host/setup/daemon_controller_delegate_win.cc |
diff --git a/remoting/host/setup/daemon_controller_delegate_win.cc b/remoting/host/setup/daemon_controller_delegate_win.cc |
index ef0627f4b5d7542fd0c1ba3f7a59505d790fc0b6..baab288c72af23389c45d6b6a6ab6fbacc5a96c2 100644 |
--- a/remoting/host/setup/daemon_controller_delegate_win.cc |
+++ b/remoting/host/setup/daemon_controller_delegate_win.cc |
@@ -256,7 +256,7 @@ ScopedScHandle OpenService(DWORD access) { |
<< "' service"; |
} |
- return service.Pass(); |
+ return service; |
} |
void InvokeCompletionCallback( |
@@ -468,9 +468,8 @@ void DaemonControllerDelegateWin::SetConfigAndStart( |
} |
scoped_refptr<DaemonController> DaemonController::Create() { |
- scoped_ptr<DaemonController::Delegate> delegate( |
- new DaemonControllerDelegateWin()); |
- return new DaemonController(delegate.Pass()); |
+ return new DaemonController( |
+ make_scoped_ptr(new DaemonControllerDelegateWin())); |
} |
} // namespace remoting |