| Index: remoting/host/setup/daemon_controller_delegate_linux.cc
|
| diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc
|
| index f1c3bafb17fe7d4a3418d08932fa1a727ed93cdc..a0fa8bcec1ee6724d405df12ee916c289bf7147b 100644
|
| --- a/remoting/host/setup/daemon_controller_delegate_linux.cc
|
| +++ b/remoting/host/setup/daemon_controller_delegate_linux.cc
|
| @@ -140,7 +140,7 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateLinux::GetConfig() {
|
| if (config->GetString(kXmppLoginConfigPath, &value)) {
|
| result->SetString(kXmppLoginConfigPath, value);
|
| }
|
| - return result.Pass();
|
| + return result;
|
| }
|
|
|
| void DaemonControllerDelegateLinux::SetConfigAndStart(
|
| @@ -230,9 +230,8 @@ DaemonControllerDelegateLinux::GetUsageStatsConsent() {
|
| }
|
|
|
| scoped_refptr<DaemonController> DaemonController::Create() {
|
| - scoped_ptr<DaemonController::Delegate> delegate(
|
| - new DaemonControllerDelegateLinux());
|
| - return new DaemonController(delegate.Pass());
|
| + return new DaemonController(
|
| + make_scoped_ptr(new DaemonControllerDelegateLinux()));
|
| }
|
|
|
| } // namespace remoting
|
|
|