Ramove use of JSONReader::DeprecatedRead from chromeos/

chromeos/network/onc/onc_translator_shill_to_onc.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_translator.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
@@ skipping 13 matching lines @@
 
 namespace chromeos {
 namespace onc {
 
 namespace {
 
 // Converts |str| to a base::Value of the given |type|. If the conversion fails,
 // returns NULL.
 scoped_ptr<base::Value> ConvertStringToValue(const std::string& str,
                                              base::Value::Type type) {
-  base::Value* value;
+  scoped_ptr<base::Value> value;
   if (type == base::Value::TYPE_STRING) {
-    value = new base::StringValue(str);
+    value = make_scoped_ptr(new base::StringValue(str));

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

shouldn't this be

value.reset(new ...)
?

   } else {
-    value = base::JSONReader::DeprecatedRead(str);
+    value = base::JSONReader::Read(str);
   }
-
-  if (value == NULL || value->GetType() != type) {
-    delete value;
-    value = NULL;
-  }
-  return make_scoped_ptr(value);
+  return value;

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

this must keep the type check:

if (value && value->GetType() != type)
  return nullptr;

 }
 
 // This class implements the translation of properties from the given
 // |shill_dictionary| to a new ONC object of signature |onc_signature|. Using
 // recursive calls to CreateTranslatedONCObject of new instances, nested objects
 // are translated.
 class ShillToONCTranslator {
  public:
   ShillToONCTranslator(const base::DictionaryValue& shill_dictionary,
                        ::onc::ONCSource onc_source,
@@ skipping 711 matching lines @@
     const NetworkState* network_state) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, onc_source, *onc_signature,
                                   network_state);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos