Add a bunch of preferences to sync.

This includes a fix for not crashing when we encounter a preference that is not registered.

BUG=39958

Review URL: http://codereview.chromium.org/1571006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43497 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 0 deletions

diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc
index 6abfd0f..d30b544 100644
--- a/chrome/browser/pref_service.cc
+++ b/chrome/browser/pref_service.cc
@@ -407,6 +407,19 @@ void PrefService::Set(const wchar_t* path, const Value& value) {
     NOTREACHED() << "Trying to write an unregistered pref: " << path;
     return;
   }
+
+  // Allow dictionary and list types to be set to null.
+  if (value.GetType() == Value::TYPE_NULL &&
+      (pref->type() == Value::TYPE_DICTIONARY ||
+       pref->type() == Value::TYPE_LIST)) {
+    scoped_ptr<Value> old_value(GetPrefCopy(path));
+    if (!old_value->Equals(&value)) {
+      persistent_->Remove(path, NULL);
+      FireObservers(path);
+    }
+    return;
+  }
+
   if (pref->type() != value.GetType()) {
     NOTREACHED() << "Wrong type for Set: " << path;
   }