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

25 files changed, 30 insertions, 30 deletions

diff --git a/net/base/cert_test_util.cc b/net/base/cert_test_util.cc
index d384abe..11b9a71 100644
--- a/net/base/cert_test_util.cc
+++ b/net/base/cert_test_util.cc
@@ -4,8 +4,8 @@
 
 #include "net/base/cert_test_util.h"
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "net/base/ev_root_ca_metadata.h"
 #include "net/base/x509_certificate.h"
diff --git a/net/base/cert_verify_proc_unittest.cc b/net/base/cert_verify_proc_unittest.cc
index e440563..165a744 100644
--- a/net/base/cert_verify_proc_unittest.cc
+++ b/net/base/cert_verify_proc_unittest.cc
@@ -6,9 +6,9 @@
 
 #include <vector>
 
-#include "base/file_path.h"
-#include "base/string_number_conversions.h"
+#include "base/files/file_path.h"
 #include "base/sha1.h"
+#include "base/string_number_conversions.h"
 #include "net/base/asn1_util.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/cert_test_util.h"
diff --git a/net/base/client_cert_store_impl_unittest.cc b/net/base/client_cert_store_impl_unittest.cc
index 761f88c..fb2de79 100644
--- a/net/base/client_cert_store_impl_unittest.cc
+++ b/net/base/client_cert_store_impl_unittest.cc
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/cert_test_util.h"
diff --git a/net/base/directory_lister.h b/net/base/directory_lister.h
index f1c5234..999b857 100644
--- a/net/base/directory_lister.h
+++ b/net/base/directory_lister.h
@@ -7,10 +7,10 @@
 
 #include <vector>
 
-#include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/message_loop_proxy.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/message_loop_proxy.h"
 #include "net/base/net_export.h"
 
 namespace net {
diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc
index 07d85ab..8dd2229 100644
--- a/net/base/directory_lister_unittest.cc
+++ b/net/base/directory_lister_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc
index 0c16ef4..d39b17a 100644
--- a/net/base/file_stream_context_posix.cc
+++ b/net/base/file_stream_context_posix.cc
@@ -7,17 +7,17 @@
 
 #include "net/base/file_stream_context.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
diff --git a/net/base/file_stream_context_win.cc b/net/base/file_stream_context_win.cc
index a514ab0..f5656a3 100644
--- a/net/base/file_stream_context_win.cc
+++ b/net/base/file_stream_context_win.cc
@@ -6,7 +6,7 @@
 
 #include <windows.h>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/task_runner_util.h"
diff --git a/net/base/filter.cc b/net/base/filter.cc
index dbda8a6..fcbd25f 100644
--- a/net/base/filter.cc
+++ b/net/base/filter.cc
@@ -4,7 +4,7 @@
 
 #include "net/base/filter.h"
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string_util.h"
 #include "net/base/gzip_filter.h"
 #include "net/base/io_buffer.h"
diff --git a/net/base/mime_util.h b/net/base/mime_util.h
index 96d638a..d2638cb 100644
--- a/net/base/mime_util.h
+++ b/net/base/mime_util.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "net/base/net_export.h"
 
 namespace net {
diff --git a/net/base/mock_file_stream.h b/net/base/mock_file_stream.h
index 1509b50..a37b495 100644
--- a/net/base/mock_file_stream.h
+++ b/net/base/mock_file_stream.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 
diff --git a/net/base/multi_threaded_cert_verifier_unittest.cc b/net/base/multi_threaded_cert_verifier_unittest.cc
index f9bab0a..5fccde9 100644
--- a/net/base/multi_threaded_cert_verifier_unittest.cc
+++ b/net/base/multi_threaded_cert_verifier_unittest.cc
@@ -5,7 +5,7 @@
 #include "net/base/multi_threaded_cert_verifier.h"
 
 #include "base/bind.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "net/base/cert_test_util.h"
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index ffbbb7a..d5f58e2 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -26,8 +26,8 @@
 #endif
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"
diff --git a/net/base/net_util_posix.cc b/net/base/net_util_posix.cc
index 0579ab1..25a58b4 100644
--- a/net/base/net_util_posix.cc
+++ b/net/base/net_util_posix.cc
@@ -6,7 +6,7 @@
 
 #include <sys/types.h>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/string_util.h"
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 0945b2c..aa12fcc 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc
index 62eabcc..fc13222 100644
--- a/net/base/net_util_win.cc
+++ b/net/base/net_util_win.cc
@@ -9,7 +9,7 @@
 
 #include <algorithm>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
diff --git a/net/base/nss_cert_database_unittest.cc b/net/base/nss_cert_database_unittest.cc
index b5e20b81..bf715f9 100644
--- a/net/base/nss_cert_database_unittest.cc
+++ b/net/base/nss_cert_database_unittest.cc
@@ -8,8 +8,8 @@
 
 #include <algorithm>
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
diff --git a/net/base/platform_mime_util.h b/net/base/platform_mime_util.h
index 2cd4e2d..fdc43aa 100644
--- a/net/base/platform_mime_util.h
+++ b/net/base/platform_mime_util.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/hash_tables.h"
 
 namespace net {
diff --git a/net/base/test_data_directory.h b/net/base/test_data_directory.h
index 2ed0ed6..81e7152 100644
--- a/net/base/test_data_directory.h
+++ b/net/base/test_data_directory.h
@@ -5,7 +5,7 @@
 #ifndef NET_BASE_TEST_DATA_DIRECTORY_H_
 #define NET_BASE_TEST_DATA_DIRECTORY_H_
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 
 namespace net {
 
diff --git a/net/base/test_root_certs.cc b/net/base/test_root_certs.cc
index 83a98d1..084bbef 100644
--- a/net/base/test_root_certs.cc
+++ b/net/base/test_root_certs.cc
@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "net/base/x509_certificate.h"
 
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 66f97d6..025faea 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/base64.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/sha1.h"
 #include "base/string_piece.h"
 #include "crypto/sha2.h"
diff --git a/net/base/unix_domain_socket_posix_unittest.cc b/net/base/unix_domain_socket_posix_unittest.cc
index c8dfea1..5352a7b 100644
--- a/net/base/unix_domain_socket_posix_unittest.cc
+++ b/net/base/unix_domain_socket_posix_unittest.cc
@@ -19,8 +19,8 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc
index 76ff088..c639535 100644
--- a/net/base/upload_data_stream_unittest.cc
+++ b/net/base/upload_data_stream_unittest.cc
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "base/bind.h"
-#include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
diff --git a/net/base/upload_element.h b/net/base/upload_element.h
index fceb747..3c91e02 100644
--- a/net/base/upload_element.h
+++ b/net/base/upload_element.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/time.h"
 #include "net/base/net_export.h"
 
diff --git a/net/base/upload_file_element_reader.h b/net/base/upload_file_element_reader.h
index 392cf7c..9fe8500a 100644
--- a/net/base/upload_file_element_reader.h
+++ b/net/base/upload_file_element_reader.h
@@ -6,7 +6,7 @@
 #define NET_BASE_UPLOAD_FILE_ELEMENT_READER_H_
 
 #include "base/compiler_specific.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc
index a3d35fa..0c0a32d 100644
--- a/net/base/x509_certificate_unittest.cc
+++ b/net/base/x509_certificate_unittest.cc
@@ -5,7 +5,7 @@
 #include "net/base/x509_certificate.h"
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/sha1.h"