| Index: remoting/host/pairing_registry_delegate_win.cc
|
| diff --git a/remoting/host/pairing_registry_delegate_win.cc b/remoting/host/pairing_registry_delegate_win.cc
|
| index b4b89b2097c987d702bcd3f83ec34bc5696bf977..ca814b23b4a9c392e779a1bc8a7eaac37156eb38 100644
|
| --- a/remoting/host/pairing_registry_delegate_win.cc
|
| +++ b/remoting/host/pairing_registry_delegate_win.cc
|
| @@ -44,7 +44,7 @@ scoped_ptr<base::DictionaryValue> ReadValue(const base::win::RegKey& key,
|
| if (result != ERROR_SUCCESS) {
|
| SetLastError(result);
|
| PLOG(ERROR) << "Cannot read value '" << value_name << "'";
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
| }
|
|
|
| // Parse the value.
|
| @@ -57,12 +57,12 @@ scoped_ptr<base::DictionaryValue> ReadValue(const base::win::RegKey& key,
|
| if (!value) {
|
| LOG(ERROR) << "Failed to parse '" << value_name << "': " << error_message
|
| << " (" << error_code << ").";
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
| }
|
|
|
| if (value->GetType() != base::Value::TYPE_DICTIONARY) {
|
| LOG(ERROR) << "Failed to parse '" << value_name << "': not a dictionary.";
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
| }
|
|
|
| return scoped_ptr<base::DictionaryValue>(
|
|
|