Change PrefStore::ReadResult to a boolean.

chrome/browser/prefs/pref_value_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 "chrome/browser/prefs/pref_value_store.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_notifier.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 
@@ skipping 196 matching lines @@
   }
   return INVALID_STORE;
 }
 
 bool PrefValueStore::GetValueFromStore(const char* name,
                                        PrefValueStore::PrefStoreType store_type,
                                        const Value** out_value) const {
   // Only return true if we find a value and it is the correct type, so stale
   // values with the incorrect type will be ignored.
   const PrefStore* store = GetPrefStore(static_cast<PrefStoreType>(store_type));
-  if (store) {
-    switch (store->GetValue(name, out_value)) {
-      case PrefStore::READ_USE_DEFAULT:
-        store = GetPrefStore(DEFAULT_STORE);
-        if (!store || store->GetValue(name, out_value) != PrefStore::READ_OK) {
-          *out_value = NULL;
-          return false;
-        }
-        // Fall through...
-      case PrefStore::READ_OK:
-        return true;
-      case PrefStore::READ_NO_VALUE:
-        break;
-    }
-  }
+  if (store && store->GetValue(name, out_value))
+    return true;
 
-  // No valid value found for the given preference name: set the return false.
+  // No valid value found for the given preference name: set the return value
+  // to false.
   *out_value = NULL;
   return false;
 }
 
 bool PrefValueStore::GetValueFromStoreWithType(const char* name,
                                                base::Value::Type type,
                                                PrefStoreType store,
                                                const Value** out_value) const {
   if (GetValueFromStore(name, store, out_value)) {
     if ((*out_value)->IsType(type))
@@ skipping 34 matching lines @@
   if (initialization_failed_)
     return;
   for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
     scoped_refptr<PrefStore> store =
         GetPrefStore(static_cast<PrefStoreType>(i));
     if (store && !store->IsInitializationComplete())
       return;
   }
   pref_notifier_->OnInitializationCompleted(true);
 }