Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/

TBR=pneubeck@chromium.org

Review URL: https://codereview.chromium.org/555313002

Cr-Commit-Position: refs/heads/master@{#294072}

18 files changed, 27 insertions, 27 deletions

diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 3425d1a..2e59b23 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -19,7 +19,7 @@
 #include "ash/wm/root_window_layout_manager.h"
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/worker_pool.h"
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 3c66f18..7507ff5 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -12,7 +12,7 @@
 #include "athena/main/public/athena_launcher.h"
 #include "athena/screen/public/screen_manager.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "components/pdf/renderer/ppb_pdf_impl.h"
 #include "content/public/app/content_main.h"
@@ -38,7 +38,7 @@ namespace {
 const char kDefaultAppPath[] =
     "chrome/common/extensions/docs/examples/apps/calculator/app";
 
-}  // namespace athena
+}  // namespace
 
 class AthenaDesktopController : public extensions::DesktopController {
  public:
diff --git a/athena/system/orientation_controller.cc b/athena/system/orientation_controller.cc
index 511e0ca..3b13cb5b 100644
--- a/athena/system/orientation_controller.cc
+++ b/athena/system/orientation_controller.cc
@@ -5,8 +5,8 @@
 #include "athena/screen/public/screen_manager.h"
 #include "athena/system/orientation_controller.h"
 #include "base/bind.h"
-#include "base/file_util.h"
 #include "base/files/file_path_watcher.h"
+#include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/task_runner.h"
 
diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc
index 1f338e6..e3baacc 100644
--- a/chromeos/accelerometer/accelerometer_reader.cc
+++ b/chromeos/accelerometer/accelerometer_reader.cc
@@ -5,7 +5,7 @@
 #include "chromeos/accelerometer/accelerometer_reader.h"
 
 #include "base/bind.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chromeos/cert_loader_unittest.cc b/chromeos/cert_loader_unittest.cc
index 19765af..5d957b3 100644
--- a/chromeos/cert_loader_unittest.cc
+++ b/chromeos/cert_loader_unittest.cc
@@ -5,7 +5,7 @@
 #include "chromeos/cert_loader.h"
 
 #include "base/bind.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
diff --git a/chromeos/chromeos_paths.cc b/chromeos/chromeos_paths.cc
index f629c45..659c240 100644
--- a/chromeos/chromeos_paths.cc
+++ b/chromeos/chromeos_paths.cc
@@ -4,8 +4,8 @@
 
 #include "chromeos/chromeos_paths.h"
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/sys_info.h"
 
diff --git a/chromeos/chromeos_test_utils.cc b/chromeos/chromeos_test_utils.cc
index f728ff7..8a3456b 100644
--- a/chromeos/chromeos_test_utils.cc
+++ b/chromeos/chromeos_test_utils.cc
@@ -4,8 +4,8 @@
 
 #include "chromeos/chromeos_test_utils.h"
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 
 namespace chromeos {
diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc
index 1baa32d..a875848 100644
--- a/chromeos/dbus/cros_disks_client.cc
+++ b/chromeos/dbus/cros_disks_client.cc
@@ -7,8 +7,8 @@
 #include <map>
 
 #include "base/bind.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
diff --git a/chromeos/dbus/fake_cryptohome_client.cc b/chromeos/dbus/fake_cryptohome_client.cc
index c5ad729..341c984 100644
--- a/chromeos/dbus/fake_cryptohome_client.cc
+++ b/chromeos/dbus/fake_cryptohome_client.cc
@@ -5,7 +5,7 @@
 #include "chromeos/dbus/fake_cryptohome_client.h"
 
 #include "base/bind.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index 56dc8508..537d573 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc
index 89df842..20f1b85 100644
--- a/chromeos/network/client_cert_resolver_unittest.cc
+++ b/chromeos/network/client_cert_resolver_unittest.cc
@@ -6,8 +6,8 @@
 #include <cert.h>
 #include <pk11pub.h>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc
index a749cd9..0c5d6ee 100644
--- a/chromeos/network/network_cert_migrator_unittest.cc
+++ b/chromeos/network/network_cert_migrator_unittest.cc
@@ -6,8 +6,8 @@
 
 #include <cert.h>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chromeos/cert_loader.h"
diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc
index ed737ac..5a1f577 100644
--- a/chromeos/network/network_connection_handler_unittest.cc
+++ b/chromeos/network/network_connection_handler_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
diff --git a/chromeos/network/onc/onc_test_utils.cc b/chromeos/network/onc/onc_test_utils.cc
index 122c798..9f1cce7 100644
--- a/chromeos/network/onc/onc_test_utils.cc
+++ b/chromeos/network/onc/onc_test_utils.cc
@@ -4,8 +4,8 @@
 
 #include "chromeos/network/onc/onc_test_utils.h"
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
diff --git a/chromeos/process_proxy/process_output_watcher_unittest.cc b/chromeos/process_proxy/process_output_watcher_unittest.cc
index d032725..a3bdddf 100644
--- a/chromeos/process_proxy/process_output_watcher_unittest.cc
+++ b/chromeos/process_proxy/process_output_watcher_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/run_loop.h"
@@ -191,7 +191,7 @@ TEST_F(ProcessOutputWatcherTest, DISABLED_OutputWatcher) {
   test_cases.push_back(TestCase("testing error2\n", false));
 
   RunTest(test_cases);
-};
+}
 
 // http://crbug.com/396496
 TEST_F(ProcessOutputWatcherTest, DISABLED_SplitUTF8Character) {
@@ -299,7 +299,7 @@ TEST_F(ProcessOutputWatcherTest, DISABLED_FourByteUTF8) {
   test_cases.push_back(TestCase("\xa2", false, "\xf0\xa4\xad\xa2"));
 
   RunTest(test_cases);
-};
+}
 
 // Verifies that sending '\0' generates PROCESS_OUTPUT_TYPE_OUT event and does
 // not terminate output watcher.
@@ -313,6 +313,6 @@ TEST_F(ProcessOutputWatcherTest, DISABLED_SendNull) {
   test_cases.push_back(TestCase("a", true));
 
   RunTest(test_cases);
-};
+}
 
 }  // namespace chromeos
