Change PrefStore::ReadResult to a boolean.

base/prefs/overlay_user_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/overlay_user_pref_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 OverlayUserPrefStore::OverlayUserPrefStore(
@@ skipping 15 matching lines @@
 }
 
 size_t OverlayUserPrefStore::NumberOfObservers() const {
   return observers_.size();
 }
 
 bool OverlayUserPrefStore::IsInitializationComplete() const {
   return underlay_->IsInitializationComplete();
 }
 
-PrefStore::ReadResult OverlayUserPrefStore::GetValue(
-    const std::string& key,
-    const Value** result) const {
+bool OverlayUserPrefStore::GetValue(const std::string& key,
+                                    const Value** result) const {
   // If the |key| shall NOT be stored in the overlay store, there must not
   // be an entry.
   DCHECK(ShallBeStoredInOverlay(key) || !overlay_.GetValue(key, NULL));
 
   if (overlay_.GetValue(key, result))
-    return READ_OK;
+    return true;
   return underlay_->GetValue(GetUnderlayKey(key), result);
 }
 
-PrefStore::ReadResult OverlayUserPrefStore::GetMutableValue(
-    const std::string& key,
-    Value** result) {
+bool OverlayUserPrefStore::GetMutableValue(const std::string& key,
+                                           Value** result) {
   if (!ShallBeStoredInOverlay(key))
     return underlay_->GetMutableValue(GetUnderlayKey(key), result);
 
   if (overlay_.GetValue(key, result))
-    return READ_OK;
+    return true;
 
   // Try to create copy of underlay if the overlay does not contain a value.
   Value* underlay_value = NULL;
-  PrefStore::ReadResult read_result =
-      underlay_->GetMutableValue(GetUnderlayKey(key), &underlay_value);
-  if (read_result != READ_OK)
-    return read_result;
+  if (!underlay_->GetMutableValue(GetUnderlayKey(key), &underlay_value))
+    return false;
 
   *result = underlay_value->DeepCopy();
   overlay_.SetValue(key, *result);
-  return READ_OK;
+  return true;
 }
 
 void OverlayUserPrefStore::SetValue(const std::string& key,
-                                      Value* value) {
+                                    Value* value) {
   if (!ShallBeStoredInOverlay(key)) {
     underlay_->SetValue(GetUnderlayKey(key), value);
     return;
   }
 
   if (overlay_.SetValue(key, value))
     ReportValueChanged(key);
 }
 
 void OverlayUserPrefStore::SetValueSilently(const std::string& key,
-                                              Value* value) {
+                                            Value* value) {
   if (!ShallBeStoredInOverlay(key)) {
     underlay_->SetValueSilently(GetUnderlayKey(key), value);
     return;
   }
 
   overlay_.SetValue(key, value);
 }
 
 void OverlayUserPrefStore::RemoveValue(const std::string& key) {
   if (!ShallBeStoredInOverlay(key)) {
@@ skipping 85 matching lines @@
   NamesMap::const_iterator i =
       overlay_to_underlay_names_map_.find(overlay_key);
   return i != overlay_to_underlay_names_map_.end() ? i->second : overlay_key;
 }
 
 bool OverlayUserPrefStore::ShallBeStoredInOverlay(
     const std::string& key) const {
   return overlay_to_underlay_names_map_.find(key) !=
       overlay_to_underlay_names_map_.end();
 }