summaryrefslogtreecommitdiffstats
path: root/sync/engine
diff options
context:
space:
mode:
authorericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 01:59:55 +0000
committerericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 01:59:55 +0000
commit4abb460a3df397934469f342ccf49191092597d3 (patch)
treebfdb8087aaaaf3207cd2c2ca98c8877dafd1db5c /sync/engine
parentf76bc0fba725dbade1f6d89b4c6564e62498933b (diff)
downloadchromium_src-4abb460a3df397934469f342ccf49191092597d3.zip
chromium_src-4abb460a3df397934469f342ccf49191092597d3.tar.gz
chromium_src-4abb460a3df397934469f342ccf49191092597d3.tar.bz2
JSONWriter cleanup: integrate pretty print into write options.
BUG= TEST=base_unittests TBR=abodenha@chromium.org,ajwong@chromium.org,chocobo@chromium.org,mnissler@chromium.org,akalin@chromium.org,brettw@chromium.org,arv@chromium.org Review URL: http://codereview.chromium.org/9590002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine')
-rw-r--r--sync/engine/model_safe_worker.cc2
-rw-r--r--sync/engine/nigori_util.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/sync/engine/model_safe_worker.cc b/sync/engine/model_safe_worker.cc
index ab1f750..a5aa04f 100644
--- a/sync/engine/model_safe_worker.cc
+++ b/sync/engine/model_safe_worker.cc
@@ -25,7 +25,7 @@ std::string ModelSafeRoutingInfoToString(
const ModelSafeRoutingInfo& routing_info) {
scoped_ptr<DictionaryValue> dict(ModelSafeRoutingInfoToValue(routing_info));
std::string json;
- base::JSONWriter::Write(dict.get(), false, &json);
+ base::JSONWriter::Write(dict.get(), &json);
return json;
}
diff --git a/sync/engine/nigori_util.cc b/sync/engine/nigori_util.cc
index 1b6d42a..78bb33c 100644
--- a/sync/engine/nigori_util.cc
+++ b/sync/engine/nigori_util.cc
@@ -179,7 +179,9 @@ bool UpdateEntryWithEncryption(
if (VLOG_IS_ON(2)) {
scoped_ptr<DictionaryValue> value(entry->ToValue());
std::string info;
- base::JSONWriter::Write(value.get(), true, &info);
+ base::JSONWriter::WriteWithOptions(value.get(),
+ base::JSONWriter::OPTIONS_PRETTY_PRINT,
+ &info);
DVLOG(2) << "Encrypting specifics of type "
<< syncable::ModelTypeToString(type)
<< " with content: "