Ramove use of JSONReader::DeprecatedRead from chromeos/

chromeos/network/onc/onc_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_utils.h"
 
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 30 matching lines @@
 
 }  // namespace
 
 const char kEmptyUnencryptedConfiguration[] =
     "{\"Type\":\"UnencryptedConfiguration\",\"NetworkConfigurations\":[],"
     "\"Certificates\":[]}";
 
 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);
 }
 
 scoped_ptr<base::DictionaryValue> Decrypt(const std::string& passphrase,
                                           const base::DictionaryValue& root) {
   const int kKeySizeInBits = 256;
   const int kMaxIterationCount = 500000;
   std::string onc_type;
@@ skipping 911 matching lines @@
     default: {
       LOG(ERROR) << "Unexpected proxy mode in Shill config: " << mode;
       return nullptr;
     }
   }
   return proxy_settings.Pass();
 }
 
 }  // namespace onc
 }  // namespace chromeos