Update code to include base/files/file_util.h
file_util.h was moved from base to base/files
(https://codereview.chromium.org/468253002). This CL updates platform2
code to include base/files/file_util.h instead of base/file_util.h.
BUG=chromium:411001
TEST=Trybot run on paladin, release, and chromiumos-sdk builders.
Change-Id: I488925b54615e131e508a460dc1a27f88168f936
Reviewed-on: https://chromium-review.googlesource.com/216851
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/certificate_file.cc b/certificate_file.cc
index 5b4e9c1..b147482 100644
--- a/certificate_file.cc
+++ b/certificate_file.cc
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_split.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
diff --git a/certificate_file_unittest.cc b/certificate_file_unittest.cc
index 55824bb..099500f 100644
--- a/certificate_file_unittest.cc
+++ b/certificate_file_unittest.cc
@@ -8,7 +8,7 @@
#include <vector>
#include <base/files/file_path.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/stringprintf.h>
#include <gmock/gmock.h>
diff --git a/connection_info_reader_unittest.cc b/connection_info_reader_unittest.cc
index eed9621..9be8112 100644
--- a/connection_info_reader_unittest.cc
+++ b/connection_info_reader_unittest.cc
@@ -6,7 +6,7 @@
#include <netinet/in.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/stringprintf.h>
#include <gmock/gmock.h>
diff --git a/crypto_des_cbc.cc b/crypto_des_cbc.cc
index 1619982..5d85194 100644
--- a/crypto_des_cbc.cc
+++ b/crypto_des_cbc.cc
@@ -6,7 +6,7 @@
#include <rpc/des_crypt.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_util.h>
#include "shill/glib.h"
diff --git a/crypto_des_cbc_unittest.cc b/crypto_des_cbc_unittest.cc
index 4937aa2..74e86f3 100644
--- a/crypto_des_cbc_unittest.cc
+++ b/crypto_des_cbc_unittest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <gtest/gtest.h>
diff --git a/crypto_provider_unittest.cc b/crypto_provider_unittest.cc
index b7e89e4..b77dc67 100644
--- a/crypto_provider_unittest.cc
+++ b/crypto_provider_unittest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <gtest/gtest.h>
diff --git a/device.cc b/device.cc
index 3b6a12f..530787d 100644
--- a/device.cc
+++ b/device.cc
@@ -13,7 +13,7 @@
#include <vector>
#include <base/bind.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/ref_counted.h>
#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
diff --git a/device_info.cc b/device_info.cc
index c7d7bf5..8d6a0f4 100644
--- a/device_info.cc
+++ b/device_info.cc
@@ -21,8 +21,8 @@
#include <string>
#include <base/bind.h>
-#include <base/file_util.h>
#include <base/files/file_enumerator.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_file.h>
#include <base/memory/scoped_ptr.h>
#include <base/stl_util.h>
diff --git a/device_info_unittest.cc b/device_info_unittest.cc
index e0c2860..9641f92 100644
--- a/device_info_unittest.cc
+++ b/device_info_unittest.cc
@@ -14,7 +14,7 @@
#include <sys/socket.h>
#include <base/bind.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/memory/ref_counted.h>
#include <base/message_loop/message_loop.h>
diff --git a/dhcp_config.cc b/dhcp_config.cc
index c6a3ff6..cd717ce 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <sys/wait.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_split.h>
#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 9202c07..17acf62 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -8,7 +8,7 @@
#include <vector>
#include <base/bind.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
diff --git a/dhcp_provider.cc b/dhcp_provider.cc
index decedec..4106de0 100644
--- a/dhcp_provider.cc
+++ b/dhcp_provider.cc
@@ -4,7 +4,7 @@
#include "shill/dhcp_provider.h"
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/stringprintf.h>
#include "shill/control_interface.h"
diff --git a/dhcp_provider_unittest.cc b/dhcp_provider_unittest.cc
index 32380de..9fcb393 100644
--- a/dhcp_provider_unittest.cc
+++ b/dhcp_provider_unittest.cc
@@ -4,7 +4,7 @@
#include "shill/dhcp_provider.h"
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/stringprintf.h>
diff --git a/diagnostics_reporter.cc b/diagnostics_reporter.cc
index eb7fcc9..7c8341d 100644
--- a/diagnostics_reporter.cc
+++ b/diagnostics_reporter.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <chromeos/minijail/minijail.h>
#include "shill/process_killer.h"
diff --git a/diagnostics_reporter_unittest.cc b/diagnostics_reporter_unittest.cc
index ede0d27..3608c42 100644
--- a/diagnostics_reporter_unittest.cc
+++ b/diagnostics_reporter_unittest.cc
@@ -4,7 +4,7 @@
#include "shill/diagnostics_reporter.h"
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <chromeos/minijail/mock_minijail.h>
#include <gmock/gmock.h>
diff --git a/file_reader.cc b/file_reader.cc
index fb916d3..7440253 100644
--- a/file_reader.cc
+++ b/file_reader.cc
@@ -4,7 +4,7 @@
#include "shill/file_reader.h"
-#include <base/file_util.h>
+#include <base/files/file_util.h>
using base::FilePath;
using std::string;
diff --git a/file_reader_unittest.cc b/file_reader_unittest.cc
index cdc5d8f..e67bc09 100644
--- a/file_reader_unittest.cc
+++ b/file_reader_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/string_util.h>
#include <gtest/gtest.h>
diff --git a/key_file_store.cc b/key_file_store.cc
index 0293156..160e18c 100644
--- a/key_file_store.cc
+++ b/key_file_store.cc
@@ -7,7 +7,7 @@
#include <map>
#include <base/files/important_file_writer.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_number_conversions.h>
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/key_file_store_unittest.cc b/key_file_store_unittest.cc
index 2586ff0..831cf05 100644
--- a/key_file_store_unittest.cc
+++ b/key_file_store_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
#include <base/files/file_enumerator.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/stl_util.h>
#include <base/strings/string_number_conversions.h>
diff --git a/l2tp_ipsec_driver.cc b/l2tp_ipsec_driver.cc
index 9a29bab..73c7887 100644
--- a/l2tp_ipsec_driver.cc
+++ b/l2tp_ipsec_driver.cc
@@ -24,7 +24,7 @@
#include "shill/l2tp_ipsec_driver.h"
#include <base/bind.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_util.h>
#include <chromeos/dbus/service_constants.h>
#include <vpn-manager/service_error.h>
diff --git a/l2tp_ipsec_driver_unittest.cc b/l2tp_ipsec_driver_unittest.cc
index 9aa79b2..20ebbcf 100644
--- a/l2tp_ipsec_driver_unittest.cc
+++ b/l2tp_ipsec_driver_unittest.cc
@@ -4,7 +4,7 @@
#include "shill/l2tp_ipsec_driver.h"
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/memory/weak_ptr.h>
#include <base/strings/string_util.h>
diff --git a/mac80211_monitor.cc b/mac80211_monitor.cc
index b8ef7a8..391e202 100644
--- a/mac80211_monitor.cc
+++ b/mac80211_monitor.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
#include <base/strings/stringprintf.h>
diff --git a/mac80211_monitor_unittest.cc b/mac80211_monitor_unittest.cc
index e457a42..291ec5a 100644
--- a/mac80211_monitor_unittest.cc
+++ b/mac80211_monitor_unittest.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/manager.cc b/manager.cc
index bf346a2..c8cdb10 100644
--- a/manager.cc
+++ b/manager.cc
@@ -13,7 +13,7 @@
#include <vector>
#include <base/bind.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/ref_counted.h>
#include <base/strings/stringprintf.h>
#include <base/strings/string_split.h>
diff --git a/manager_unittest.cc b/manager_unittest.cc
index 7aa859e..359ff61 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -9,7 +9,7 @@
#include <glib.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/stl_util.h>
#include <base/strings/stringprintf.h>
diff --git a/mobile_operator_info.h b/mobile_operator_info.h
index af27ef5..a57b9b0 100644
--- a/mobile_operator_info.h
+++ b/mobile_operator_info.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/scoped_ptr.h>
#include <base/memory/scoped_vector.h>
diff --git a/mobile_operator_info_impl.h b/mobile_operator_info_impl.h
index cb4825c..41eb153 100644
--- a/mobile_operator_info_impl.h
+++ b/mobile_operator_info_impl.h
@@ -10,7 +10,7 @@
#include <vector>
#include <base/cancelable_callback.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/scoped_ptr.h>
#include <base/memory/scoped_vector.h>
#include <base/memory/weak_ptr.h>
diff --git a/mobile_operator_info_unittest.cc b/mobile_operator_info_unittest.cc
index 411aedc..62bf4b7 100644
--- a/mobile_operator_info_unittest.cc
+++ b/mobile_operator_info_unittest.cc
@@ -8,7 +8,7 @@
#include <set>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/macros.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/modem.h b/modem.h
index bcb3614..57c446c 100644
--- a/modem.h
+++ b/modem.h
@@ -9,7 +9,7 @@
#include <vector>
#include <base/macros.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/scoped_ptr.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
diff --git a/openvpn_driver.cc b/openvpn_driver.cc
index 998497c..fb63bd4 100644
--- a/openvpn_driver.cc
+++ b/openvpn_driver.cc
@@ -6,7 +6,7 @@
#include <arpa/inet.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
#include <base/strings/string_util.h>
diff --git a/openvpn_driver_unittest.cc b/openvpn_driver_unittest.cc
index 456e613..96a43ef 100644
--- a/openvpn_driver_unittest.cc
+++ b/openvpn_driver_unittest.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <base/files/file_path.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
diff --git a/profile.cc b/profile.cc
index ab9b97b..bfe2eb7 100644
--- a/profile.cc
+++ b/profile.cc
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/stl_util.h>
#include <base/strings/string_split.h>
#include <base/strings/string_util.h>
diff --git a/profile_unittest.cc b/profile_unittest.cc
index 435fa36..2dfcffc 100644
--- a/profile_unittest.cc
+++ b/profile_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/scoped_ptr.h>
#include <base/strings/stringprintf.h>
#include <base/strings/string_util.h>
diff --git a/protobuf_lite_streams.cc b/protobuf_lite_streams.cc
index f8863fe..60bdb12 100644
--- a/protobuf_lite_streams.cc
+++ b/protobuf_lite_streams.cc
@@ -7,7 +7,7 @@
#include <fcntl.h>
#include <sys/types.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/posix/eintr_wrapper.h>
using google::protobuf::io::CopyingInputStream;
diff --git a/resolver.cc b/resolver.cc
index 12e5a27..785993c 100644
--- a/resolver.cc
+++ b/resolver.cc
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
diff --git a/resolver_unittest.cc b/resolver_unittest.cc
index f7b1449..6b54fbf 100644
--- a/resolver_unittest.cc
+++ b/resolver_unittest.cc
@@ -4,7 +4,7 @@
#include "shill/resolver.h"
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/stl_util.h>
#include <base/strings/stringprintf.h>
diff --git a/routing_table.cc b/routing_table.cc
index 003f586..ee56197 100644
--- a/routing_table.cc
+++ b/routing_table.cc
@@ -20,7 +20,7 @@
#include <base/bind.h>
#include <base/files/file_path.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/scoped_ptr.h>
#include <base/stl_util.h>
#include <base/strings/stringprintf.h>
diff --git a/socket_info_reader_unittest.cc b/socket_info_reader_unittest.cc
index ef7302f..597f911 100644
--- a/socket_info_reader_unittest.cc
+++ b/socket_info_reader_unittest.cc
@@ -4,7 +4,7 @@
#include "shill/socket_info_reader.h"
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/stringprintf.h>
#include <gmock/gmock.h>
diff --git a/wifi.cc b/wifi.cc
index aa0a37a..b6284dc 100644
--- a/wifi.cc
+++ b/wifi.cc
@@ -17,7 +17,7 @@
#include <vector>
#include <base/bind.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/file_path.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
diff --git a/wifi_unittest.cc b/wifi_unittest.cc
index 304e22b..24c3811 100644
--- a/wifi_unittest.cc
+++ b/wifi_unittest.cc
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/memory/ref_counted.h>
#include <base/memory/scoped_ptr.h>
#include <base/strings/string_number_conversions.h>
diff --git a/wimax_provider_unittest.cc b/wimax_provider_unittest.cc
index 4a958dd..c9b8e42 100644
--- a/wimax_provider_unittest.cc
+++ b/wimax_provider_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>