Many changes to DictionaryValues:...

chrome/common/pref_service.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 416 matching lines @@
   if (!pref) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_BOOLEAN) {
     NOTREACHED() << "Wrong type for SetBoolean: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetBoolean(path, value);
-  DCHECK(rv);
+  persistent_->SetBoolean(path, value);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetInteger(const wchar_t* path, int value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_INTEGER) {
     NOTREACHED() << "Wrong type for SetInteger: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetInteger(path, value);
-  DCHECK(rv);
+  persistent_->SetInteger(path, value);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetReal(const wchar_t* path, double value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_REAL) {
     NOTREACHED() << "Wrong type for SetReal: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetReal(path, value);
-  DCHECK(rv);
+  persistent_->SetReal(path, value);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetString(const wchar_t* path, const std::wstring& value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_STRING) {
     NOTREACHED() << "Wrong type for SetString: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetString(path, value);
-  DCHECK(rv);
+  persistent_->SetString(path, value);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetFilePath(const wchar_t* path, const FilePath& value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_STRING) {
     NOTREACHED() << "Wrong type for SetFilePath: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
 #if defined(OS_POSIX)
   // Value::SetString only knows about UTF8 strings, so convert the path from
   // the system native value to UTF8.
   std::string path_utf8 = WideToUTF8(base::SysNativeMBToWide(value.value()));
-  bool rv = persistent_->SetString(path, path_utf8);
+  persistent_->SetString(path, path_utf8);
 #else
-  bool rv = persistent_->SetString(path, value.value());
+  persistent_->SetString(path, value.value());
 #endif
-  DCHECK(rv);
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 void PrefService::SetInt64(const wchar_t* path, int64 value) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
   if (pref->type() != Value::TYPE_STRING) {
     NOTREACHED() << "Wrong type for SetInt64: " << path;
     return;
   }
 
   scoped_ptr<Value> old_value(GetPrefCopy(path));
-  bool rv = persistent_->SetString(path, Int64ToWString(value));
-  DCHECK(rv);
+  persistent_->SetString(path, Int64ToWString(value));
 
   FireObserversIfChanged(path, old_value.get());
 }
 
 int64 PrefService::GetInt64(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
 
   std::wstring result;
   if (transient_->GetString(path, &result))
     return StringToInt64(WideToUTF16Hack(result));
@@ skipping 21 matching lines @@
   if (!pref) {
     NOTREACHED() << "Trying to get an unregistered pref: " << path;
     return NULL;
   }
   if (pref->type() != Value::TYPE_DICTIONARY) {
     NOTREACHED() << "Wrong type for GetMutableDictionary: " << path;
     return NULL;
   }
 
   DictionaryValue* dict = NULL;
-  bool rv = persistent_->GetDictionary(path, &dict);
-  if (!rv) {
+  if (!persistent_->GetDictionary(path, &dict)) {
     dict = new DictionaryValue;
-    rv = persistent_->Set(path, dict);
-    DCHECK(rv);
+    persistent_->Set(path, dict);
   }
   return dict;
 }
 
 ListValue* PrefService::GetMutableList(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to get an unregistered pref: " << path;
     return NULL;
   }
   if (pref->type() != Value::TYPE_LIST) {
     NOTREACHED() << "Wrong type for GetMutableList: " << path;
     return NULL;
   }
 
   ListValue* list = NULL;
-  bool rv = persistent_->GetList(path, &list);
-  if (!rv) {
+  if (!persistent_->GetList(path, &list)) {
     list = new ListValue;
-    rv = persistent_->Set(path, list);
-    DCHECK(rv);
+    persistent_->Set(path, list);
   }
   return list;
 }
 
 Value* PrefService::GetPrefCopy(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   DCHECK(pref);
   return pref->GetValue()->DeepCopy();
@@ skipping 69 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());
 }