Skip to content

Commit

Permalink
Cleanup: Use base/files/file_util.h instead of base/file_util.h in [r…
Browse files Browse the repository at this point in the history 
…-t]*/

TBR=sergeyu@chromium.org,cpu@chromium.org,thakis@chromium.org,jamesr@chromium.org,zea@chromium.org,nduca@chromium.org

Review URL: https://codereview.chromium.org/560883003

Cr-Commit-Position: refs/heads/master@{#294543}
  • Loading branch information
@leizleiz
leizleiz authored and Commit bot committed Sep 12, 2014
1 parent bfc368c commit 1ecdcf4
Show file tree
Hide file tree
Showing 58 changed files with 59 additions and 59 deletions.
2 changes: 1 addition & 1 deletion remoting/host/config_file_watcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/file_util.h"
#include "base/files/file_path_watcher.h"
#include "base/files/file_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/config_file_watcher_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "remoting/host/config_file_watcher.h"

#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "remoting/base/auto_thread.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/daemon_process.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "base/bind.h"
#include "base/bind_helpers.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/location.h"
#include "base/single_thread_task_runner.h"
#include "net/base/net_util.h"
Expand Down
4 changes: 2 additions & 2 deletions remoting/host/desktop_session_agent.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "remoting/host/desktop_session_agent.h"

#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/memory/shared_memory.h"
#include "ipc/ipc_channel_proxy.h"
Expand All @@ -25,8 +25,8 @@
#include "remoting/proto/event.pb.h"
#include "remoting/protocol/clipboard_stub.h"
#include "remoting/protocol/input_event_tracker.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
#include "third_party/webrtc/modules/desktop_capture/mouse_cursor.h"
#include "third_party/webrtc/modules/desktop_capture/shared_memory.h"

Expand Down
2 changes: 1 addition & 1 deletion remoting/host/gnubby_auth_handler_posix.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <utility>

#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/json_host_config.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "remoting/host/json_host_config.h"

#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/files/important_file_writer.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/json_host_config_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/pairing_registry_delegate_linux.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "remoting/host/pairing_registry_delegate_linux.h"

#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/files/important_file_writer.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_string_value_serializer.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/pairing_registry_delegate_linux_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "remoting/host/pairing_registry_delegate_linux.h"

#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/timer/timer.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/policy_hack/policy_watcher_linux.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
#include "base/files/file_util.h"
#include "base/json/json_file_value_serializer.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/remoting_me2me_host.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/debug/alias.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/single_thread_task_runner.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/setup/daemon_controller_delegate_linux.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/environment.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/md5.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/setup/daemon_controller_delegate_mac.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include "base/basictypes.h"
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/host/win/elevated_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "remoting/host/win/elevated_controller.h"

#include "base/file_util.h"
#include "base/file_version_info.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/protocol/authenticator_test_base.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "remoting/protocol/authenticator_test_base.h"

#include "base/base64.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/test/test_timeouts.h"
#include "base/timer/timer.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "base/base64.h"
#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/test/test_timeouts.h"
Expand Down
2 changes: 1 addition & 1 deletion remoting/test/protocol_perftest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// found in the LICENSE file.

#include "base/base64.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
#include "base/rand_util.h"
#include "base/run_loop.h"
Expand Down
2 changes: 1 addition & 1 deletion rlz/chromeos/lib/rlz_value_store_chromeos.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "rlz/chromeos/lib/rlz_value_store_chromeos.h"

#include "base/base_paths.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/files/important_file_writer.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_string_value_serializer.h"
Expand Down
2 changes: 1 addition & 1 deletion sandbox/linux/services/broker_process_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "base/basictypes.h"
#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
Expand Down
2 changes: 1 addition & 1 deletion sandbox/linux/services/credentials_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <sys/types.h>
#include <unistd.h>

#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
Expand Down
2 changes: 1 addition & 1 deletion sandbox/linux/services/scoped_process_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
Expand Down
2 changes: 1 addition & 1 deletion sandbox/linux/services/yama.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <unistd.h>

#include "base/basictypes.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
Expand Down
2 changes: 1 addition & 1 deletion sandbox/linux/suid/client/setuid_sandbox_client.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "base/command_line.h"
#include "base/environment.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/macros.h"
Expand Down
2 changes: 1 addition & 1 deletion sandbox/linux/tests/unit_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <unistd.h>

#include "base/debug/leak_annotations.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/posix/eintr_wrapper.h"
#include "base/third_party/valgrind/valgrind.h"
#include "build/build_config.h"
Expand Down
2 changes: 1 addition & 1 deletion sandbox/win/src/handle_inheritance_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <stdio.h>

#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/win/windows_version.h"
#include "sandbox/win/tests/common/controller.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion skia/ext/image_operations_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/strings/string_util.h"
#include "skia/ext/image_operations.h"
#include "testing/gtest/include/gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion skia/ext/recursive_gaussian_convolution_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <vector>

#include "base/basictypes.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/time/time.h"
#include "skia/ext/convolver.h"
Expand Down
2 changes: 1 addition & 1 deletion skia/ext/vector_canvas_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#endif

#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
Expand Down
2 changes: 1 addition & 1 deletion skia/tools/filter_fuzz_stub/filter_fuzz_stub.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "base/logging.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkFlattenableSerialization.h"
Expand Down
2 changes: 1 addition & 1 deletion storage/browser/fileapi/quota/open_file_handle_context.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "storage/browser/fileapi/quota/open_file_handle_context.h"

#include "base/file_util.h"
#include "base/files/file_util.h"
#include "storage/browser/fileapi/quota/quota_reservation_buffer.h"

namespace storage {
Expand Down
2 changes: 1 addition & 1 deletion storage/common/blob/scoped_file.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "base/bind.h"
#include "base/callback.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/location.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner.h"
Expand Down
2 changes: 1 addition & 1 deletion sync/syncable/directory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "base/basictypes.h"
#include "base/containers/hash_tables.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/gtest_prod_util.h"
#include "base/values.h"
#include "sync/base/sync_export.h"
Expand Down
2 changes: 1 addition & 1 deletion sync/syncable/directory_backing_store_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <string>

#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
Expand Down
2 changes: 1 addition & 1 deletion sync/syncable/syncable_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/location.h"
#include "base/logging.h"
Expand Down
2 changes: 1 addition & 1 deletion sync/test/engine/test_directory_setter_upper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "sync/test/engine/test_directory_setter_upper.h"

#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/location.h"
#include "base/strings/string_util.h"
#include "sync/syncable/directory.h"
Expand Down
2 changes: 1 addition & 1 deletion testing/android/native_test_launcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include "base/at_exit.h"
#include "base/base_switches.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/stringprintf.h"
#include "gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion testing/android/native_test_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "testing/android/native_test_util.h"

#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"

Expand Down
2 changes: 1 addition & 1 deletion tools/android/forwarder2/daemon.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <string>

#include "base/basictypes.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/posix/eintr_wrapper.h"
Expand Down
2 changes: 1 addition & 1 deletion tools/android/forwarder2/host_forwarder_main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_vector.h"
Expand Down
2 changes: 1 addition & 1 deletion tools/android/md5sum/md5sum.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#include <set>
#include <string>

#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/md5.h"

Expand Down
Loading

0 comments on commit 1ecdcf4

Please sign in to comment.