summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-09-12 18:02:11 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-13 01:10:01 +0000
commitc9e38a27356edb9e24a038eb2e67af534245d590 (patch)
tree937b6de7ab691880cc62cbe55d05fee75b6d8005 /media
parentce3cbf9560595152b9494ef51f109edd705abb04 (diff)
downloadchromium_src-c9e38a27356edb9e24a038eb2e67af534245d590.zip
chromium_src-c9e38a27356edb9e24a038eb2e67af534245d590.tar.gz
chromium_src-c9e38a27356edb9e24a038eb2e67af534245d590.tar.bz2
Cleanup: Use base/files/file_util.h instead of base/file_util.h in [c-n]*/
TBR=cpu@chromium.org,jochen@chromium.org,piman@chromium.org,rockot@chromium.org,rsleevi@chromium.org,vrk@chromium.org ,zea@chromium.org Review URL: https://codereview.chromium.org/563173002 Cr-Commit-Position: refs/heads/master@{#294712}
Diffstat (limited to 'media')
-rw-r--r--media/audio/android/audio_android_unittest.cc2
-rw-r--r--media/audio/audio_low_latency_input_output_unittest.cc2
-rw-r--r--media/audio/win/audio_low_latency_input_win_unittest.cc2
-rw-r--r--media/audio/win/audio_low_latency_output_win_unittest.cc2
-rw-r--r--media/base/container_names_unittest.cc2
-rw-r--r--media/base/test_data_util.cc2
-rw-r--r--media/base/yuv_convert_perftest.cc2
-rw-r--r--media/base/yuv_convert_unittest.cc2
-rw-r--r--media/cast/test/simulator.cc2
-rw-r--r--media/ffmpeg/ffmpeg_unittest.cc2
-rw-r--r--media/video/capture/linux/video_capture_device_linux.h2
11 files changed, 11 insertions, 11 deletions
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 68e74a4..0ac1be4 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -4,7 +4,7 @@
#include "base/android/build_info.h"
#include "base/basictypes.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/path_service.h"
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 5632896..339acc2 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -4,7 +4,7 @@
#include "base/basictypes.h"
#include "base/environment.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/synchronization/lock.h"
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index 9ce7acf..51d4b55 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/environment.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/path_service.h"
diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc
index ed03d2b..e0775f2 100644
--- a/media/audio/win/audio_low_latency_output_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_output_win_unittest.cc
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/environment.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/path_service.h"
diff --git a/media/base/container_names_unittest.cc b/media/base/container_names_unittest.cc
index c7d40d4..f49327e 100644
--- a/media/base/container_names_unittest.cc
+++ b/media/base/container_names_unittest.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 "media/base/container_names.h"
#include "media/base/test_data_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index f6513a8..b2f122b 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -4,7 +4,7 @@
#include "media/base/test_data_util.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/path_service.h"
diff --git a/media/base/yuv_convert_perftest.cc b/media/base/yuv_convert_perftest.cc
index 7e8beab..c6cacaf 100644
--- a/media/base/yuv_convert_perftest.cc
+++ b/media/base/yuv_convert_perftest.cc
@@ -4,7 +4,7 @@
#include "base/base_paths.h"
#include "base/cpu.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/time/time.h"
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc
index 0e04279..5e9d608 100644
--- a/media/base/yuv_convert_unittest.cc
+++ b/media/base/yuv_convert_unittest.cc
@@ -4,7 +4,7 @@
#include "base/base_paths.h"
#include "base/cpu.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "media/base/djb2.h"
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc
index df1c739..2c5e264 100644
--- a/media/cast/test/simulator.cc
+++ b/media/cast/test/simulator.cc
@@ -19,8 +19,8 @@
#include "base/at_exit.h"
#include "base/base_paths.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/files/memory_mapped_file.h"
#include "base/files/scoped_file.h"
#include "base/json/json_writer.h"
diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc
index dbc28c5..0bb7fa7 100644
--- a/media/ffmpeg/ffmpeg_unittest.cc
+++ b/media/ffmpeg/ffmpeg_unittest.cc
@@ -12,8 +12,8 @@
#include <queue>
#include "base/base_paths.h"
-#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "base/files/file_util.h"
#include "base/files/memory_mapped_file.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h
index 40017a8..c6d1518 100644
--- a/media/video/capture/linux/video_capture_device_linux.h
+++ b/media/video/capture/linux/video_capture_device_linux.h
@@ -12,7 +12,7 @@
#include <string>
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/threading/thread.h"
#include "media/video/capture/video_capture_device.h"