Use a direct include of strings headers in base/.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16745002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205530 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 251cd6e5ad67c1054e0e82d0a27c59ce4d0d4666
diff --git a/base/files/file_path.cc b/base/files/file_path.cc
index 74469b2..743cbb5 100644
--- a/base/files/file_path.cc
+++ b/base/files/file_path.cc
@@ -13,8 +13,8 @@
// These includes are just for the *Hack functions, and should be removed
// when those functions are removed.
-#include "base/string_util.h"
#include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/base/files/file_path.h b/base/files/file_path.h
index d7e134e..876cf03 100644
--- a/base/files/file_path.h
+++ b/base/files/file_path.h
@@ -109,7 +109,7 @@
#include "base/base_export.h"
#include "base/compiler_specific.h"
#include "base/hash_tables.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/strings/string_piece.h" // For implicit conversions.
#include "build/build_config.h"
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc
index 62ffab9..7c37432 100644
--- a/base/files/file_path_watcher_browsertest.cc
+++ b/base/files/file_path_watcher_browsertest.cc
@@ -24,7 +24,7 @@
#include "base/message_loop/message_loop_proxy.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/test_file_util.h"
#include "base/test/test_timeouts.h"
diff --git a/base/files/file_path_watcher_kqueue.cc b/base/files/file_path_watcher_kqueue.cc
index cb856b1..be29fa8 100644
--- a/base/files/file_path_watcher_kqueue.cc
+++ b/base/files/file_path_watcher_kqueue.cc
@@ -15,7 +15,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
// On some platforms these are not defined.
#if !defined(EV_RECEIPT)