| Index: base/prefs/pref_value_store.cc
 | 
| diff --git a/base/prefs/pref_value_store.cc b/base/prefs/pref_value_store.cc
 | 
| index f3742c4261207cd09e7e331340116a05b27b9713..7d54f09f355d7eae98d73ad14b224d020828fed1 100644
 | 
| --- a/base/prefs/pref_value_store.cc
 | 
| +++ b/base/prefs/pref_value_store.cc
 | 
| @@ -100,7 +100,7 @@ void PrefValueStore::set_callback(const PrefChangedCallback& callback) {
 | 
|  
 | 
|  bool PrefValueStore::GetValue(const std::string& name,
 | 
|                                base::Value::Type type,
 | 
| -                              const Value** out_value) const {
 | 
| +                              const base::Value** out_value) const {
 | 
|    // Check the |PrefStore|s in order of their priority from highest to lowest,
 | 
|    // looking for the first preference value with the given |name| and |type|.
 | 
|    for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
 | 
| @@ -113,7 +113,7 @@ bool PrefValueStore::GetValue(const std::string& name,
 | 
|  
 | 
|  bool PrefValueStore::GetRecommendedValue(const std::string& name,
 | 
|                                           base::Value::Type type,
 | 
| -                                         const Value** out_value) const {
 | 
| +                                         const base::Value** out_value) const {
 | 
|    return GetValueFromStoreWithType(name.c_str(), type, RECOMMENDED_STORE,
 | 
|                                     out_value);
 | 
|  }
 | 
| @@ -179,7 +179,7 @@ bool PrefValueStore::PrefValueInStore(
 | 
|      PrefValueStore::PrefStoreType store) const {
 | 
|    // Declare a temp Value* and call GetValueFromStore,
 | 
|    // ignoring the output value.
 | 
| -  const Value* tmp_value = NULL;
 | 
| +  const base::Value* tmp_value = NULL;
 | 
|    return GetValueFromStore(name, store, &tmp_value);
 | 
|  }
 | 
|  
 | 
| @@ -211,7 +211,7 @@ PrefValueStore::PrefStoreType PrefValueStore::ControllingPrefStoreForPref(
 | 
|  
 | 
|  bool PrefValueStore::GetValueFromStore(const char* name,
 | 
|                                         PrefValueStore::PrefStoreType store_type,
 | 
| -                                       const Value** out_value) const {
 | 
| +                                       const base::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));
 | 
| @@ -224,10 +224,11 @@ bool PrefValueStore::GetValueFromStore(const char* name,
 | 
|    return false;
 | 
|  }
 | 
|  
 | 
| -bool PrefValueStore::GetValueFromStoreWithType(const char* name,
 | 
| -                                               base::Value::Type type,
 | 
| -                                               PrefStoreType store,
 | 
| -                                               const Value** out_value) const {
 | 
| +bool PrefValueStore::GetValueFromStoreWithType(
 | 
| +    const char* name,
 | 
| +    base::Value::Type type,
 | 
| +    PrefStoreType store,
 | 
| +    const base::Value** out_value) const {
 | 
|    if (GetValueFromStore(name, store, out_value)) {
 | 
|      if ((*out_value)->IsType(type))
 | 
|        return true;
 | 
| 
 |