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

chrome/common/pref_service.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 "chrome/common/pref_service.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 118 matching lines @@
   STLDeleteContainerPairSecondPointers(pref_observers_.begin(),
                                        pref_observers_.end());
   pref_observers_.clear();
 }
 
 bool PrefService::LoadPersistentPrefs(const std::wstring& file_path) {
   DCHECK(!file_path.empty());
   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();
   }
 }
 
 bool PrefService::SavePersistentPrefs(base::Thread* thread) const {
   DCHECK(!pref_filename_.empty());
   DCHECK(CalledOnValidThread());
 
   // TODO(tc): Do we want to prune webkit preferences that match the default
   // value?
   std::string data;
@@ skipping 488 matching lines @@
 
   // Pref not found, just return the app default.
   return default_value_.get();
 }
 
 bool PrefService::Preference::IsDefaultValue() const {
   DCHECK(default_value_.get());
   return default_value_->Equals(GetValue());
 }