Change the signature of JSONReader::Read() and related methods to be more

chrome/installer/util/master_preferences.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/master_preferences.h"
 
 namespace {
 
 DictionaryValue* ReadJSONPrefs(const std::string& data) {
   JSONStringValueSerializer json(data);
-  Value* root;
-  if (!json.Deserialize(&root, NULL))
+  scoped_ptr<Value> root(json.Deserialize(NULL));
+  if (!root.get())
     return NULL;
-  if (!root->IsType(Value::TYPE_DICTIONARY)) {
-    delete root;
+  if (!root->IsType(Value::TYPE_DICTIONARY))
     return NULL;
-  }
-  return static_cast<DictionaryValue*>(root);
+
+  return static_cast<DictionaryValue*>(root.release());
 }
 
 bool GetBooleanPref(const DictionaryValue* prefs, const std::wstring& name) {
   bool value = false;
   prefs->GetBoolean(name, &value);
   return value;
 }
 
 }  // namespace
 
@@ skipping 63 matching lines @@
   if (GetBooleanPref(json_root.get(), kSystemLevel))
     parse_result |= MASTER_PROFILE_SYSTEM_LEVEL;
 
   if (GetBooleanPref(json_root.get(), kVerboseLogging))
     parse_result |= MASTER_PROFILE_VERBOSE_LOGGING;
 
   return parse_result;
 }
 
 }  // installer_util