| 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 9ed446e99a01938bb8646790ca46627a20eab550..8379ea7e2af4fe2972d43dba431b8156fae3ec50 100644
|
| --- a/remoting/host/setup/daemon_controller_delegate_win.cc
|
| +++ b/remoting/host/setup/daemon_controller_delegate_win.cc
|
| @@ -173,13 +173,13 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateWin::GetConfig() {
|
| // Configure and start the Daemon Controller if it is installed already.
|
| HRESULT hr = ActivateController();
|
| if (FAILED(hr))
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
|
|
| // Get the host configuration.
|
| ScopedBstr host_config;
|
| hr = control_->GetConfig(host_config.Receive());
|
| if (FAILED(hr))
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
|
|
| // Parse the string into a dictionary.
|
| base::string16 file_content(
|
| @@ -189,7 +189,7 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateWin::GetConfig() {
|
| base::JSON_ALLOW_TRAILING_COMMAS));
|
|
|
| if (!config || config->GetType() != base::Value::TYPE_DICTIONARY)
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
|
|
| return scoped_ptr<base::DictionaryValue>(
|
| static_cast<base::DictionaryValue*>(config.release()));
|
|
|