diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 19:13:56 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 19:13:56 +0000 |
| commit | 8bac37b5e8327ec15ba6970de0d8550eecfd31c7 (patch) | |
| tree | da3be41b0f3fbb585f5836247b263b113f12a47c | |
| parent | 4b9c9e299e0249e0a227a9c7031e0f7e9a290125 (diff) | |
| download | chromium_src-8bac37b5e8327ec15ba6970de0d8550eecfd31c7.zip chromium_src-8bac37b5e8327ec15ba6970de0d8550eecfd31c7.tar.gz chromium_src-8bac37b5e8327ec15ba6970de0d8550eecfd31c7.tar.bz2 | |
Use a direct include of the shared_memory header in content/plugin/, content/public/, content/renderer/, gpu/.
BUG=260807
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19379005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212391 0039d316-1c4b-4281-b951-d872f2087c98
24 files changed, 28 insertions, 28 deletions
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index b8926a8..49e2895 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/memory/scoped_handle.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "build/build_config.h" #include "content/child/npobject_proxy.h" #include "content/child/npobject_util.h" diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index 5b53eaa..8cddfed 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -14,8 +14,8 @@ #endif #include "base/memory/scoped_handle.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/timer/timer.h" #include "ipc/ipc_message.h" #include "skia/ext/refptr.h" diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h index c3437b9..87e0648 100644 --- a/content/public/renderer/render_thread.h +++ b/content/public/renderer/render_thread.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "content/common/content_export.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sender.h" diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h index a404c64..022dbb9 100644 --- a/content/public/test/mock_render_thread.h +++ b/content/public/test/mock_render_thread.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_ #define CONTENT_PUBLIC_TEST_MOCK_RENDER_THREAD_H_ -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/string16.h" #include "content/public/renderer/render_thread.h" #include "ipc/ipc_test_sink.h" diff --git a/content/public/test/render_view_fake_resources_test.cc b/content/public/test/render_view_fake_resources_test.cc index 8e9e6b2..20e96f5f5 100644 --- a/content/public/test/render_view_fake_resources_test.cc +++ b/content/public/test/render_view_fake_resources_test.cc @@ -7,9 +7,9 @@ #include <string.h> #include "base/command_line.h" +#include "base/memory/shared_memory.h" #include "base/process.h" #include "base/run_loop.h" -#include "base/shared_memory.h" #include "base/time/time.h" #include "content/common/resource_messages.h" #include "content/common/view_messages.h" diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 1457a53..6705acc 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -12,7 +12,7 @@ #include "base/process_util.h" #include "base/sequenced_task_runner_helpers.h" #if defined(OS_WIN) -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #endif #include "base/values.h" #include "content/common/browser_plugin/browser_plugin_message_enums.h" diff --git a/content/renderer/device_orientation/device_motion_event_pump.cc b/content/renderer/device_orientation/device_motion_event_pump.cc index 94ecb5f..0cfd774 100644 --- a/content/renderer/device_orientation/device_motion_event_pump.cc +++ b/content/renderer/device_orientation/device_motion_event_pump.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" -#include "base/shared_memory.h" #include "content/common/device_motion_messages.h" #include "content/public/renderer/render_thread.h" #include "third_party/WebKit/public/platform/WebDeviceMotionListener.h" diff --git a/content/renderer/device_orientation/device_motion_event_pump.h b/content/renderer/device_orientation/device_motion_event_pump.h index 4ced805..f2c3474 100644 --- a/content/renderer/device_orientation/device_motion_event_pump.h +++ b/content/renderer/device_orientation/device_motion_event_pump.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_DEVICE_MOTION_EVENT_PUMP_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/public/renderer/render_process_observer.h" #include "content/renderer/shared_memory_seqlock_reader.h" diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index 0a0e815..8c10b90 100644 --- a/content/renderer/gamepad_shared_memory_reader.h +++ b/content/renderer/gamepad_shared_memory_reader.h @@ -5,8 +5,8 @@ #ifndef CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_ #define CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_ -#include "base/shared_memory.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "third_party/WebKit/public/platform/WebGamepads.h" namespace content { diff --git a/content/renderer/media/android/audio_decoder_android.cc b/content/renderer/media/android/audio_decoder_android.cc index 9a8b0ae..1fbdf5f 100644 --- a/content/renderer/media/android/audio_decoder_android.cc +++ b/content/renderer/media/android/audio_decoder_android.cc @@ -13,8 +13,8 @@ #include "base/file_descriptor_posix.h" #include "base/logging.h" +#include "base/memory/shared_memory.h" #include "base/posix/eintr_wrapper.h" -#include "base/shared_memory.h" #include "content/common/view_messages.h" #include "media/base/android/webaudio_media_codec_info.h" #include "media/base/audio_bus.h" diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h index fcba0a7..023d090 100644 --- a/content/renderer/media/audio_input_message_filter.h +++ b/content/renderer/media/audio_input_message_filter.h @@ -7,7 +7,7 @@ #include "base/id_map.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "content/common/content_export.h" #include "ipc/ipc_channel_proxy.h" diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h index 38deb80..9a1597a 100644 --- a/content/renderer/media/audio_message_filter.h +++ b/content/renderer/media/audio_message_filter.h @@ -8,7 +8,7 @@ #include "base/gtest_prod_util.h" #include "base/id_map.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h index 9eee266..ede6ab6 100644 --- a/content/renderer/media/video_capture_message_filter.h +++ b/content/renderer/media/video_capture_message_filter.h @@ -12,8 +12,8 @@ #include <map> +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/shared_memory.h" #include "content/common/content_export.h" #include "content/common/media/video_capture.h" #include "ipc/ipc_channel_proxy.h" diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc index f83114e..5b4c194 100644 --- a/content/renderer/media/video_capture_message_filter_unittest.cc +++ b/content/renderer/media/video_capture_message_filter_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" -#include "base/shared_memory.h" #include "content/common/media/video_capture_messages.h" #include "content/renderer/media/video_capture_message_filter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/renderer/pepper/pepper_audio_input_host.h b/content/renderer/pepper/pepper_audio_input_host.h index 990c11c..c0b656c 100644 --- a/content/renderer/pepper/pepper_audio_input_host.h +++ b/content/renderer/pepper/pepper_audio_input_host.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/sync_socket.h" #include "content/renderer/pepper/pepper_device_enumeration_host_helper.h" #include "ipc/ipc_platform_file.h" diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 1d86366..0a2e1d0 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -15,11 +15,11 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/discardable_memory.h" +#include "base/memory/shared_memory.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_table.h" #include "base/path_service.h" -#include "base/shared_memory.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" // Temporary #include "base/strings/utf_string_conversions.h" diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 2be61c3..6528992 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/common/view_messages.h" @@ -22,13 +22,13 @@ #include "content/test/mock_keyboard.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/public/web/WebHistoryItem.h" -#include "third_party/WebKit/public/web/WebView.h" -#include "third_party/WebKit/public/web/WebWindowFeatures.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebHTTPBody.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/WebKit/public/web/WebWindowFeatures.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/range/range.h" #include "ui/gfx/codec/jpeg_codec.h" diff --git a/content/renderer/renderer_clipboard_client.cc b/content/renderer/renderer_clipboard_client.cc index c844fbe..9df9508 100644 --- a/content/renderer/renderer_clipboard_client.cc +++ b/content/renderer/renderer_clipboard_client.cc @@ -6,7 +6,7 @@ #include "content/renderer/renderer_clipboard_client.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/string16.h" #include "content/common/clipboard_messages.h" #include "content/public/renderer/content_renderer_client.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index c4d12b3..a147108 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/lazy_instance.h" +#include "base/memory/shared_memory.h" #include "base/message_loop/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" -#include "base/shared_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/child/database_util.h" diff --git a/content/renderer/shared_memory_seqlock_reader.h b/content/renderer/shared_memory_seqlock_reader.h index d355d9f..1d0e60e 100644 --- a/content/renderer/shared_memory_seqlock_reader.h +++ b/content/renderer/shared_memory_seqlock_reader.h @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "content/common/shared_memory_seqlock_buffer.h" namespace internal { diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h index af3cb0c..232bdc0 100644 --- a/gpu/command_buffer/service/command_buffer_service.h +++ b/gpu/command_buffer/service/command_buffer_service.h @@ -6,7 +6,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_ #include "base/callback.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/command_buffer_shared.h" diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h index bc8510a..8fb791c 100644 --- a/gpu/command_buffer/service/gpu_scheduler.h +++ b/gpu/command_buffer/service/gpu_scheduler.h @@ -7,14 +7,14 @@ #include <queue> -#include "base/atomicops.h" #include "base/atomic_ref_count.h" +#include "base/atomicops.h" #include "base/callback.h" #include "base/memory/linked_ptr.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/shared_memory.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/service/cmd_buffer_engine.h" #include "gpu/command_buffer/service/cmd_parser.h" diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc index add23b6..4af0349 100644 --- a/gpu/command_buffer/service/query_manager.cc +++ b/gpu/command_buffer/service/query_manager.cc @@ -7,7 +7,7 @@ #include "base/atomicops.h" #include "base/bind.h" #include "base/logging.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/synchronization/lock.h" #include "base/time/time.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" diff --git a/gpu/command_buffer/service/transfer_buffer_manager.h b/gpu/command_buffer/service/transfer_buffer_manager.h index 47d5634..5e1a746 100644 --- a/gpu/command_buffer/service/transfer_buffer_manager.h +++ b/gpu/command_buffer/service/transfer_buffer_manager.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "gpu/command_buffer/common/command_buffer_shared.h" namespace gpu { |