| 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 9821f868a347791b1834ff5c5c1adf9f97ef9bbd..7da1451aab4157ed5b442cd9c6db0293fc8455f0 100644
|
| --- a/remoting/host/setup/daemon_controller_delegate_mac.mm
|
| +++ b/remoting/host/setup/daemon_controller_delegate_mac.mm
|
| @@ -62,7 +62,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(
|
| @@ -250,9 +250,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
|
|
|