Ramove use of JSONReader::DeprecatedRead from chromeos/

chromeos/network/onc/onc_utils.cc

Index: chromeos/network/onc/onc_utils.cc
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 85c2b9d7152f92541a11bf5085c8bfab53ade064..ce693ecea68ba32139285e2e1bcc70b71406cba8 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc
@@ -48,13 +48,12 @@ const char kEmptyUnencryptedConfiguration[] =
 scoped_ptr<base::DictionaryValue> ReadDictionaryFromJson(
     const std::string& json) {
   std::string error;
-  base::Value* root = base::JSONReader::DeprecatedReadAndReturnError(
+  scoped_ptr<base::Value> root = base::JSONReader::ReadAndReturnError(
       json, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error);
 
   base::DictionaryValue* dict_ptr = nullptr;
-  if (!root || !root->GetAsDictionary(&dict_ptr)) {
+  if (!root.get() || !root.release()->GetAsDictionary(&dict_ptr)) {

[pneubeck (no reviews), 2015/09/09 11:49:51]

it's common to drop the ".get()" for boolean checks.

this leaks memory in when root was not a dictionary:
 root.release() gives up ownership
 and GetAsDictionary assigns nullptr to dict_ptr,
 thus the orginal root is leaked.

please instead change to

base::DictionaryValue* dict_ptr = nullptr;
if (!root || !root->GetAsDictionary(&dict_ptr)) {
  NET_LOG(ERROR) << ...;
  return nullptr;
}

root.release();
return make_scoped_ptr(dict_ptr);

     NET_LOG(ERROR) << "Invalid JSON Dictionary: " << error;
-    delete root;
   }
 
   return make_scoped_ptr(dict_ptr);