summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-09-22 12:06:21 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-22 19:06:35 +0000
commit0c8a9bb8b69ca63fbf68f12e7a9f672b18899646 (patch)
tree47bf11a862d15c4f49429f4e876878c78ef7261e /third_party
parentedc4f4707398f16b70f467fb37285c341e60e468 (diff)
downloadchromium_src-0c8a9bb8b69ca63fbf68f12e7a9f672b18899646.zip
chromium_src-0c8a9bb8b69ca63fbf68f12e7a9f672b18899646.tar.gz
chromium_src-0c8a9bb8b69ca63fbf68f12e7a9f672b18899646.tar.bz2
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}
Diffstat (limited to 'third_party')
-rw-r--r--third_party/leveldatabase/env_chromium.cc2
-rw-r--r--third_party/leveldatabase/env_chromium_unittest.cc2
-rw-r--r--third_party/libjingle/overrides/init_webrtc.cc2
-rw-r--r--third_party/zlib/google/zip_internal.cc2
-rw-r--r--third_party/zlib/google/zip_reader.h2
-rw-r--r--third_party/zlib/google/zip_reader_unittest.cc2
-rw-r--r--third_party/zlib/google/zip_unittest.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc
index 4c3375c..7f0d45d 100644
--- 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/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"
diff --git a/third_party/leveldatabase/env_chromium_unittest.cc b/third_party/leveldatabase/env_chromium_unittest.cc
index caac7a6..35e4f90 100644
--- 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
index 80619a6..6db34f6 100644
--- 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
index 5ed2024..d62e0bb 100644
--- a/third_party/zlib/google/zip_internal.cc
+++ b/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"
diff --git a/third_party/zlib/google/zip_reader.h b/third_party/zlib/google/zip_reader.h
index fa4186b..cda9cf7 100644
--- 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
index a137d9d..09fc241 100644
--- 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
index c606434..eda9a68 100644
--- 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"