summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 00:38:41 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 00:38:41 +0000
commit379e7a5a9b6934dca457eb3eaeb66a05a8946a8a (patch)
tree7fb61b6338cab5433fdf57517d9e56f23dac881c /base/json
parent0ef51cc6d25951d6dbaf4d8036d00b3316059ce9 (diff)
downloadchromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.zip
chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.gz
chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.bz2
base: string_util.h -> utf_string_conversions.h fix.
BUG=none TEST=none Review URL: http://codereview.chromium.org/678001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
-rw-r--r--base/json/string_escape_unittest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/base/json/string_escape_unittest.cc b/base/json/string_escape_unittest.cc
index a3d6262..29e5a38 100644
--- a/base/json/string_escape_unittest.cc
+++ b/base/json/string_escape_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/json/string_escape.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
@@ -20,7 +20,7 @@ const struct json_narrow_test_data {
{"b\x0f\x7f\xf0\xff!", "b\\u000F\\u007F\\u00F0\\u00FF!"},
};
-}
+} // namespace
TEST(StringEscapeTest, JsonDoubleQuoteNarrow) {
for (size_t i = 0; i < arraysize(json_narrow_cases); ++i) {
@@ -64,10 +64,9 @@ const struct json_wide_test_data {
{L"b\x0f\x7f\xf0\xff!", "b\\u000F\\u007F\\u00F0\\u00FF!"},
};
-}
+} // namespace
TEST(StringEscapeTest, JsonDoubleQuoteWide) {
-
for (size_t i = 0; i < arraysize(json_wide_cases); ++i) {
std::string out;
string16 in = WideToUTF16(json_wide_cases[i].to_escape);