diff options
38 files changed, 40 insertions, 39 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index cd8956c..5623f60 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -931,6 +931,7 @@ def _CheckSpamLogging(input_api, output_api): r"^cloud_print[\\\/]", r"^content[\\\/]common[\\\/]gpu[\\\/]client[\\\/]" r"gl_helper_benchmark\.cc$", + r"^courgette[\\\/]courgette_tool\.cc$", r"^extensions[\\\/]renderer[\\\/]logging_native_handler\.cc$", r"^native_client_sdk[\\\/]", r"^remoting[\\\/]base[\\\/]logging\.h$", diff --git a/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc b/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc index d40d038..9cbdec2 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_external_updater.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h" #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" #include "base/location.h" #include "base/logging.h" diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h index d73bdf3c..f60673d 100644 --- a/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h +++ b/chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BACKEND_DELEGATE_H_ #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h" diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc index e68830a..35e02ce 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc @@ -4,9 +4,9 @@ // // MediaGalleries gallery watch API browser tests. -#include "base/file_util.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc index 3bf6328..d3622b1 100644 --- a/chrome/browser/extensions/extension_protocols_unittest.cc +++ b/chrome/browser/extensions/extension_protocols_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#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/strings/string_number_conversions.h" diff --git a/chrome/browser/net/quota_policy_channel_id_store.cc b/chrome/browser/net/quota_policy_channel_id_store.cc index 0080458..975483c 100644 --- a/chrome/browser/net/quota_policy_channel_id_store.cc +++ b/chrome/browser/net/quota_policy_channel_id_store.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/net/quota_policy_channel_id_store_unittest.cc b/chrome/browser/net/quota_policy_channel_id_store_unittest.cc index 67a7b83..249f6c8 100644 --- a/chrome/browser/net/quota_policy_channel_id_store_unittest.cc +++ b/chrome/browser/net/quota_policy_channel_id_store_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" diff --git a/courgette/base_test_unittest.cc b/courgette/base_test_unittest.cc index 9a62868..a5537b6 100644 --- a/courgette/base_test_unittest.cc +++ b/courgette/base_test_unittest.cc @@ -4,7 +4,7 @@ #include "courgette/base_test_unittest.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/path_service.h" void BaseTest::SetUp() { diff --git a/courgette/courgette_tool.cc b/courgette/courgette_tool.cc index 23322fd..a756987 100644 --- a/courgette/courgette_tool.cc +++ b/courgette/courgette_tool.cc @@ -8,8 +8,8 @@ #include "base/at_exit.h" #include "base/basictypes.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/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/courgette/ensemble_apply.cc b/courgette/ensemble_apply.cc index 967b4e4..9d5ab81 100644 --- a/courgette/ensemble_apply.cc +++ b/courgette/ensemble_apply.cc @@ -7,14 +7,14 @@ #include "courgette/ensemble.h" #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/files/memory_mapped_file.h" #include "base/logging.h" #include "courgette/crc.h" +#include "courgette/patcher_x86_32.h" #include "courgette/region.h" -#include "courgette/streams.h" #include "courgette/simple_delta.h" -#include "courgette/patcher_x86_32.h" +#include "courgette/streams.h" namespace courgette { diff --git a/courgette/memory_allocator.cc b/courgette/memory_allocator.cc index 07daf43..5b92c80 100644 --- a/courgette/memory_allocator.cc +++ b/courgette/memory_allocator.cc @@ -6,7 +6,7 @@ #include <map> -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/strings/stringprintf.h" #if defined(OS_WIN) diff --git a/courgette/third_party/bsdiff.h b/courgette/third_party/bsdiff.h index 77897a8..7c4888c 100644 --- a/courgette/third_party/bsdiff.h +++ b/courgette/third_party/bsdiff.h @@ -38,7 +38,7 @@ #define COURGETTE_BSDIFF_H_ #include "base/basictypes.h" -#include "base/file_util.h" +#include "base/files/file_util.h" namespace courgette { diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index cc4df1c..8f9865a 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -27,8 +27,8 @@ #include "base/debug/alias.h" #include "base/debug/stack_trace.h" #include "base/environment.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/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/device/serial/serial_device_enumerator_mac.cc b/device/serial/serial_device_enumerator_mac.cc index 3222daa..2de2ae5 100644 --- a/device/serial/serial_device_enumerator_mac.cc +++ b/device/serial/serial_device_enumerator_mac.cc @@ -4,9 +4,9 @@ #include "device/serial/serial_device_enumerator_mac.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" diff --git a/extensions/common/manifest_handlers/options_page_info.cc b/extensions/common/manifest_handlers/options_page_info.cc index 2c291e8..0a92b04 100644 --- a/extensions/common/manifest_handlers/options_page_info.cc +++ b/extensions/common/manifest_handlers/options_page_info.cc @@ -4,7 +4,7 @@ #include "extensions/common/manifest_handlers/options_page_info.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "extensions/common/api/extensions_manifest_types.h" diff --git a/gpu/config/gpu_info_collector_linux.cc b/gpu/config/gpu_info_collector_linux.cc index d40aab7..9a21a2d 100644 --- a/gpu/config/gpu_info_collector_linux.cc +++ b/gpu/config/gpu_info_collector_linux.cc @@ -8,7 +8,7 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc index 119b0d2..244fd53 100644 --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc @@ -15,9 +15,9 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/metrics/field_trial.h" diff --git a/gpu/config/gpu_test_expectations_parser.cc b/gpu/config/gpu_test_expectations_parser.cc index ef1e7f4..60baf18 100644 --- a/gpu/config/gpu_test_expectations_parser.cc +++ b/gpu/config/gpu_test_expectations_parser.cc @@ -4,7 +4,7 @@ #include "gpu/config/gpu_test_expectations_parser.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/gpu/gles2_conform_support/gles2_conform_test.cc b/gpu/gles2_conform_support/gles2_conform_test.cc index 9b71446..46a5115 100644 --- a/gpu/gles2_conform_support/gles2_conform_test.cc +++ b/gpu/gles2_conform_support/gles2_conform_test.cc @@ -9,8 +9,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/logging.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc index 6c60382..5108a87 100644 --- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -25,9 +25,9 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/time/time.h" diff --git a/gpu/tools/compositor_model_bench/render_tree.cc b/gpu/tools/compositor_model_bench/render_tree.cc index 52a2150..8712a97 100644 --- a/gpu/tools/compositor_model_bench/render_tree.cc +++ b/gpu/tools/compositor_model_bench/render_tree.cc @@ -7,8 +7,8 @@ #include <sstream> #include <vector> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index ac9de55..7f0a1fe 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -21,8 +21,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 "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index a4b4f8d..f32169e 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_unittest.cc @@ -12,8 +12,8 @@ #include <unistd.h> #include "base/basictypes.h" -#include "base/file_util.h" #include "base/files/file_path.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/ipc/unix_domain_socket_util.cc b/ipc/unix_domain_socket_util.cc index c29ce92..d1ddd83 100644 --- a/ipc/unix_domain_socket_util.cc +++ b/ipc/unix_domain_socket_util.cc @@ -11,8 +11,8 @@ #include <sys/un.h> #include <unistd.h> -#include "base/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" diff --git a/jingle/glue/logging_unittest.cc b/jingle/glue/logging_unittest.cc index 1cbf01a..e43efff 100644 --- a/jingle/glue/logging_unittest.cc +++ b/jingle/glue/logging_unittest.cc @@ -14,7 +14,7 @@ #include "third_party/webrtc/overrides/webrtc/base/logging.h" #include "base/command_line.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) 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" diff --git a/net/test/url_request/url_request_mock_http_job.cc b/net/test/url_request/url_request_mock_http_job.cc index afe8e49..42af81f 100644 --- a/net/test/url_request/url_request_mock_http_job.cc +++ b/net/test/url_request/url_request_mock_http_job.cc @@ -4,7 +4,7 @@ #include "net/test/url_request/url_request_mock_http_job.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/strings/utf_string_conversions.h" diff --git a/net/url_request/test_url_request_interceptor.cc b/net/url_request/test_url_request_interceptor.cc index 2c738f4..69235d6 100644 --- a/net/url_request/test_url_request_interceptor.cc +++ b/net/url_request/test_url_request_interceptor.cc @@ -4,7 +4,7 @@ #include "net/url_request/test_url_request_interceptor.h" -#include "base/file_util.h" +#include "base/files/file_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" #include "net/url_request/url_request.h" |