Use a direct include of the shared_memory header in content/browser/,…

… content/child/, content/common/.

BUG=260807
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/19398004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211977 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/browser_plugin/browser_plugin_guest.h

@@ -26,8 +26,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
-#include "base/shared_memory.h"
 #include "base/values.h"
 #include "content/common/browser_plugin/browser_plugin_message_enums.h"
 #include "content/common/edit_command.h"

content/browser/device_orientation/device_motion_provider.h

@@ -6,7 +6,7 @@
 #define CONTENT_BROWSER_DEVICE_ORIENTATION_DEVICE_MOTION_PROVIDER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "content/common/content_export.h"
 #include "content/common/device_motion_hardware_buffer.h"
 

content/browser/device_orientation/device_motion_service.h

@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/singleton.h"
-#include "base/shared_memory.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 

content/browser/fileapi/fileapi_message_filter.h

@@ -13,8 +13,8 @@
 #include "base/containers/hash_tables.h"
 #include "base/files/file_util_proxy.h"
 #include "base/id_map.h"
+#include "base/memory/shared_memory.h"
 #include "base/platform_file.h"
-#include "base/shared_memory.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"

content/browser/gamepad/gamepad_provider.h

@@ -11,9 +11,9 @@
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
-#include "base/shared_memory.h"
 #include "base/synchronization/lock.h"
 #include "base/system_monitor/system_monitor.h"
 #include "content/common/content_export.h"

content/browser/gamepad/gamepad_service.h

@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/singleton.h"
-#include "base/shared_memory.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
 

content/browser/loader/async_resource_handler.cc

@@ -11,9 +11,9 @@
 #include "base/containers/hash_tables.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
+#include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
-#include "base/shared_memory.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/devtools/devtools_netlog_observer.h"
 #include "content/browser/host_zoom_map_impl.h"

content/browser/loader/resource_buffer.h

