diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 18:37:07 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 18:37:07 +0000 |
| commit | a4ea1f1bb8965f37be0d9fcb39796096fd178a30 (patch) | |
| tree | ec470c0361e3e410c6414835ef26012494053b07 /base/json | |
| parent | 0aa509bb2ca4811b2f10b197c4f17c0f19b50980 (diff) | |
| download | chromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.zip chromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.tar.gz chromium_src-a4ea1f1bb8965f37be0d9fcb39796096fd178a30.tar.bz2 | |
Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/15735027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
| -rw-r--r-- | base/json/json_parser.cc | 2 | ||||
| -rw-r--r-- | base/json/json_reader_unittest.cc | 2 | ||||
| -rw-r--r-- | base/json/json_value_serializer_unittest.cc | 2 | ||||
| -rw-r--r-- | base/json/json_writer.cc | 2 | ||||
| -rw-r--r-- | base/json/string_escape_unittest.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc index 3f5bc1c..1d44e4f 100644 --- a/base/json/json_parser.cc +++ b/base/json/json_parser.cc @@ -12,8 +12,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversion_utils.h" +#include "base/strings/utf_string_conversions.h" #include "base/third_party/icu/icu_utf.h" -#include "base/utf_string_conversions.h" #include "base/values.h" namespace base { diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc index ab38b04..0180f48 100644 --- a/base/json/json_reader_unittest.cc +++ b/base/json/json_reader_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc index 9df0435..78e2f44 100644 --- a/base/json/json_value_serializer_unittest.cc +++ b/base/json/json_value_serializer_unittest.cc @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.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 f479e50..e97bd2d 100644 --- a/base/json/json_writer.cc +++ b/base/json/json_writer.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" namespace base { diff --git a/base/json/string_escape_unittest.cc b/base/json/string_escape_unittest.cc index c550ca3..8952ee7 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/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { |