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

63 files changed, 66 insertions, 66 deletions

diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc
index ac3975f..d25fed8 100644
--- a/base/android/jni_string.cc
+++ b/base/android/jni_string.cc
@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace {
 
diff --git a/base/android/jni_string_unittest.cc b/base/android/jni_string_unittest.cc
index 59a847e..abd0683 100644
--- a/base/android/jni_string_unittest.cc
+++ b/base/android/jni_string_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.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/command_line.cc b/base/command_line.cc
index 9aa68be..295f41d 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -12,7 +12,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
diff --git a/base/command_line_unittest.cc b/base/command_line_unittest.cc
index ca7c9fb..2c947fc 100644
--- a/base/command_line_unittest.cc
+++ b/base/command_line_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::FilePath;
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index 6e3516e..deda5f1 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -18,6 +18,7 @@
 #include "base/stringprintf.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/sys_info.h"
@@ -26,7 +27,6 @@
 #include "base/threading/thread_id_name_manager.h"
 #include "base/threading/thread_local.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 
 #if defined(OS_WIN)
 #include "base/debug/trace_event_win.h"
diff --git a/base/environment.cc b/base/environment.cc
index 6849fef..5e4d9dd 100644
--- a/base/environment.cc
+++ b/base/environment.cc
@@ -14,7 +14,7 @@
 
 #if defined(OS_WIN)
 #include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #endif
 
 namespace {
diff --git a/base/file_util.cc b/base/file_util.cc
index 58dbd79..7425717 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -16,7 +16,7 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 using base::FilePath;
 
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 7ef09a2..149b9729 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -42,9 +42,9 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 
 #if defined(OS_ANDROID)
 #include "base/os_compat_android.h"
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 5cfc677..d002bc5 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -21,9 +21,9 @@
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/platform_thread.h"
-#include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index 47c59cf..188f377 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -20,9 +20,9 @@
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 
diff --git a/base/files/file_path.cc b/base/files/file_path.cc
index a9e4be2..74469b2 100644
--- a/base/files/file_path.cc
+++ b/base/files/file_path.cc
@@ -16,7 +16,7 @@
 #include "base/string_util.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc
index 50befdf..8b2fcf5 100644
--- a/base/files/file_path_unittest.cc
+++ b/base/files/file_path_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/base/guid_win.cc b/base/guid_win.cc
index 1cddff8..06378e3 100644
--- a/base/guid_win.cc
+++ b/base/guid_win.cc
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace base {
 
diff --git a/base/i18n/break_iterator_unittest.cc b/base/i18n/break_iterator_unittest.cc
index cf2bf22..136b5dd 100644
--- a/base/i18n/break_iterator_unittest.cc
+++ b/base/i18n/break_iterator_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/stringprintf.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/i18n/case_conversion_unittest.cc b/base/i18n/case_conversion_unittest.cc
index 63900ec..2139bbe 100644
--- a/base/i18n/case_conversion_unittest.cc
+++ b/base/i18n/case_conversion_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/i18n/case_conversion.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/base/i18n/char_iterator_unittest.cc b/base/i18n/char_iterator_unittest.cc
index 509e27c..0cf8e6c 100644
--- a/base/i18n/char_iterator_unittest.cc
+++ b/base/i18n/char_iterator_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/i18n/char_iterator.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/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc
index a29eb4b..ca6fe51 100644
--- a/base/i18n/file_util_icu.cc
+++ b/base/i18n/file_util_icu.cc
@@ -14,7 +14,7 @@
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "third_party/icu/public/common/unicode/uniset.h"
 #include "third_party/icu/public/i18n/unicode/coll.h"
diff --git a/base/i18n/file_util_icu_unittest.cc b/base/i18n/file_util_icu_unittest.cc
index f49ac5a..e3af9ad 100644
--- a/base/i18n/file_util_icu_unittest.cc
+++ b/base/i18n/file_util_icu_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/i18n/file_util_icu.h"
 
 #include "base/file_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/base/i18n/icu_string_conversions.cc b/base/i18n/icu_string_conversions.cc
index 292d614..a11f3bb 100644
--- a/base/i18n/icu_string_conversions.cc
+++ b/base/i18n/icu_string_conversions.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "third_party/icu/public/common/unicode/ucnv.h"
 #include "third_party/icu/public/common/unicode/ucnv_cb.h"
 #include "third_party/icu/public/common/unicode/ucnv_err.h"
diff --git a/base/i18n/icu_string_conversions_unittest.cc b/base/i18n/icu_string_conversions_unittest.cc
index 4b53435..605d6dc 100644
--- a/base/i18n/icu_string_conversions_unittest.cc
+++ b/base/i18n/icu_string_conversions_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/stringprintf.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/i18n/number_formatting.cc b/base/i18n/number_formatting.cc
index 95eea1b..9f365a3 100644
--- a/base/i18n/number_formatting.cc
+++ b/base/i18n/number_formatting.cc
@@ -5,12 +5,12 @@
 #include "base/i18n/number_formatting.h"
 
 #include "base/format_macros.h"
-#include "base/logging.h"
 #include "base/lazy_instance.h"
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "third_party/icu/public/common/unicode/ustring.h"
 #include "third_party/icu/public/i18n/unicode/numfmt.h"
 
diff --git a/base/i18n/number_formatting_unittest.cc b/base/i18n/number_formatting_unittest.cc
index c40ab34..da6397d 100644
--- a/base/i18n/number_formatting_unittest.cc
+++ b/base/i18n/number_formatting_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.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/i18n/rtl.cc b/base/i18n/rtl.cc
index 9da29d8..555fb11 100644
--- a/base/i18n/rtl.cc
+++ b/base/i18n/rtl.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "third_party/icu/public/common/unicode/locid.h"
 #include "third_party/icu/public/common/unicode/uchar.h"
 #include "third_party/icu/public/common/unicode/uscript.h"
diff --git a/base/i18n/rtl_unittest.cc b/base/i18n/rtl_unittest.cc
index b1047c6..b170c35 100644
--- a/base/i18n/rtl_unittest.cc
+++ b/base/i18n/rtl_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/icu/public/i18n/unicode/usearch.h"
diff --git a/base/i18n/string_compare.cc b/base/i18n/string_compare.cc
index 41d19d8..1ac7284 100644
--- a/base/i18n/string_compare.cc
+++ b/base/i18n/string_compare.cc
@@ -5,7 +5,7 @@
 #include "base/i18n/string_compare.h"
 
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace base {
 namespace i18n {
diff --git a/base/i18n/string_search_unittest.cc b/base/i18n/string_search_unittest.cc
index 8a4aa78..326f018 100644
--- a/base/i18n/string_search_unittest.cc
+++ b/base/i18n/string_search_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/i18n/rtl.h"
 #include "base/i18n/string_search.h"
 #include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/icu/public/i18n/unicode/usearch.h"
 
diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc
index e60acd1..dbe74d8 100644
--- a/base/i18n/time_formatting.cc
+++ b/base/i18n/time_formatting.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "third_party/icu/public/i18n/unicode/datefmt.h"
 #include "third_party/icu/public/i18n/unicode/dtptngen.h"
diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc
index 3c4bf02..655d735 100644
--- a/base/i18n/time_formatting_unittest.cc
+++ b/base/i18n/time_formatting_unittest.cc
@@ -5,8 +5,8 @@
 #include "base/i18n/time_formatting.h"
 
 #include "base/i18n/rtl.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/icu/public/common/unicode/uversion.h"
 
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 {
diff --git a/base/logging.cc b/base/logging.cc
index 4800f82..49623bf 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -51,9 +51,9 @@ typedef pthread_mutex_t* MutexHandle;
 #include "base/debug/stack_trace.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock_impl.h"
 #include "base/threading/platform_thread.h"
-#include "base/utf_string_conversions.h"
 #include "base/vlog.h"
 #if defined(OS_POSIX)
 #include "base/safe_strerror_posix.h"
diff --git a/base/memory/shared_memory_posix.cc b/base/memory/shared_memory_posix.cc
index 63b20f3..66f5848 100644
--- a/base/memory/shared_memory_posix.cc
+++ b/base/memory/shared_memory_posix.cc
@@ -15,10 +15,10 @@
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/safe_strerror_posix.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
diff --git a/base/memory/shared_memory_win.cc b/base/memory/shared_memory_win.cc
index 8f92c35..42e0b04 100644
--- a/base/memory/shared_memory_win.cc
+++ b/base/memory/shared_memory_win.cc
@@ -5,7 +5,7 @@
 #include "base/memory/shared_memory.h"
 
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace {
 
diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
index c87935e..5677190 100644
--- a/base/metrics/field_trial.cc
+++ b/base/metrics/field_trial.cc
@@ -8,10 +8,10 @@
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/sha1.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
-#include "base/utf_string_conversions.h"
 
 namespace base {
 
diff --git a/base/metrics/stats_table.cc b/base/metrics/stats_table.cc
index 9b7f293f..465b446 100644
--- a/base/metrics/stats_table.cc
+++ b/base/metrics/stats_table.cc
@@ -10,9 +10,9 @@
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_local_storage.h"
-#include "base/utf_string_conversions.h"
 
 #if defined(OS_POSIX)
 #include "errno.h"
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 713fff0..3af7614 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/shared_memory.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/test/multiprocess_test.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/simple_thread.h"
-#include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm
index 4a09475..a45f878 100644
--- a/base/native_library_mac.mm
+++ b/base/native_library_mac.mm
@@ -12,8 +12,8 @@
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
 
 namespace base {
 
diff --git a/base/native_library_posix.cc b/base/native_library_posix.cc
index 9b694e1..dfa20fc 100644
--- a/base/native_library_posix.cc
+++ b/base/native_library_posix.cc
@@ -8,8 +8,8 @@
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
 
 namespace base {
 
diff --git a/base/native_library_win.cc b/base/native_library_win.cc
index af00cd1..2d437fa 100644
--- a/base/native_library_win.cc
+++ b/base/native_library_win.cc
@@ -7,8 +7,8 @@
 #include <windows.h>
 
 #include "base/file_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
 
 namespace base {
 
diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc
index beae804..e4d5293 100644
--- a/base/platform_file_posix.cc
+++ b/base/platform_file_posix.cc
@@ -13,8 +13,8 @@
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/posix/eintr_wrapper.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
 
 #if defined(OS_ANDROID)
 #include "base/os_compat_android.h"
diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc
index ac6a187..5e6797a 100644
--- a/base/prefs/json_pref_store_unittest.cc
+++ b/base/prefs/json_pref_store_unittest.cc
@@ -12,9 +12,9 @@
 #include "base/run_loop.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
-#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 2d286ca..99e9f3f 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -15,12 +15,12 @@
 #include "base/path_service.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
-#include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
diff --git a/base/string16.cc b/base/string16.cc
index 54d00fb..a473786 100644
--- a/base/string16.cc
+++ b/base/string16.cc
@@ -15,7 +15,7 @@
 
 #include <ostream>
 
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace base {
 
diff --git a/base/string16_unittest.cc b/base/string16_unittest.cc
index e833ed2..cd8f4f6 100644
--- a/base/string16_unittest.cc
+++ b/base/string16_unittest.cc
@@ -5,7 +5,7 @@
 #include <sstream>
 
 #include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(WCHAR_T_IS_UTF32)
diff --git a/base/string_util.cc b/base/string_util.cc
index 4e96ba8..bbded57 100644
--- a/base/string_util.cc
+++ b/base/string_util.cc
@@ -24,7 +24,7 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversion_utils.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/third_party/icu/icu_utf.h"
 
 namespace {
diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc
index d580fba..6478eae 100644
--- a/base/string_util_unittest.cc
+++ b/base/string_util_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/string_util.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/stringprintf.cc b/base/stringprintf.cc
index 814fe99..946ec72 100644
--- a/base/stringprintf.cc
+++ b/base/stringprintf.cc
@@ -8,7 +8,7 @@
 
 #include "base/scoped_clear_errno.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace base {
 
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
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc
index ca18894..bbb1662 100644
--- a/base/sys_info_posix.cc
+++ b/base/sys_info_posix.cc
@@ -13,8 +13,8 @@
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
 
 #if defined(OS_ANDROID)
 #include <sys/vfs.h>
diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc
index 7c16cb18..fe5b0ff 100644
--- a/base/test/test_file_util_posix.cc
+++ b/base/test/test_file_util_posix.cc
@@ -15,7 +15,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 using base::MakeAbsoluteFilePath;
 
diff --git a/base/test/test_shortcut_win.cc b/base/test/test_shortcut_win.cc
index ec6300a..43a94ad 100644
--- a/base/test/test_shortcut_win.cc
+++ b/base/test/test_shortcut_win.cc
@@ -10,7 +10,7 @@
 
 #include "base/files/file_path.h"
 #include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
diff --git a/base/values.cc b/base/values.cc
index 6699885..75db8c7 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -11,7 +11,7 @@
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace {
 
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index b3459ab..74642c5 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.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/win/windows_version.cc b/base/win/windows_version.cc
index c130e0e..9564d0b 100644
--- a/base/win/windows_version.cc
+++ b/base/win/windows_version.cc
@@ -7,7 +7,7 @@
 #include <windows.h>
 
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 
 namespace base {