summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:59:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:59:06 +0000
commita3f72189102fc85a7f9cfe60c61e124a2677f0ea (patch)
treefa5699e92f87a628740fd9b88960b6449541055d /base/json
parent3d350326fd4def19e343890c55c5388e370c7c2f (diff)
downloadchromium_src-a3f72189102fc85a7f9cfe60c61e124a2677f0ea.zip
chromium_src-a3f72189102fc85a7f9cfe60c61e124a2677f0ea.tar.gz
chromium_src-a3f72189102fc85a7f9cfe60c61e124a2677f0ea.tar.bz2
Move utf_offset_string_conversions and utf_string_conversion_utils to strings.
Review URL: https://codereview.chromium.org/12087115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
-rw-r--r--base/json/json_parser.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc
index 74de62f..8442b01 100644
--- a/base/json/json_parser.cc
+++ b/base/json/json_parser.cc
@@ -11,8 +11,8 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversion_utils.h"
#include "base/third_party/icu/icu_utf.h"
-#include "base/utf_string_conversion_utils.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"