Remove JsonPrefStore pruning of empty values on write.

base/prefs/json_pref_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 "base/prefs/json_pref_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 199 matching lines @@
   base::Value* old_value = NULL;
   prefs_->Get(key, &old_value);
   if (!old_value || !value->Equals(old_value)) {
     prefs_->Set(key, new_value.release());
     if (!read_only_)
       writer_.ScheduleWrite(this);
   }
 }
 
 void JsonPrefStore::RemoveValue(const std::string& key) {
-  if (prefs_->Remove(key, NULL))
+  if (prefs_->RemovePath(key, NULL))
     ReportValueChanged(key);
 }
 
-void JsonPrefStore::MarkNeedsEmptyValue(const std::string& key) {
-  keys_need_empty_value_.insert(key);
-}
-
 bool JsonPrefStore::ReadOnly() const {
   return read_only_;
 }
 
 PersistentPrefStore::PrefReadError JsonPrefStore::GetReadError() const {
   return read_error_;
 }
 
 PersistentPrefStore::PrefReadError JsonPrefStore::ReadPrefs() {
   if (path_.empty()) {
@@ skipping 79 matching lines @@
   FOR_EACH_OBSERVER(PrefStore::Observer,
                     observers_,
                     OnInitializationCompleted(true));
 }
 
 JsonPrefStore::~JsonPrefStore() {
   CommitPendingWrite();
 }
 
 bool JsonPrefStore::SerializeData(std::string* output) {
-  // TODO(tc): Do we want to prune webkit preferences that match the default
-  // value?
   JSONStringValueSerializer serializer(output);
   serializer.set_pretty_print(true);
-  scoped_ptr<base::DictionaryValue> copy(
-      prefs_->DeepCopyWithoutEmptyChildren());
-
-  // Iterates |keys_need_empty_value_| and if the key exists in |prefs_|,
-  // ensure its empty ListValue or DictonaryValue is preserved.
-  for (std::set<std::string>::const_iterator
-       it = keys_need_empty_value_.begin();
-       it != keys_need_empty_value_.end();
-       ++it) {
-    const std::string& key = *it;
-
-    base::Value* value = NULL;
-    if (!prefs_->Get(key, &value))
-      continue;
-
-    if (value->IsType(base::Value::TYPE_LIST)) {
-      const base::ListValue* list = NULL;
-      if (value->GetAsList(&list) && list->empty())
-        copy->Set(key, new base::ListValue);
-    } else if (value->IsType(base::Value::TYPE_DICTIONARY)) {
-      const base::DictionaryValue* dict = NULL;
-      if (value->GetAsDictionary(&dict) && dict->empty())
-        copy->Set(key, new base::DictionaryValue);
-    }
-  }
-
-  return serializer.Serialize(*(copy.get()));
+  return serializer.Serialize(*prefs_);
 }