| 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 57de922094cd7fed9861bdfc793b5a2c408e7c9b..2e4013258c1ad99ba38191fc3db68be2ef28a38b 100644
|
| --- a/remoting/host/setup/daemon_controller_delegate_linux.cc
|
| +++ b/remoting/host/setup/daemon_controller_delegate_linux.cc
|
| @@ -139,7 +139,7 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateLinux::GetConfig() {
|
| if (config->GetString(kXmppLoginConfigPath, &value)) {
|
| result->SetString(kXmppLoginConfigPath, value);
|
| }
|
| - return result.Pass();
|
| + return result;
|
| }
|
|
|
| void DaemonControllerDelegateLinux::SetConfigAndStart(
|
| @@ -229,9 +229,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
|
|
|