0

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}
This commit is contained in:
thestig
2014-09-12 18:02:11 -07:00
committed by Commit bot
parent ce3cbf9560
commit c9e38a2735
38 changed files with 41 additions and 40 deletions

@@ -931,6 +931,7 @@ def _CheckSpamLogging(input_api, output_api):
r"^cloud_print[\\\/]", r"^cloud_print[\\\/]",
r"^content[\\\/]common[\\\/]gpu[\\\/]client[\\\/]" r"^content[\\\/]common[\\\/]gpu[\\\/]client[\\\/]"
r"gl_helper_benchmark\.cc$", r"gl_helper_benchmark\.cc$",
r"^courgette[\\\/]courgette_tool\.cc$",
r"^extensions[\\\/]renderer[\\\/]logging_native_handler\.cc$", r"^extensions[\\\/]renderer[\\\/]logging_native_handler\.cc$",
r"^native_client_sdk[\\\/]", r"^native_client_sdk[\\\/]",
r"^remoting[\\\/]base[\\\/]logging\.h$", r"^remoting[\\\/]base[\\\/]logging\.h$",

@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h" #include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h" #include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/json/json_file_value_serializer.h" #include "base/json/json_file_value_serializer.h"
#include "base/location.h" #include "base/location.h"
#include "base/logging.h" #include "base/logging.h"

@@ -6,7 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BACKEND_DELEGATE_H_ #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_FILEAPI_BACKEND_DELEGATE_H_
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h" #include "chrome/browser/chromeos/fileapi/file_system_backend_delegate.h"

@@ -4,9 +4,9 @@
// //
// MediaGalleries gallery watch API browser tests. // MediaGalleries gallery watch API browser tests.
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_path_watcher.h" #include "base/files/file_path_watcher.h"
#include "base/files/file_util.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"

@@ -4,7 +4,7 @@
#include <string> #include <string>
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"

@@ -8,8 +8,8 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"

@@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "base/bind.h" #include "base/bind.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h" #include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h" #include "base/memory/scoped_vector.h"

