| Index: chrome/browser/extensions/external_pref_loader.cc
|
| diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
|
| index c0775d2de2c070883bf455ea2cf1fdded82d4279..a019ec5fd91ee8498bd9e3e3b880b38b98698088 100644
|
| --- a/chrome/browser/extensions/external_pref_loader.cc
|
| +++ b/chrome/browser/extensions/external_pref_loader.cc
|
| @@ -76,7 +76,8 @@ base::DictionaryValue* ExtractExtensionPrefs(
|
| base::ValueDeserializer* deserializer,
|
| const base::FilePath& path) {
|
| std::string error_msg;
|
| - base::Value* extensions = deserializer->Deserialize(NULL, &error_msg);
|
| + scoped_ptr<base::Value> extensions =
|
| + deserializer->Deserialize(NULL, &error_msg);
|
| if (!extensions) {
|
| LOG(WARNING) << "Unable to deserialize json data: " << error_msg
|
| << " in file " << path.value() << ".";
|
| @@ -84,8 +85,10 @@ base::DictionaryValue* ExtractExtensionPrefs(
|
| }
|
|
|
| base::DictionaryValue* ext_dictionary = NULL;
|
| - if (extensions->GetAsDictionary(&ext_dictionary))
|
| + if (extensions->GetAsDictionary(&ext_dictionary)) {
|
| + base::IgnoreResult(extensions.release());
|
| return ext_dictionary;
|
| + }
|
|
|
| LOG(WARNING) << "Expected a JSON dictionary in file "
|
| << path.value() << ".";
|
|
|