| Index: remoting/host/setup/daemon_controller_delegate_mac.mm
|
| diff --git a/remoting/host/setup/daemon_controller_delegate_mac.mm b/remoting/host/setup/daemon_controller_delegate_mac.mm
|
| index aa4703c0c848028d0d5bb236298ae34e1925f68b..4363a405d7cf2219c9663b6de2255f6aec5ab843 100644
|
| --- a/remoting/host/setup/daemon_controller_delegate_mac.mm
|
| +++ b/remoting/host/setup/daemon_controller_delegate_mac.mm
|
| @@ -61,7 +61,7 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateMac::GetConfig() {
|
| config->SetString(kHostIdConfigPath, value);
|
| if (host_config->GetString(kXmppLoginConfigPath, &value))
|
| config->SetString(kXmppLoginConfigPath, value);
|
| - return config.Pass();
|
| + return config;
|
| }
|
|
|
| void DaemonControllerDelegateMac::SetConfigAndStart(
|
| @@ -249,9 +249,8 @@ void DaemonControllerDelegateMac::PreferencePaneCallback(
|
| }
|
|
|
| scoped_refptr<DaemonController> DaemonController::Create() {
|
| - scoped_ptr<DaemonController::Delegate> delegate(
|
| - new DaemonControllerDelegateMac());
|
| - return new DaemonController(delegate.Pass());
|
| + return new DaemonController(
|
| + make_scoped_ptr(new DaemonControllerDelegateMac()));
|
| }
|
|
|
| } // namespace remoting
|
|
|