@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "content/common/content_export.h"
 
 namespace content {

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -16,10 +16,10 @@
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
-#include "base/shared_memory.h"
 #include "base/stl_util.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "content/browser/appcache/chrome_appcache_service.h"

content/browser/renderer_host/device_motion_browser_message_filter.h

@@ -6,7 +6,7 @@
  #define CONTENT_BROWSER_RENDERER_HOST_DEVICE_MOTION_BROWSER_MESSAGE_FILTER_H_
 
  #include "base/compiler_specific.h"
- #include "base/shared_memory.h"
+ #include "base/memory/shared_memory.h"
  #include "content/public/browser/browser_message_filter.h"
 
  namespace content {

content/browser/renderer_host/gamepad_browser_message_filter.h

@@ -6,7 +6,7 @@
 #define CONTENT_BROWSER_RENDERER_HOST_GAMEPAD_BROWSER_MESSAGE_FILTER_H_
 
 #include "base/compiler_specific.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "content/public/browser/browser_message_filter.h"
 
 namespace content {

content/browser/renderer_host/media/audio_input_renderer_host.cc

@@ -5,9 +5,9 @@
 #include "content/browser/renderer_host/media/audio_input_renderer_host.h"
 
 #include "base/bind.h"
+#include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
-#include "base/shared_memory.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"

content/browser/renderer_host/media/audio_input_renderer_host.h

@@ -31,9 +31,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/process.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "base/shared_memory.h"
 #include "content/common/media/audio_messages.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"

content/browser/renderer_host/media/audio_input_sync_writer.cc

@@ -6,8 +6,8 @@
 
 #include <algorithm>
 
+#include "base/memory/shared_memory.h"
 #include "base/process_util.h"
-#include "base/shared_memory.h"
 
 namespace content {
 

content/browser/renderer_host/media/audio_renderer_host.cc

@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
-#include "base/shared_memory.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"

content/browser/renderer_host/media/audio_renderer_host.h

@@ -42,9 +42,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/process.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "base/shared_memory.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"

content/browser/renderer_host/media/audio_sync_reader.cc

@@ -6,9 +6,9 @@
 
 #include <algorithm>
 
+#include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
-#include "base/shared_memory.h"
 #include "media/audio/audio_buffers_state.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/shared_memory_util.h"

content/browser/renderer_host/media/video_capture_buffer_pool.h

@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
+#include "base/memory/shared_memory.h"
 #include "base/process.h"
-#include "base/shared_memory.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/size.h"

content/browser/renderer_host/media/video_capture_controller_event_handler.h

@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_EVENT_HANDLER_H_
 
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 

content/browser/renderer_host/render_message_filter.h

@@ -15,8 +15,8 @@
 
 #include "base/files/file_path.h"
 #include "base/memory/linked_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "base/shared_memory.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "content/common/pepper_renderer_instance_data.h"

content/browser/renderer_host/render_sandbox_host_linux.cc

@@ -19,12 +19,12 @@
 #include "base/command_line.h"
 #include "base/linux_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/singleton.h"
 #include "base/pickle.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "base/process_util.h"
-#include "base/shared_memory.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "content/child/webkitplatformsupport_impl.h"

content/browser/renderer_host/render_widget_host_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/timer/timer.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/backing_store.h"

content/child/child_thread.h

@@ -7,8 +7,8 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
-#include "base/shared_memory.h"
 #include "base/tracked_objects.h"
 #include "content/common/content_export.h"
 #include "content/common/message_router.h"

content/child/resource_dispatcher.cc

@@ -11,9 +11,9 @@
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/files/file_path.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "base/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "content/child/request_extra_data.h"
 #include "content/common/inter_process_time_ticks_converter.h"

content/child/resource_dispatcher.h

@@ -12,8 +12,8 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/linked_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
-#include "base/shared_memory.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"

content/child/webblobregistry_impl.cc

@@ -6,8 +6,8 @@
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
-#include "base/shared_memory.h"
 #include "content/child/child_thread.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/fileapi/webblob_messages.h"

content/common/browser_plugin/browser_plugin_messages.h

@@ -7,8 +7,8 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/memory/shared_memory.h"
 #include "base/process.h"
-#include "base/shared_memory.h"
 #include "base/values.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"

content/common/child_process_host_impl.h

@@ -12,8 +12,8 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/memory/singleton.h"
-#include "base/shared_memory.h"
 #include "base/strings/string16.h"
 #include "content/public/common/child_process_host.h"
 #include "ipc/ipc_listener.h"

content/common/child_process_messages.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "content/common/content_export.h"

content/common/clipboard_messages.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"

content/common/device_motion_messages.h

@@ -5,10 +5,10 @@
 // IPC messages for device motion.
 // Multiply-included message file, hence no include guard.
 
+#include "base/memory/shared_memory.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_platform_file.h"
-#include "base/shared_memory.h"
 
 #define IPC_MESSAGE_START DeviceMotionMsgStart
 

content/common/gamepad_messages.h

@@ -4,10 +4,10 @@
 
 // Multiply-included message file, no include guard.
 
+#include "base/memory/shared_memory.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_platform_file.h"
-#include "base/shared_memory.h"
 
 #define IPC_MESSAGE_START GamepadMsgStart
 

content/common/gpu/client/command_buffer_proxy_impl.cc

@@ -7,8 +7,8 @@
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
+#include "base/memory/shared_memory.h"
 #include "base/process_util.h"
-#include "base/shared_memory.h"
 #include "base/stl_util.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/gpu/client/gpu_channel_host.h"

content/common/gpu/gpu_command_buffer_stub.cc

@@ -7,7 +7,7 @@
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hash.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_channel.h"

content/common/gpu/gpu_messages.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_memory_allocation.h"
 #include "content/common/gpu/gpu_memory_uma_stats.h"

content/common/gpu/media/dxva_video_decode_accelerator.cc

@@ -21,9 +21,9 @@
 #include "base/logging.h"
 #include "base/memory/scoped_handle.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
-#include "base/shared_memory.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_surface_egl.h"

content/common/gpu/media/exynos_video_decode_accelerator.cc

@@ -13,10 +13,10 @@
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/shared_memory.h"
 #include "content/common/gpu/media/exynos_video_decode_accelerator.h"
 #include "content/common/gpu/media/h264_parser.h"
 #include "ui/gl/scoped_binders.h"

content/common/gpu/media/gpu_video_decode_accelerator.h

@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "base/shared_memory.h"
+#include "base/memory/shared_memory.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"

content/common/gpu/media/omx_video_decode_accelerator.h

@@ -15,8 +15,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/memory/shared_memory.h"
 #include "base/message_loop.h"
-#include "base/shared_memory.h"
 #include "content/common/content_export.h"
 #include "media/video/video_decode_accelerator.h"
 #include "third_party/openmax/il/OMX_Component.h"