Change the signature of JSONReader::Read() and related

methods to be more friendly to use with scoped_ptr. Change
all the callsites.

Review URL: http://codereview.chromium.org/16270

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7486 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 19 insertions, 23 deletions

diff --git a/chrome/common/pref_service.cc b/chrome/common/pref_service.cc
index 8f3322a..870e79e 100644
--- a/chrome/common/pref_service.cc
+++ b/chrome/common/pref_service.cc
@@ -136,38 +136,34 @@ bool PrefService::LoadPersistentPrefs(const std::wstring& file_path) {
   DCHECK(CalledOnValidThread());
 
   JSONFileValueSerializer serializer(file_path);
-  Value* root = NULL;
-  if (serializer.Deserialize(&root, NULL)) {
-    // Preferences should always have a dictionary root.
-    if (!root->IsType(Value::TYPE_DICTIONARY)) {
-      delete root;
-      return false;
-    }
+  scoped_ptr<Value> root(serializer.Deserialize(NULL));
+  if (!root.get())
+    return false;
 
-    persistent_.reset(static_cast<DictionaryValue*>(root));
-    return true;
-  }
+  // Preferences should always have a dictionary root.
+  if (!root->IsType(Value::TYPE_DICTIONARY))
+    return false;
 
-  return false;
+  persistent_.reset(static_cast<DictionaryValue*>(root.release()));
+  return true;
 }
 
 void PrefService::ReloadPersistentPrefs() {
   DCHECK(CalledOnValidThread());
 
   JSONFileValueSerializer serializer(pref_filename_);
-  Value* root;
-  if (serializer.Deserialize(&root, NULL)) {
-    // Preferences should always have a dictionary root.
-    if (!root->IsType(Value::TYPE_DICTIONARY)) {
-      delete root;
-      return;
-    }
+  scoped_ptr<Value> root(serializer.Deserialize(NULL));
+  if (!root.get())
+    return;
 
-    persistent_.reset(static_cast<DictionaryValue*>(root));
-    for (PreferenceSet::iterator it = prefs_.begin();
-         it != prefs_.end(); ++it) {
-      (*it)->root_pref_ = persistent_.get();
-    }
+  // Preferences should always have a dictionary root.
+  if (!root->IsType(Value::TYPE_DICTIONARY))
+    return;
+
+  persistent_.reset(static_cast<DictionaryValue*>(root.release()));
+  for (PreferenceSet::iterator it = prefs_.begin();
+       it != prefs_.end(); ++it) {
+    (*it)->root_pref_ = persistent_.get();
   }
 }