Change PrefStore::ReadResult to a boolean.
The third value in the enum (READ_USE_DEFAULT) isn't used anymore.
[email protected],[email protected],[email protected]
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11365112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166706 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/prefs/default_pref_store.cc b/base/prefs/default_pref_store.cc
index eb14a504..8e2644cc 100644
--- a/base/prefs/default_pref_store.cc
+++ b/base/prefs/default_pref_store.cc
@@ -9,25 +9,25 @@
DefaultPrefStore::DefaultPrefStore() {}
-PrefStore::ReadResult DefaultPrefStore::GetValue(
+bool DefaultPrefStore::GetValue(
const std::string& key,
const base::Value** result) const {
- return prefs_.GetValue(key, result) ? READ_OK : READ_NO_VALUE;
+ return prefs_.GetValue(key, result);
}
void DefaultPrefStore::SetDefaultValue(const std::string& key, Value* value) {
- CHECK(GetValue(key, NULL) == READ_NO_VALUE);
+ DCHECK(!GetValue(key, NULL));
prefs_.SetValue(key, value);
}
void DefaultPrefStore::RemoveDefaultValue(const std::string& key) {
- CHECK(GetValue(key, NULL) == READ_OK);
+ DCHECK(GetValue(key, NULL));
prefs_.RemoveValue(key);
}
base::Value::Type DefaultPrefStore::GetType(const std::string& key) const {
- const Value* value;
- return GetValue(key, &value) == READ_OK ? value->GetType() : Value::TYPE_NULL;
+ const Value* value = NULL;
+ return GetValue(key, &value) ? value->GetType() : Value::TYPE_NULL;
}
DefaultPrefStore::const_iterator DefaultPrefStore::begin() const {
