Move file_path.h to base/files.

TBR=sky

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184344 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 16 insertions, 16 deletions

diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc
index b67e80f..ad00bad 100644
--- a/win8/delegate_execute/chrome_util.cc
+++ b/win8/delegate_execute/chrome_util.cc
@@ -4,16 +4,16 @@
 
 #include "win8/delegate_execute/chrome_util.h"
 
+#include <windows.h>
 #include <atlbase.h>
 #include <shlobj.h>
-#include <windows.h>
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/md5.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
diff --git a/win8/delegate_execute/command_execute_impl.h b/win8/delegate_execute/command_execute_impl.h
index 1b137d9..b968b60 100644
--- a/win8/delegate_execute/command_execute_impl.h
+++ b/win8/delegate_execute/command_execute_impl.h
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "base/command_line.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/process_util.h"
 #include "win8/delegate_execute/resource.h"       // main symbols
 
diff --git a/win8/delegate_execute/delegate_execute_operation.h b/win8/delegate_execute/delegate_execute_operation.h
index 8d2900d..6492ac6 100644
--- a/win8/delegate_execute/delegate_execute_operation.h
+++ b/win8/delegate_execute/delegate_execute_operation.h
@@ -5,11 +5,11 @@
 #ifndef WIN8_DELEGATE_EXECUTE_DELEGATE_EXECUTE_OPERATION_H_
 #define WIN8_DELEGATE_EXECUTE_DELEGATE_EXECUTE_OPERATION_H_
 
-#include <atldef.h>
 #include <windows.h>
+#include <atldef.h>
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string16.h"
 
 class CommandLine;
diff --git a/win8/delegate_execute/delegate_execute_util.cc b/win8/delegate_execute/delegate_execute_util.cc
index 70ca3e3..6630fd6 100644
--- a/win8/delegate_execute/delegate_execute_util.cc
+++ b/win8/delegate_execute/delegate_execute_util.cc
@@ -4,7 +4,7 @@
 
 #include "win8/delegate_execute/delegate_execute_util.h"
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string_util.h"
 
 namespace delegate_execute {
diff --git a/win8/delegate_execute/delegate_execute_util_unittest.cc b/win8/delegate_execute/delegate_execute_util_unittest.cc
index 6fcf65d..d0cf3b3 100644
--- a/win8/delegate_execute/delegate_execute_util_unittest.cc
+++ b/win8/delegate_execute/delegate_execute_util_unittest.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "base/command_line.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc
index 4979f4c..acb66e9 100644
--- a/win8/metro_driver/file_picker.cc
+++ b/win8/metro_driver/file_picker.cc
@@ -8,13 +8,13 @@
 #include <windows.storage.pickers.h>
 
 #include "base/bind.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/win/scoped_comptr.h"
 #include "base/win/metro.h"
+#include "base/win/scoped_comptr.h"
 #include "win8/metro_driver/chrome_app_view.h"
 #include "win8/metro_driver/winrt_utils.h"
 
diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc
index 816defa..37f588a 100644
--- a/win8/metro_driver/file_picker_ash.cc
+++ b/win8/metro_driver/file_picker_ash.cc
@@ -6,13 +6,13 @@
 #include "win8/metro_driver/file_picker_ash.h"
 
 #include "base/bind.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/win/scoped_comptr.h"
 #include "base/win/metro.h"
+#include "base/win/scoped_comptr.h"
 #include "ui/metro_viewer/metro_viewer_messages.h"
 #include "win8/metro_driver/chrome_app_view_ash.h"
 #include "win8/metro_driver/winrt_utils.h"
diff --git a/win8/metro_driver/secondary_tile.h b/win8/metro_driver/secondary_tile.h
index ed3f58f..0fba5096 100644
--- a/win8/metro_driver/secondary_tile.h
+++ b/win8/metro_driver/secondary_tile.h
@@ -4,7 +4,7 @@
 #ifndef CHROME_BROWSER_UI_METRO_DRIVER_SECONDARY_TILE_H_
 #define CHROME_BROWSER_UI_METRO_DRIVER_SECONDARY_TILE_H_
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string16.h"
 #include "base/win/metro.h"
 
diff --git a/win8/metro_driver/toast_notification_handler.cc b/win8/metro_driver/toast_notification_handler.cc
index 525331e..9448e12 100644
--- a/win8/metro_driver/toast_notification_handler.cc
+++ b/win8/metro_driver/toast_notification_handler.cc
@@ -7,7 +7,7 @@
 #include "win8/metro_driver/stdafx.h"
 #include "win8/metro_driver/toast_notification_handler.h"
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
diff --git a/win8/metro_driver/winrt_utils.cc b/win8/metro_driver/winrt_utils.cc
index 8df33f0..e956c47 100644
--- a/win8/metro_driver/winrt_utils.cc
+++ b/win8/metro_driver/winrt_utils.cc
@@ -7,7 +7,7 @@
 
 #include <shlobj.h>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
diff --git a/win8/test/metro_registration_helper.cc b/win8/test/metro_registration_helper.cc
index 97442a8..bfcfb29 100644
--- a/win8/test/metro_registration_helper.cc
+++ b/win8/test/metro_registration_helper.cc
@@ -5,8 +5,8 @@
 #include "win8/test/metro_registration_helper.h"
 
 #include "base/command_line.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process.h"
diff --git a/win8/test/test_registrar.cc b/win8/test/test_registrar.cc
index 04c2ec9..1588a21 100644
--- a/win8/test/test_registrar.cc
+++ b/win8/test/test_registrar.cc
@@ -20,7 +20,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"