diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 11:52:22 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 11:52:22 +0000 |
| commit | 11b366da9588a954343196434e00822aa3cf9b93 (patch) | |
| tree | 0c8d3d6b521be4308c4f979ad19e1526ca65bc8e /sync/internal_api/public | |
| parent | 3fa8fe590f29d504ce1284d5b4814c64861b4ab7 (diff) | |
| download | chromium_src-11b366da9588a954343196434e00822aa3cf9b93.zip chromium_src-11b366da9588a954343196434e00822aa3cf9b93.tar.gz chromium_src-11b366da9588a954343196434e00822aa3cf9b93.tar.bz2 | |
Revert of https://codereview.chromium.org/100823007/
Reason for revert: This patchset breaks at least displayment of Russian localized strings on Chromeos login screen.
TBR=mark@chromium.org,jshin@chromium.org,thakis@chromium.org,asanka@chromium.org,zea@chromium.org,bauerb@chromium.org,rsesek@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/106793004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/public')
| -rw-r--r-- | sync/internal_api/public/base/ordinal.h | 4 | ||||
| -rw-r--r-- | sync/internal_api/public/base/progress_marker_map.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sync/internal_api/public/base/ordinal.h b/sync/internal_api/public/base/ordinal.h index cb67b45..c347b7b 100644 --- a/sync/internal_api/public/base/ordinal.h +++ b/sync/internal_api/public/base/ordinal.h @@ -260,8 +260,8 @@ bool Ordinal<Traits>::EqualsOrBothInvalid(const Ordinal& other) const { template <typename Traits> std::string Ordinal<Traits>::ToDebugString() const { - std::string debug_string = - base::EscapeBytesAsInvalidJSONString(bytes_, false /* put_in_quotes */); + std::string debug_string; + base::JsonDoubleQuote(bytes_, false /* put_in_quotes */, &debug_string); if (!is_valid_) { debug_string = "INVALID[" + debug_string + "]"; } diff --git a/sync/internal_api/public/base/progress_marker_map.cc b/sync/internal_api/public/base/progress_marker_map.cc index ea1f177..b281013 100644 --- a/sync/internal_api/public/base/progress_marker_map.cc +++ b/sync/internal_api/public/base/progress_marker_map.cc @@ -16,8 +16,9 @@ scoped_ptr<base::DictionaryValue> ProgressMarkerMapToValue( for (ProgressMarkerMap::const_iterator it = marker_map.begin(); it != marker_map.end(); ++it) { std::string printable_payload; - base::EscapeJSONString( - it->second, false /* put_in_quotes */, &printable_payload); + base::JsonDoubleQuote(it->second, + false /* put_in_quotes */, + &printable_payload); value->SetString(ModelTypeToString(it->first), printable_payload); } return value.Pass(); |