diff --git a/chromeos/process_proxy/process_proxy.cc b/chromeos/process_proxy/process_proxy.cc
index aae2ee9..881ea5a 100644
--- a/chromeos/process_proxy/process_proxy.cc
+++ b/chromeos/process_proxy/process_proxy.cc
@@ -10,7 +10,7 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/kill.h"
@@ -43,7 +43,7 @@ ProcessProxy::ProcessProxy(): process_launched_(false),
   // Set pipes to initial, invalid value so we can easily know if a pipe was
   // opened by us.
   ClearAllFdPairs();
-};
+}
 
 bool ProcessProxy::Open(const std::string& command, pid_t* pid) {
   if (process_launched_)
diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc
index 1c80069..32f57cb 100644
--- a/chromeos/settings/timezone_settings.cc
+++ b/chromeos/settings/timezone_settings.cc
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "base/bind.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/chromeos/system/name_value_pairs_parser.cc b/chromeos/system/name_value_pairs_parser.cc
index 0c779eb..bd565f7 100644
--- a/chromeos/system/name_value_pairs_parser.cc
+++ b/chromeos/system/name_value_pairs_parser.cc
@@ -5,8 +5,8 @@
 #include "chromeos/system/name_value_pairs_parser.h"
 
 #include "base/command_line.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/process/launch.h"
 #include "base/stl_util.h"
@@ -19,7 +19,7 @@ namespace system {
 
 namespace {
 
-bool GetToolOutput(int argc, const char* argv[], std::string& output) {
+bool GetToolOutput(int argc, const char* argv[], std::string* output) {
   DCHECK_GE(argc, 1);
 
   if (!base::PathExists(base::FilePath(argv[0]))) {
@@ -30,7 +30,7 @@ bool GetToolOutput(int argc, const char* argv[], std::string& output) {
   std::vector<std::string> args;
   for (int argn = 0; argn < argc; ++argn)
     args.push_back(argv[argn]);
-  if (!base::GetAppOutput(args, &output)) {
+  if (!base::GetAppOutput(args, output)) {
     LOG(WARNING) << "Error executing " << argv[0];
     return false;
   }
@@ -109,7 +109,7 @@ bool NameValuePairsParser::GetSingleValueFromTool(int argc,
                                                   const char* argv[],
                                                   const std::string& key) {
   std::string output_string;
-  if (!GetToolOutput(argc, argv, output_string))
+  if (!GetToolOutput(argc, argv, &output_string))
     return false;
 
   base::TrimWhitespaceASCII(output_string, base::TRIM_ALL, &output_string);
@@ -138,7 +138,7 @@ bool NameValuePairsParser::ParseNameValuePairsFromTool(
     const std::string& delim,
     const std::string& comment_delim) {
   std::string output_string;
-  if (!GetToolOutput(argc, argv, output_string))
+  if (!GetToolOutput(argc, argv, &output_string))
     return false;
 
   return ParseNameValuePairsWithComments(