| Index: remoting/host/policy_hack/policy_watcher_linux.cc
|
| diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc
|
| index 293155aa6ddfd231e8dbff4b6e3b0e22ac71c095..75a654125f63fbca8deb50fa5e8059d2d9272440 100644
|
| --- a/remoting/host/policy_hack/policy_watcher_linux.cc
|
| +++ b/remoting/host/policy_hack/policy_watcher_linux.cc
|
| @@ -149,12 +149,12 @@ class PolicyWatcherLinux : public PolicyWatcher {
|
| if (!value.get()) {
|
| LOG(WARNING) << "Failed to read configuration file "
|
| << config_file_iter->value() << ": " << error_msg;
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
| }
|
| if (!value->IsType(base::Value::TYPE_DICTIONARY)) {
|
| LOG(WARNING) << "Expected JSON dictionary in configuration file "
|
| << config_file_iter->value();
|
| - return scoped_ptr<base::DictionaryValue>();
|
| + return nullptr;
|
| }
|
| policy->MergeDictionary(static_cast<base::DictionaryValue*>(value.get()));
|
| }
|
|
|