Chromium Code Reviews| Index: sync/syncable/entry.cc |
| diff --git a/sync/syncable/entry.cc b/sync/syncable/entry.cc |
| index ba64299c7340271cae8ac2e3280b5c40a2ed7256..2a7865a8ecb393d1d3a6832b6b13a00b600d6824 100644 |
| --- a/sync/syncable/entry.cc |
| +++ b/sync/syncable/entry.cc |
| @@ -6,7 +6,7 @@ |
| #include <iomanip> |
| -#include "net/base/escape.h" |
| +#include "base/json/string_escape.h" |
| #include "sync/syncable/base_transaction.h" |
| #include "sync/syncable/blob.h" |
| #include "sync/syncable/directory.h" |
| @@ -127,9 +127,18 @@ std::ostream& operator<<(std::ostream& os, const Entry& entry) { |
| os << g_metas_columns[i].name << ": " << field << ", "; |
| } |
| for ( ; i < PROTO_FIELDS_END; ++i) { |
| + std::string escaped_str; |
| + base::JsonDoubleQuote( |
| + kernel->ref(static_cast<ProtoField>(i)).SerializeAsString(), |
| + false, |
| + &escaped_str); |
| os << g_metas_columns[i].name << ": " |
| - << net::EscapePath( |
| - kernel->ref(static_cast<ProtoField>(i)).SerializeAsString()) |
| + << escaped_str |
| + << ", "; |
|
akalin
2012/10/08 23:04:10
can probably just put this on previous line (and m
|
| + } |
| + for ( ; i < ORDINAL_FIELDS_END; ++i) { |
| + os << g_metas_columns[i].name << ": " |
| + << kernel->ref(static_cast<OrdinalField>(i)).ToDebugString() |
| << ", "; |
| } |
| os << "TempFlags: "; |