@@ -4,7 +4,7 @@
#include "courgette/base_test_unittest.h" #include "courgette/base_test_unittest.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/path_service.h" #include "base/path_service.h"
void BaseTest::SetUp() { void BaseTest::SetUp() {

@@ -8,8 +8,8 @@
#include "base/at_exit.h" #include "base/at_exit.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"

@@ -7,14 +7,14 @@
#include "courgette/ensemble.h" #include "courgette/ensemble.h"
#include "base/basictypes.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/files/memory_mapped_file.h"
#include "base/logging.h" #include "base/logging.h"
#include "courgette/crc.h" #include "courgette/crc.h"
#include "courgette/region.h"
#include "courgette/streams.h"
#include "courgette/simple_delta.h"
#include "courgette/patcher_x86_32.h" #include "courgette/patcher_x86_32.h"
#include "courgette/region.h"
#include "courgette/simple_delta.h"
#include "courgette/streams.h"
namespace courgette { namespace courgette {

@@ -6,7 +6,7 @@
#include <map> #include <map>
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#if defined(OS_WIN) #if defined(OS_WIN)

@@ -38,7 +38,7 @@
#define COURGETTE_BSDIFF_H_ #define COURGETTE_BSDIFF_H_
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/file_util.h" #include "base/files/file_util.h"
namespace courgette { namespace courgette {

@@ -27,8 +27,8 @@
#include "base/debug/alias.h" #include "base/debug/alias.h"
#include "base/debug/stack_trace.h" #include "base/debug/stack_trace.h"
#include "base/environment.h" #include "base/environment.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/lazy_instance.h" #include "base/lazy_instance.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"

@@ -4,9 +4,9 @@
#include "device/serial/serial_device_enumerator_mac.h" #include "device/serial/serial_device_enumerator_mac.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h" #include "base/files/file_enumerator.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"

@@ -4,7 +4,7 @@
#include "extensions/common/manifest_handlers/options_page_info.h" #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/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "extensions/common/api/extensions_manifest_types.h" #include "extensions/common/api/extensions_manifest_types.h"

@@ -8,7 +8,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"

@@ -15,9 +15,9 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h" #include "base/files/file_enumerator.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h" #include "base/metrics/field_trial.h"

@@ -4,7 +4,7 @@
#include "gpu/config/gpu_test_expectations_parser.h" #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/logging.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"

@@ -9,8 +9,8 @@
#include "base/at_exit.h" #include "base/at_exit.h"
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h" #include "base/mac/scoped_nsautorelease_pool.h"

@@ -25,9 +25,9 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h" #include "base/files/file_enumerator.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/time/time.h" #include "base/time/time.h"

@@ -7,8 +7,8 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h" #include "base/json/json_reader.h"
#include "base/json/json_writer.h" #include "base/json/json_writer.h"
#include "base/logging.h" #include "base/logging.h"

@@ -21,8 +21,8 @@
#include <string> #include <string>
#include "base/command_line.h" #include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/location.h" #include "base/location.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"

@@ -12,8 +12,8 @@
#include <unistd.h> #include <unistd.h>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/path_service.h" #include "base/path_service.h"

@@ -11,8 +11,8 @@
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h" #include "base/files/scoped_file.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/posix/eintr_wrapper.h" #include "base/posix/eintr_wrapper.h"

@@ -14,7 +14,7 @@
#include "third_party/webrtc/overrides/webrtc/base/logging.h" #include "third_party/webrtc/overrides/webrtc/base/logging.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_WIN) #if defined(OS_WIN)

@@ -4,7 +4,7 @@
#include "base/android/build_info.h" #include "base/android/build_info.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/path_service.h" #include "base/path_service.h"

@@ -4,7 +4,7 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/environment.h" #include "base/environment.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/synchronization/lock.h" #include "base/synchronization/lock.h"

@@ -7,7 +7,7 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/environment.h" #include "base/environment.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/path_service.h" #include "base/path_service.h"

@@ -7,7 +7,7 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/environment.h" #include "base/environment.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/path_service.h" #include "base/path_service.h"

@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/container_names.h"
#include "media/base/test_data_util.h" #include "media/base/test_data_util.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"

@@ -4,7 +4,7 @@
#include "media/base/test_data_util.h" #include "media/base/test_data_util.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/numerics/safe_conversions.h" #include "base/numerics/safe_conversions.h"
#include "base/path_service.h" #include "base/path_service.h"

@@ -4,7 +4,7 @@
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/cpu.h" #include "base/cpu.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/time/time.h" #include "base/time/time.h"

@@ -4,7 +4,7 @@
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/cpu.h" #include "base/cpu.h"
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "media/base/djb2.h" #include "media/base/djb2.h"

@@ -19,8 +19,8 @@
#include "base/at_exit.h" #include "base/at_exit.h"
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/memory_mapped_file.h" #include "base/files/memory_mapped_file.h"
#include "base/files/scoped_file.h" #include "base/files/scoped_file.h"
#include "base/json/json_writer.h" #include "base/json/json_writer.h"

@@ -12,8 +12,8 @@
#include <queue> #include <queue>
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/file_util.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/memory_mapped_file.h" #include "base/files/memory_mapped_file.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/path_service.h" #include "base/path_service.h"

@@ -12,7 +12,7 @@
#include <string> #include <string>
#include "base/file_util.h" #include "base/files/file_util.h"
#include "base/files/scoped_file.h" #include "base/files/scoped_file.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "media/video/capture/video_capture_device.h" #include "media/video/capture/video_capture_device.h"

@@ -4,7 +4,7 @@
#include "net/test/url_request/url_request_mock_http_job.h" #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/message_loop/message_loop.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"

@@ -4,7 +4,7 @@
#include "net/url_request/test_url_request_interceptor.h" #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/sequenced_worker_pool.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"