diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 14:39:57 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 14:39:57 +0000 |
commit | 71ed8e02feb09bc17a3089d0796272680e0456ca (patch) | |
tree | 494da6d27b80a45b30265c471da88f81ed28dd5f | |
parent | 9969f6fe432fabc4829b2478eee70f2aa8231235 (diff) | |
download | chromium_src-71ed8e02feb09bc17a3089d0796272680e0456ca.zip chromium_src-71ed8e02feb09bc17a3089d0796272680e0456ca.tar.gz chromium_src-71ed8e02feb09bc17a3089d0796272680e0456ca.tar.bz2 |
Update include paths in content/common for base/process changes.
BUG=242290
R=avi@chromium.org, jschuh@chromium.org
Review URL: https://codereview.chromium.org/19475007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213630 0039d316-1c4b-4281-b951-d872f2087c98
20 files changed, 16 insertions, 20 deletions
diff --git a/content/common/android/surface_texture_peer.h b/content/common/android/surface_texture_peer.h index 0e1fbcc..9be032d 100644 --- a/content/common/android/surface_texture_peer.h +++ b/content/common/android/surface_texture_peer.h @@ -5,7 +5,7 @@ #ifndef CONTENT_COMMON_ANDROID_SURFACE_TEXTURE_PEER_H_ #define CONTENT_COMMON_ANDROID_SURFACE_TEXTURE_PEER_H_ -#include "base/process.h" +#include "base/process/process.h" #include "ui/gl/android/surface_texture_bridge.h" namespace content { diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h index a91f92f..6d3556a 100644 --- a/content/common/browser_plugin/browser_plugin_messages.h +++ b/content/common/browser_plugin/browser_plugin_messages.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/shared_memory.h" -#include "base/process.h" +#include "base/process/process.h" #include "base/values.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_ack.h" diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc index 2dfab2f..8b022e5 100644 --- a/content/common/child_process_host_impl.cc +++ b/content/common/child_process_host_impl.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/process_util.h" +#include "base/process/process_metrics.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc index c220e2a..1056939 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.cc +++ b/content/common/gpu/client/command_buffer_proxy_impl.cc @@ -8,7 +8,6 @@ #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/shared_memory.h" -#include "base/process_util.h" #include "base/stl_util.h" #include "content/common/child_process_messages.h" #include "content/common/gpu/client/gpu_channel_host.h" diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h index c06989d..6decd17 100644 --- a/content/common/gpu/client/gpu_channel_host.h +++ b/content/common/gpu/client/gpu_channel_host.h @@ -13,8 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/process.h" -#include "base/process_util.h" +#include "base/process/process.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" #include "content/common/gpu/gpu_process_launch_causes.h" diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index d00b670..5fe111e 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -15,7 +15,6 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/process_util.h" #include "base/rand_util.h" #include "base/strings/string_util.h" #include "base/timer/timer.h" diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index 854a859..8d775f0 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/process.h" +#include "base/process/process.h" #include "build/build_config.h" #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/gpu_memory_manager.h" diff --git a/content/common/gpu/gpu_memory_manager.cc b/content/common/gpu/gpu_memory_manager.cc index ee2b2b6..21d5163 100644 --- a/content/common/gpu/gpu_memory_manager.cc +++ b/content/common/gpu/gpu_memory_manager.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/message_loop/message_loop.h" -#include "base/process_util.h" +#include "base/process/process_handle.h" #include "base/strings/string_number_conversions.h" #include "content/common/gpu/gpu_channel_manager.h" #include "content/common/gpu/gpu_memory_allocation.h" diff --git a/content/common/gpu/gpu_memory_tracking.h b/content/common/gpu/gpu_memory_tracking.h index b27b605..bd0b400 100644 --- a/content/common/gpu/gpu_memory_tracking.h +++ b/content/common/gpu/gpu_memory_tracking.h @@ -6,7 +6,7 @@ #define CONTENT_COMMON_GPU_GPU_MEMORY_TRACKING_H_ #include "base/basictypes.h" -#include "base/process.h" +#include "base/process/process.h" #include "content/common/content_export.h" #include "gpu/command_buffer/service/memory_tracking.h" diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc index 138dca1..f999070 100644 --- a/content/common/gpu/media/dxva_video_decode_accelerator.cc +++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc @@ -23,7 +23,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" -#include "base/process_util.h" #include "media/video/video_decode_accelerator.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_surface_egl.h" diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index ec1ab8b..e9b2608 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -32,7 +32,6 @@ #include "base/format_macros.h" #include "base/md5.h" #include "base/platform_file.h" -#include "base/process_util.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/content/common/handle_enumerator_win.cc b/content/common/handle_enumerator_win.cc index 90401ed..98e232e 100644 --- a/content/common/handle_enumerator_win.cc +++ b/content/common/handle_enumerator_win.cc @@ -9,8 +9,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/process.h" -#include "base/process_util.h" +#include "base/process/process.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "content/public/common/content_switches.h" diff --git a/content/common/handle_enumerator_win.h b/content/common/handle_enumerator_win.h index 4a749e1..5fd4981 100644 --- a/content/common/handle_enumerator_win.h +++ b/content/common/handle_enumerator_win.h @@ -6,7 +6,7 @@ #define CONTENT_COMMON_HANDLE_ENUMERATOR_WIN_H_ #include "base/memory/ref_counted.h" -#include "base/process.h" +#include "base/process/process.h" #include "base/strings/string16.h" namespace content { diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h index f982e11..0cf7bc8 100644 --- a/content/common/resource_messages.h +++ b/content/common/resource_messages.h @@ -8,7 +8,7 @@ // Multiply-included message file, hence no include guard. #include "base/memory/shared_memory.h" -#include "base/process.h" +#include "base/process/process.h" #include "content/common/content_param_traits_macros.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/resource_response.h" diff --git a/content/common/sandbox_mac_diraccess_unittest.mm b/content/common/sandbox_mac_diraccess_unittest.mm index ad86e58..c8611df 100644 --- a/content/common/sandbox_mac_diraccess_unittest.mm +++ b/content/common/sandbox_mac_diraccess_unittest.mm @@ -11,6 +11,7 @@ extern "C" { #include "base/file_util.h" #include "base/files/file_path.h" +#include "base/process/kill.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/test/multiprocess_test.h" diff --git a/content/common/sandbox_mac_unittest_helper.mm b/content/common/sandbox_mac_unittest_helper.mm index 4c64b55..0a8d3c1 100644 --- a/content/common/sandbox_mac_unittest_helper.mm +++ b/content/common/sandbox_mac_unittest_helper.mm @@ -13,6 +13,7 @@ extern "C" { #include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/process/kill.h" #include "content/common/sandbox_mac.h" #include "content/test/test_content_client.h" #include "testing/multiprocess_func_list.h" diff --git a/content/common/sandbox_util.h b/content/common/sandbox_util.h index c6d2fce..54814df 100644 --- a/content/common/sandbox_util.h +++ b/content/common/sandbox_util.h @@ -5,7 +5,7 @@ #ifndef CONTENT_COMMON_SANDBOX_UTIL_H_ #define CONTENT_COMMON_SANDBOX_UTIL_H_ -#include "base/process.h" +#include "base/process/process.h" #include "ipc/ipc_platform_file.h" // This file contains cross-platform sandbox code internal to content. diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc index acd3f9a..83f3f72 100644 --- a/content/common/sandbox_win.cc +++ b/content/common/sandbox_win.cc @@ -14,7 +14,7 @@ #include "base/file_util.h" #include "base/hash.h" #include "base/path_service.h" -#include "base/process_util.h" +#include "base/process/launch.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/win/iat_patch_function.h" diff --git a/content/common/set_process_title.cc b/content/common/set_process_title.cc index 7d7b057..6fde51b 100644 --- a/content/common/set_process_title.cc +++ b/content/common/set_process_title.cc @@ -21,7 +21,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" -#include "base/process_util.h" +#include "base/process/process_metrics.h" #include "base/strings/string_util.h" // Linux/glibc doesn't natively have setproctitle(). #include "content/common/set_process_title_linux.h" diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 0aff165..e977349 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -6,7 +6,7 @@ // Multiply-included message file, hence no include guard. #include "base/memory/shared_memory.h" -#include "base/process.h" +#include "base/process/process.h" #include "base/strings/string16.h" #include "cc/output/begin_frame_args.h" #include "cc/output/compositor_frame.h" |