| Index: chrome/browser/prefs/pref_model_associator.cc
|
| diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc
|
| index 88c96400ad74cdb2f1240b4f47da1d4690b2b4a7..21d6a74e860ef8cd6b2c7a3daa55fad0bfb1c4bc 100644
|
| --- a/chrome/browser/prefs/pref_model_associator.cc
|
| +++ b/chrome/browser/prefs/pref_model_associator.cc
|
| @@ -72,9 +72,9 @@ void PrefModelAssociator::InitPrefAndAssociate(
|
| // Update the local preference based on what we got from the
|
| // sync server. Note: this only updates the user value store, which is
|
| // ignored if the preference is policy controlled.
|
| - if (new_value->IsType(Value::TYPE_NULL)) {
|
| + if (new_value->IsNull()) {
|
| pref_service_->ClearPref(pref_name.c_str());
|
| - } else if (!new_value->IsType(pref->GetType())) {
|
| + } else if (new_value->GetType() != pref->GetType()) {
|
| LOG(WARNING) << "Synced value for " << preference.name()
|
| << " is of type " << new_value->GetType()
|
| << " which doesn't match pref type " << pref->GetType();
|
|
|