Cleanup: Remove base/file_util.h. Convert remaining references. (try 2)

TBR=brettw@chromium.org

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

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

android_webview/browser/renderer_host/print_manager.cc

@@ -9,7 +9,7 @@
 #include "android_webview/common/render_view_messages.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "printing/print_settings.h"

android_webview/native/cookie_manager.cc

@@ -13,8 +13,8 @@
 #include "base/android/path_utils.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"

chrome/browser/chromeos/power/light_bar.cc

@@ -7,7 +7,7 @@
 #include <cstring>  // needed for strlen()
 
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/chromeos_switches.h"

chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/string_util.h"

chrome/browser/profile_resetter/automatic_profile_resetter_mementos.cc

@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"

chrome/tools/profile_reset/jtl_compiler_frontend.cc

@@ -14,8 +14,8 @@
 #include <string>
 
 #include "base/command_line.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "chrome/tools/profile_reset/jtl_compiler.h"
 
 namespace {

third_party/leveldatabase/env_chromium.cc

@@ -9,7 +9,7 @@
 #endif
 
 #include "base/debug/trace_event.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"

third_party/leveldatabase/env_chromium_unittest.cc

@@ -2,10 +2,10 @@
 // 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_enumerator.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/test/test_suite.h"
 #include "third_party/leveldatabase/env_chromium_stdio.h"

third_party/libjingle/overrides/init_webrtc.cc

@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/native_library.h"
 #include "base/path_service.h"

third_party/zlib/google/zip_internal.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/utf_string_conversions.h"
 #include "base/time/time.h"

third_party/zlib/google/zip_reader.h

@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"

third_party/zlib/google/zip_reader_unittest.cc

@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/bind.h"
-#include "base/file_util.h"
 #include "base/files/file.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/md5.h"

third_party/zlib/google/zip_unittest.cc

@@ -6,10 +6,10 @@
 #include <string>
 #include <vector>
 
-#include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"