9 files changed, 10 insertions, 10 deletions
diff --git a/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc
index 232766a..7276c14 100644
--- a/base/test/perf_test_suite.cc
+++ b/base/test/perf_test_suite.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/process_util.h"
diff --git a/base/test/test_file_util.h b/base/test/test_file_util.h
index e97c0e5..8d1be1c 100644
--- a/base/test/test_file_util.h
+++ b/base/test/test_file_util.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 
 namespace base {
 class FilePath;
diff --git a/base/test/test_file_util_linux.cc b/base/test/test_file_util_linux.cc
index 958fa81..7eb0533 100644
--- a/base/test/test_file_util_linux.cc
+++ b/base/test/test_file_util_linux.cc
@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 
 namespace file_util {
 
diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc
index f538bc1..6be1c82 100644
--- a/base/test/test_file_util_posix.cc
+++ b/base/test/test_file_util_posix.cc
@@ -11,8 +11,8 @@
 
 #include <string>
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc
index 9b234e3..8d28aef 100644
--- a/base/test/test_file_util_win.cc
+++ b/base/test/test_file_util_win.cc
@@ -4,14 +4,14 @@
 
 #include "base/test/test_file_util.h"
 
+#include <windows.h>
 #include <aclapi.h>
 #include <shlwapi.h>
-#include <windows.h>
 
 #include <vector>
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/threading/platform_thread.h"
diff --git a/base/test/test_shortcut_win.cc b/base/test/test_shortcut_win.cc
index 1a0d280..ec6300a 100644
--- a/base/test/test_shortcut_win.cc
+++ b/base/test/test_shortcut_win.cc
@@ -8,7 +8,7 @@
 #include <shlobj.h>
 #include <propkey.h>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
diff --git a/base/test/test_shortcut_win.h b/base/test/test_shortcut_win.h
index ef75713..4c42935 100644
--- a/base/test/test_shortcut_win.h
+++ b/base/test/test_shortcut_win.h
@@ -5,7 +5,7 @@
 #ifndef BASE_TEST_TEST_SHORTCUT_WIN_H_
 #define BASE_TEST_TEST_SHORTCUT_WIN_H_
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/win/shortcut.h"
 
 // Windows shortcut functions used only by tests.
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index cd7875b..a55b8e0 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -11,7 +11,7 @@
 #include "base/debug/debug_on_start_win.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index b87c073..64da18a 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -6,7 +6,7 @@
 #include <string.h>
 
 #include "base/android/path_utils.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"