diff options
| author | ericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 01:59:55 +0000 |
|---|---|---|
| committer | ericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 01:59:55 +0000 |
| commit | 4abb460a3df397934469f342ccf49191092597d3 (patch) | |
| tree | bfdb8087aaaaf3207cd2c2ca98c8877dafd1db5c /sync | |
| parent | f76bc0fba725dbade1f6d89b4c6564e62498933b (diff) | |
| download | chromium_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')
| -rw-r--r-- | sync/engine/model_safe_worker.cc | 2 | ||||
| -rw-r--r-- | sync/engine/nigori_util.cc | 4 | ||||
| -rw-r--r-- | sync/js/js_arg_list.cc | 2 | ||||
| -rw-r--r-- | sync/js/js_event_details.cc | 2 | ||||
| -rw-r--r-- | sync/sessions/session_state.cc | 4 | ||||
| -rw-r--r-- | sync/syncable/model_type_payload_map.cc | 2 |
6 files changed, 10 insertions, 6 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: " diff --git a/sync/js/js_arg_list.cc b/sync/js/js_arg_list.cc index d8ab8e2..c95235a 100644 --- a/sync/js/js_arg_list.cc +++ b/sync/js/js_arg_list.cc @@ -20,7 +20,7 @@ const ListValue& JsArgList::Get() const { std::string JsArgList::ToString() const { std::string str; - base::JSONWriter::Write(&Get(), false, &str); + base::JSONWriter::Write(&Get(), &str); return str; } diff --git a/sync/js/js_event_details.cc b/sync/js/js_event_details.cc index 693ba4c..b455b01 100644 --- a/sync/js/js_event_details.cc +++ b/sync/js/js_event_details.cc @@ -20,7 +20,7 @@ const DictionaryValue& JsEventDetails::Get() const { std::string JsEventDetails::ToString() const { std::string str; - base::JSONWriter::Write(&Get(), false, &str); + base::JSONWriter::Write(&Get(), &str); return str; } diff --git a/sync/sessions/session_state.cc b/sync/sessions/session_state.cc index a6655f9..2c68125 100644 --- a/sync/sessions/session_state.cc +++ b/sync/sessions/session_state.cc @@ -176,7 +176,9 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const { std::string SyncSessionSnapshot::ToString() const { scoped_ptr<DictionaryValue> value(ToValue()); std::string json; - base::JSONWriter::Write(value.get(), true, &json); + base::JSONWriter::WriteWithOptions(value.get(), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json); return json; } diff --git a/sync/syncable/model_type_payload_map.cc b/sync/syncable/model_type_payload_map.cc index dde1cd8..99502b0 100644 --- a/sync/syncable/model_type_payload_map.cc +++ b/sync/syncable/model_type_payload_map.cc @@ -50,7 +50,7 @@ std::string ModelTypePayloadMapToString( scoped_ptr<DictionaryValue> value( ModelTypePayloadMapToValue(type_payloads)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); return json; } |