Handle sync values of wrong type more graceful

chrome/browser/sync/glue/preference_model_associator.cc

 // Copyright (c) 2010 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/sync/glue/preference_model_associator.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "base/utf_string_conversions.h"
@@ skipping 55 matching lines @@
         LOG(ERROR) << "Failed to deserialize preference value: "
                    << reader.GetErrorMessage();
         return false;
       }
 
       // Merge the server value of this preference with the local value.
       scoped_ptr<Value> new_value(MergePreference(*pref, *value));
 
       // Update the local preference based on what we got from the
       // sync server.
-      if (!pref->GetValue()->Equals(new_value.get()))
+      if (new_value->IsType(Value::TYPE_NULL)) {
+        pref_service->ClearPref(pref_name.c_str());
+      } else if (!new_value->IsType(pref->GetType())) {
+        LOG(WARNING) << "Synced value for " << preference.name()
+                     << " is of type " << new_value->GetType()
+                     << " which doesn't match pref type " << pref->GetType();
+      } else if (!pref->GetValue()->Equals(new_value.get())) {
         pref_service->Set(pref_name.c_str(), *new_value);
+      }
 
       AfterUpdateOperations(pref_name);
 
       // If the merge resulted in an updated value, write it back to
       // the sync node.
       if (!value->Equals(new_value.get()) &&
           !WritePreferenceToNode(pref->name(), *new_value, &node))
         return false;
     }
     Associate(pref, node.GetId());
@@ skipping 225 matching lines @@
   // notification to update the UI.
   if (0 == pref_name.compare(prefs::kShowBookmarkBar)) {
     NotificationService::current()->Notify(
         NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
         Source<PreferenceModelAssociator>(this),
         NotificationService::NoDetails());
   }
 }
 
 }  // namespace browser_sync