Skip to content

Commit

Permalink
Cleanup: Use base/files/file_util.h instead of base/file_util.h in cc…
Browse files Browse the repository at this point in the history 
…/, chromecast/, cloud_print/, mojo/, and win8/

TBR=enne@chromium.org,lcwu@chromium.org,vitalybuka@chromium.org,viettrunglluu@chromium.org,cpu@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#294139}
  • Loading branch information
@leizleiz
leizleiz authored and Commit bot committed Sep 10, 2014
1 parent 761b2a4 commit 90a0908
Show file tree
Hide file tree
Showing 41 changed files with 50 additions and 48 deletions.
2 changes: 1 addition & 1 deletion cc/test/paths.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "cc/test/paths.h"

#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/path_service.h"

namespace cc {
Expand Down
2 changes: 1 addition & 1 deletion cc/test/pixel_test.h
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 "cc/output/gl_renderer.h"
#include "cc/output/software_renderer.h"
#include "cc/quads/render_pass.h"
Expand Down
2 changes: 1 addition & 1 deletion cc/test/pixel_test_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <vector>

#include "base/base64.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/codec/png_codec.h"
Expand Down
2 changes: 1 addition & 1 deletion cc/trees/layer_tree_host_common_perftest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <sstream>

#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/path_service.h"
#include "base/strings/string_piece.h"
Expand Down
2 changes: 1 addition & 1 deletion cc/trees/layer_tree_host_perftest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <sstream>

#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/strings/string_piece.h"
#include "base/time/time.h"
Expand Down
2 changes: 1 addition & 1 deletion chromecast/common/cast_paths.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "chromecast/common/cast_paths.h"

#include "base/base_paths.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "build/build_config.h"

Expand Down
2 changes: 1 addition & 1 deletion chromecast/common/chromecast_config.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <string>

#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/prefs/json_pref_store.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/common/win/install_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include <windows.h>

#include "base/command_line.h"
#include "base/file_util.h"
#include "base/file_version_info_win.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/process/launch.h"
#include "base/win/registry.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/gcp20/prototype/print_job_handler.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/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/format_macros.h"
#include "base/guid.h"
#include "base/logging.h"
Expand Down
4 changes: 2 additions & 2 deletions cloud_print/gcp20/prototype/printer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

#include "cloud_print/gcp20/prototype/printer.h"

#include <algorithm>
#include <limits.h>
#include <stdio.h>
#include <algorithm>
#include <string>
#include <vector>

#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/format_macros.h"
#include "base/guid.h"
#include "base/json/json_reader.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/gcp20/prototype/printer_state.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "cloud_print/gcp20/prototype/printer_state.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/logging.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/service/win/chrome_launcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/service/win/cloud_print_service.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/guid.h"
#include "base/logging.h"
#include "base/path_service.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/service/win/cloud_print_service_config.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_pump_dispatcher.h"
#include "base/run_loop.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/service/win/installer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/win/scoped_com_initializer.h"
#include "base/win/shortcut.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/service/win/service_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <atlctl.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/path_service.h"
#include "base/win/scoped_handle.h"
#include "chrome/common/chrome_switches.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/service/win/service_listener.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "cloud_print/service/win/service_listener.h"

#include "base/bind.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/threading/thread.h"
#include "base/values.h"
Expand Down
8 changes: 4 additions & 4 deletions cloud_print/virtual_driver/win/install/setup.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include <iomanip>
#include <windows.h>
#include <winspool.h>
#include <setupapi.h> // Must be included after windows.h
#include <winspool.h>
#include <iomanip>

#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/file_version_info_win.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/process/process.h"
#include "base/process/launch.h"
#include "base/process/process.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/win/registry.h"
Expand Down
6 changes: 3 additions & 3 deletions cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@

#include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h"

#include <windows.h>
#include <lmcons.h>
#include <shellapi.h>
#include <shlobj.h>
#include <strsafe.h>
#include <userenv.h>
#include <windows.h>
#include <winspool.h>

#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/process/process.h"
#include "base/process/launch.h"
#include "base/process/process.h"
#include "base/strings/string16.h"
#include "base/win/registry.h"
#include "base/win/scoped_handle.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/virtual_driver/win/port_monitor/port_monitor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <windows.h>
#include <string>
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/process/process.h"
#include "base/strings/string16.h"

Expand Down
4 changes: 2 additions & 2 deletions cloud_print/virtual_driver/win/port_monitor/port_monitor_dll.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

#include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h"

#include <windows.h>
#include <lmcons.h>
#include <shellapi.h>
#include <shlobj.h>
#include <strsafe.h>
#include <userenv.h>
#include <windows.h>
#include <winspool.h>

#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/process/process.h"
Expand Down
4 changes: 3 additions & 1 deletion cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
// found in the LICENSE file.

#include "cloud_print/virtual_driver/win/port_monitor/port_monitor.h"

#include <winspool.h>
#include "base/file_util.h"

#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/strings/string16.h"
#include "base/win/registry.h"
Expand Down
2 changes: 1 addition & 1 deletion cloud_print/virtual_driver/win/virtual_driver_helpers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <windows.h>
#include <winspool.h>

#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/strings/string16.h"
#include "base/win/windows_version.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/apps/js/test/js_to_cpp_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// found in the LICENSE file.

#include "base/at_exit.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 "base/strings/utf_string_conversions.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/common/data_pipe_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <stdio.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/message_loop/message_loop.h"
#include "base/task_runner_util.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/common/test/test_support_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include <stdlib.h>
#include <string.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/path_service.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/embedder/platform_channel_pair_posix_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

#include <deque>

#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/files/scoped_temp_dir.h"
#include "base/logging.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/embedder/simple_platform_shared_buffer_posix.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

#include <limits>

#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 mojo/shell/dynamic_application_loader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "base/bind.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/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/shell/out_of_process_dynamic_service_runner.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_helpers.h"
#include "base/file_util.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/scoped_native_library.h"

Expand Down
2 changes: 1 addition & 1 deletion mojo/shell/shell_test_base.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "mojo/shell/shell_test_base.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/path_service.h"
#include "build/build_config.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/shell/shell_test_helper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "mojo/shell/shell_test_helper.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/path_service.h"
#include "mojo/shell/init.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/system/multiprocess_message_pipe_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <vector>

#include "base/bind.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/files/scoped_temp_dir.h"
#include "base/location.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/system/platform_handle_dispatcher_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <stdio.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/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
Expand Down
2 changes: 1 addition & 1 deletion mojo/system/remote_message_pipe_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <vector>

#include "base/bind.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/files/scoped_temp_dir.h"
#include "base/location.h"
Expand Down
Loading

0 comments on commit 90a0908

Please sign in to comment.