Cleanup: Use base/files/file_util.h instead of base/file_util.h in [r-t]*/

TBR=sergeyu@chromium.org,cpu@chromium.org,thakis@chromium.org,jamesr@chromium.org,zea@chromium.org,nduca@chromium.org

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

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

15 files changed, 15 insertions, 15 deletions

diff --git a/tools/gn/build_settings.cc b/tools/gn/build_settings.cc
index 322e56a..37d50f5 100644
--- a/tools/gn/build_settings.cc
+++ b/tools/gn/build_settings.cc
@@ -4,7 +4,7 @@
 
 #include "tools/gn/build_settings.h"
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "tools/gn/filesystem_utils.h"
 
 BuildSettings::BuildSettings() {
diff --git a/tools/gn/command_args.cc b/tools/gn/command_args.cc
index 01dc8bc..8b1478f 100644
--- a/tools/gn/command_args.cc
+++ b/tools/gn/command_args.cc
@@ -9,7 +9,7 @@
 
 #include "base/command_line.h"
 #include "base/environment.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
diff --git a/tools/gn/filesystem_utils.cc b/tools/gn/filesystem_utils.cc
index 7bda4c8..56e472e 100644
--- a/tools/gn/filesystem_utils.cc
+++ b/tools/gn/filesystem_utils.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/tools/gn/function_exec_script.cc b/tools/gn/function_exec_script.cc
index 572d997..ce697e5 100644
--- a/tools/gn/function_exec_script.cc
+++ b/tools/gn/function_exec_script.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
diff --git a/tools/gn/function_read_file.cc b/tools/gn/function_read_file.cc
index e182e0c..f35e5a6 100644
--- a/tools/gn/function_read_file.cc
+++ b/tools/gn/function_read_file.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "tools/gn/err.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/functions.h"
diff --git a/tools/gn/function_write_file.cc b/tools/gn/function_write_file.cc
index 322fa65..69ae59ec 100644
--- a/tools/gn/function_write_file.cc
+++ b/tools/gn/function_write_file.cc
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "tools/gn/err.h"
diff --git a/tools/gn/function_write_file_unittest.cc b/tools/gn/function_write_file_unittest.cc
index 16dc888..e2e50e6 100644
--- a/tools/gn/function_write_file_unittest.cc
+++ b/tools/gn/function_write_file_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_util.h"
 #include "base/files/file.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/functions.h"
diff --git a/tools/gn/generate_test_gn_data.cc b/tools/gn/generate_test_gn_data.cc
index cebf3a0..fe4fdc75 100644
--- a/tools/gn/generate_test_gn_data.cc
+++ b/tools/gn/generate_test_gn_data.cc
@@ -5,8 +5,8 @@
 #include <fstream>
 #include <iostream>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
diff --git a/tools/gn/header_checker.cc b/tools/gn/header_checker.cc
index df74125..4cdfc64e 100644
--- a/tools/gn/header_checker.cc
+++ b/tools/gn/header_checker.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "base/bind.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
diff --git a/tools/gn/input_file.cc b/tools/gn/input_file.cc
index 8e29798..74e419d 100644
--- a/tools/gn/input_file.cc
+++ b/tools/gn/input_file.cc
@@ -4,7 +4,7 @@
 
 #include "tools/gn/input_file.h"
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 
 InputFile::InputFile(const SourceFile& name)
     : name_(name),
diff --git a/tools/gn/ninja_build_writer.cc b/tools/gn/ninja_build_writer.cc
index 73f3f27..1436af6 100644
--- a/tools/gn/ninja_build_writer.cc
+++ b/tools/gn/ninja_build_writer.cc
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
diff --git a/tools/gn/ninja_target_writer.cc b/tools/gn/ninja_target_writer.cc
index 75582a1..870cbb6 100644
--- a/tools/gn/ninja_target_writer.cc
+++ b/tools/gn/ninja_target_writer.cc
@@ -7,7 +7,7 @@
 #include <fstream>
 #include <sstream>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "tools/gn/err.h"
 #include "tools/gn/filesystem_utils.h"
diff --git a/tools/gn/ninja_toolchain_writer.cc b/tools/gn/ninja_toolchain_writer.cc
index 0e26db1..5deead5 100644
--- a/tools/gn/ninja_toolchain_writer.cc
+++ b/tools/gn/ninja_toolchain_writer.cc
@@ -6,7 +6,7 @@
 
 #include <fstream>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/strings/stringize_macros.h"
 #include "tools/gn/build_settings.h"
 #include "tools/gn/filesystem_utils.h"
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc
index 7ffe2f8..dd9093de7 100644
--- a/tools/gn/setup.cc
+++ b/tools/gn/setup.cc
@@ -11,8 +11,8 @@
 
 #include "base/bind.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/process/launch.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
diff --git a/tools/gn/trace.cc b/tools/gn/trace.cc
index 4dfb6ca..df97c34 100644
--- a/tools/gn/trace.cc
+++ b/tools/gn/trace.cc
@@ -9,7 +9,7 @@
 #include <sstream>
 #include <vector>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"