Revert of Cleanup: Remove base/file_util.h. Convert remaining referen…

…ces. (patchset chromium#1 id:1 of https://codereview.chromium.org/568873004/) Reason for revert: Broke some internal builds. Need to give them a chance to fix their builds. Original issue's description: > Cleanup: Remove base/file_util.h. Convert remaining references. > > TBR=brettw@chromium.org > > Committed: https://crrev.com/6d63c4898c2da5a286d01f80229baeb914f99f18 > Cr-Commit-Position: refs/heads/master@{#294729} TBR=brettw@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/565803006 Cr-Commit-Position: refs/heads/master@{#294755}
hylschwy · Sep 13, 2014 · cdf83e8 · cdf83e8
1 parent 6967652
commit cdf83e8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/android_webview/browser/renderer_host/print_manager.cc b/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/files/file_util.h"
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "printing/print_settings.h"

diff --git a/android_webview/native/cookie_manager.cc b/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"
@@ -609,4 +609,4 @@ bool RegisterCookieManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-}  // namespace android_webview
+}  // android_webview namespace
diff --git a/base/file_util.h b/base/file_util.h
@@ -0,0 +1,6 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// TODO(brettw) update callers to use the new location and remove this file.
+#include "base/files/file_util.h"
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
@@ -9,7 +9,7 @@
 #endif
 
 #include "base/debug/trace_event.h"
-#include "base/files/file_util.h"
+#include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"

diff --git a/third_party/leveldatabase/env_chromium_unittest.cc b/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"

diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/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"

diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base/files/file_util.h"
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"

diff --git a/third_party/zlib/google/zip_reader.h b/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"

diff --git a/third_party/zlib/google/zip_reader_unittest.cc b/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"

diff --git a/third_party/zlib/google/zip_unittest.cc b/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"