Change PrefStore::ReadResult to a boolean.

base/prefs/json_pref_store.cc

 // Copyright (c) 2012 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/prefs/json_pref_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 131 matching lines @@
     : path_(filename),
       file_message_loop_proxy_(file_message_loop_proxy),
       prefs_(new DictionaryValue()),
       read_only_(false),
       writer_(filename, file_message_loop_proxy),
       error_delegate_(NULL),
       initialized_(false),
       read_error_(PREF_READ_ERROR_OTHER) {
 }
 
-PrefStore::ReadResult JsonPrefStore::GetValue(const std::string& key,
-                                              const Value** result) const {
+bool JsonPrefStore::GetValue(const std::string& key,
+                             const Value** result) const {
   Value* tmp = NULL;
-  if (prefs_->Get(key, &tmp)) {
-    if (result)
-      *result = tmp;
-    return READ_OK;
-  }
-  return READ_NO_VALUE;
+  if (!prefs_->Get(key, &tmp))
+    return false;
+
+  if (result)
+    *result = tmp;
+  return true;
 }
 
 void JsonPrefStore::AddObserver(PrefStore::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void JsonPrefStore::RemoveObserver(PrefStore::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 size_t JsonPrefStore::NumberOfObservers() const {
   return observers_.size();
 }
 
 bool JsonPrefStore::IsInitializationComplete() const {
   return initialized_;
 }
 
-PrefStore::ReadResult JsonPrefStore::GetMutableValue(const std::string& key,
-                                                     Value** result) {
-  return prefs_->Get(key, result) ? READ_OK : READ_NO_VALUE;
+bool JsonPrefStore::GetMutableValue(const std::string& key,
+                                    Value** result) {
+  return prefs_->Get(key, result);
 }
 
 void JsonPrefStore::SetValue(const std::string& key, Value* value) {
   DCHECK(value);
   scoped_ptr<Value> new_value(value);
   Value* old_value = NULL;
   prefs_->Get(key, &old_value);
   if (!old_value || !value->Equals(old_value)) {
     prefs_->Set(key, new_value.release());
     ReportValueChanged(key);
@@ skipping 143 matching lines @@
         copy->Set(key, new base::ListValue);
     } else if (value->IsType(base::Value::TYPE_DICTIONARY)) {
       const base::DictionaryValue* dict = NULL;
       if (value->GetAsDictionary(&dict) && dict->empty())
         copy->Set(key, new base::DictionaryValue);
     }
   }
 
   return serializer.Serialize(*(copy.get()));
 }