summaryrefslogtreecommitdiffstats
path: root/base/strings
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 18:37:07 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 18:37:07 +0000
commita4ea1f1bb8965f37be0d9fcb39796096fd178a30 (patch)
treeec470c0361e3e410c6414835ef26012494053b07 /base/strings
parent0aa509bb2ca4811b2f10b197c4f17c0f19b50980 (diff)
downloadchromium_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/strings')
-rw-r--r--base/strings/string_number_conversions.cc2
-rw-r--r--base/strings/string_number_conversions_unittest.cc2
-rw-r--r--base/strings/string_piece_unittest.cc2
-rw-r--r--base/strings/string_split.cc2
-rw-r--r--base/strings/string_split_unittest.cc2
-rw-r--r--base/strings/sys_string_conversions_posix.cc2
-rw-r--r--base/strings/sys_string_conversions_unittest.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/base/strings/string_number_conversions.cc b/base/strings/string_number_conversions.cc
index 39daece..b9412d9 100644
--- a/base/strings/string_number_conversions.cc
+++ b/base/strings/string_number_conversions.cc
@@ -13,8 +13,8 @@
#include "base/logging.h"
#include "base/scoped_clear_errno.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/third_party/dmg_fp/dmg_fp.h"
-#include "base/utf_string_conversions.h"
namespace base {
diff --git a/base/strings/string_number_conversions_unittest.cc b/base/strings/string_number_conversions_unittest.cc
index 5ae59d3..1c8d99f 100644
--- a/base/strings/string_number_conversions_unittest.cc
+++ b/base/strings/string_number_conversions_unittest.cc
@@ -8,7 +8,7 @@
#include <limits>
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/strings/string_piece_unittest.cc b/base/strings/string_piece_unittest.cc
index 6265888..4a5548f 100644
--- a/base/strings/string_piece_unittest.cc
+++ b/base/strings/string_piece_unittest.cc
@@ -6,7 +6,7 @@
#include "base/string16.h"
#include "base/strings/string_piece.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
diff --git a/base/strings/string_split.cc b/base/strings/string_split.cc
index 819fdba..5973637 100644
--- a/base/strings/string_split.cc
+++ b/base/strings/string_split.cc
@@ -6,8 +6,8 @@
#include "base/logging.h"
#include "base/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/third_party/icu/icu_utf.h"
-#include "base/utf_string_conversions.h"
namespace base {
diff --git a/base/strings/string_split_unittest.cc b/base/strings/string_split_unittest.cc
index 6729497..eb69b68 100644
--- a/base/strings/string_split_unittest.cc
+++ b/base/strings/string_split_unittest.cc
@@ -4,7 +4,7 @@
#include "base/strings/string_split.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/strings/sys_string_conversions_posix.cc b/base/strings/sys_string_conversions_posix.cc
index d58026c..1e926bb 100644
--- a/base/strings/sys_string_conversions_posix.cc
+++ b/base/strings/sys_string_conversions_posix.cc
@@ -7,7 +7,7 @@
#include <wchar.h>
#include "base/strings/string_piece.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
namespace base {
diff --git a/base/strings/sys_string_conversions_unittest.cc b/base/strings/sys_string_conversions_unittest.cc
index 5c15a76..d2d38e4 100644
--- a/base/strings/sys_string_conversions_unittest.cc
+++ b/base/strings/sys_string_conversions_unittest.cc
@@ -7,8 +7,8 @@
#include "base/basictypes.h"
#include "base/strings/string_piece.h"
#include "base/strings/sys_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_locale.h"
-#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#ifdef WCHAR_T_IS_UTF32