summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 19:06:57 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 19:06:57 +0000
commitd529cb08d1153a4258ececebb0fe18bcc76f3281 (patch)
treeaedd6ffeb57440827618c578ac8923fcfd14aaec /base/json
parent0407b4ba756c944996db3e37e8932f087f47549a (diff)
downloadchromium_src-d529cb08d1153a4258ececebb0fe18bcc76f3281.zip
chromium_src-d529cb08d1153a4258ececebb0fe18bcc76f3281.tar.gz
chromium_src-d529cb08d1153a4258ececebb0fe18bcc76f3281.tar.bz2
Use a direct include of strings headers in base/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16667013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
-rw-r--r--base/json/json_value_converter.h2
-rw-r--r--base/json/json_value_serializer_unittest.cc2
-rw-r--r--base/json/json_writer.cc2
-rw-r--r--base/json/string_escape.cc4
-rw-r--r--base/json/string_escape.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/base/json/json_value_converter.h b/base/json/json_value_converter.h
index 59778e5..cf3c74f 100644
--- a/base/json/json_value_converter.h
+++ b/base/json/json_value_converter.h
@@ -13,7 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/stl_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/strings/string_piece.h"
#include "base/values.h"
diff --git a/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc
index 78e2f44..b428e2a 100644
--- a/base/json/json_value_serializer_unittest.cc
+++ b/base/json/json_value_serializer_unittest.cc
@@ -12,7 +12,7 @@
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc
index e97bd2d..6a9cc6a 100644
--- a/base/json/json_writer.cc
+++ b/base/json/json_writer.cc
@@ -8,8 +8,8 @@
#include "base/json/string_escape.h"
#include "base/logging.h"
-#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
diff --git a/base/json/string_escape.cc b/base/json/string_escape.cc
index 4f9f269..eaa73ce 100644
--- a/base/json/string_escape.cc
+++ b/base/json/string_escape.cc
@@ -6,8 +6,8 @@
#include <string>
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
namespace base {
diff --git a/base/json/string_escape.h b/base/json/string_escape.h
index 088db62..5efc350 100644
--- a/base/json/string_escape.h
+++ b/base/json/string_escape.h
@@ -10,7 +10,7 @@
#include <string>
#include "base/base_export.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace base {