diff options
34 files changed, 34 insertions, 34 deletions
diff --git a/base/metrics/stats_table.cc b/base/metrics/stats_table.cc index 69d69f4..e61ca89 100644 --- a/base/metrics/stats_table.cc +++ b/base/metrics/stats_table.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "base/process_util.h" -#include "base/shared_memory.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc index 95cff2d..88928db 100644 --- a/base/metrics/stats_table_unittest.cc +++ b/base/metrics/stats_table_unittest.cc @@ -2,9 +2,9 @@ // 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/metrics/stats_counters.h" #include "base/metrics/stats_table.h" -#include "base/shared_memory.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index 166244c..b805f7c 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/string_piece.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/extensions/extension_messages.h" diff --git a/chrome/browser/media/webrtc_log_uploader.cc b/chrome/browser/media/webrtc_log_uploader.cc index d9893b8..268afd6 100644 --- a/chrome/browser/media/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc_log_uploader.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/memory/shared_memory.h" #include "base/path_service.h" -#include "base/shared_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/media/webrtc_logging_handler_host.h b/chrome/browser/media/webrtc_logging_handler_host.h index 940b6e6..a35bf3e 100644 --- a/chrome/browser/media/webrtc_logging_handler_host.h +++ b/chrome/browser/media/webrtc_logging_handler_host.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_MEDIA_WEBRTC_LOGGING_HANDLER_HOST_H_ #include "base/basictypes.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "content/public/browser/browser_message_filter.h" namespace net { diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc index 2bc5414..cf69caa 100644 --- a/chrome/browser/printing/print_preview_message_handler.cc +++ b/chrome/browser/printing/print_preview_message_handler.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index b1b23bc..67e4b01 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -11,7 +11,7 @@ #include "content/public/browser/browser_message_filter.h" #if defined(OS_WIN) -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #endif struct PrintHostMsg_ScriptedPrint_Params; diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h index fecb789..37dbfdc 100644 --- a/chrome/common/extensions/extension_messages.h +++ b/chrome/common/extensions/extension_messages.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/bluetooth_permission_data.h" diff --git a/chrome/common/media/webrtc_logging_messages.h b/chrome/common/media/webrtc_logging_messages.h index 5bcf8f9..cceea8f 100644 --- a/chrome/common/media/webrtc_logging_messages.h +++ b/chrome/common/media/webrtc_logging_messages.h @@ -5,7 +5,7 @@ // IPC messages for WebRTC logging. // Multiply-included message file, hence no include guard. -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "ipc/ipc_message_macros.h" #define IPC_MESSAGE_START WebRtcLoggingMsgStart diff --git a/chrome/common/print_messages.h b/chrome/common/print_messages.h index 514b6e0..dca63c3 100644 --- a/chrome/common/print_messages.h +++ b/chrome/common/print_messages.h @@ -8,8 +8,8 @@ #include <string> #include <vector> +#include "base/memory/shared_memory.h" #include "base/values.h" -#include "base/shared_memory.h" #include "ipc/ipc_message_macros.h" #include "printing/page_size_margins.h" #include "printing/print_job_constants.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 53bf817..92ff235 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/memory/shared_memory.h" #include "base/process.h" -#include "base/shared_memory.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/values.h" diff --git a/chrome/common/service_process_util.h b/chrome/common/service_process_util.h index 9d044d4..cd588f3 100644 --- a/chrome/common/service_process_util.h +++ b/chrome/common/service_process_util.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "base/process.h" -#include "base/shared_memory.h" #include "ipc/ipc_channel_handle.h" class CommandLine; diff --git a/chrome/nacl/nacl_ipc_adapter.cc b/chrome/nacl/nacl_ipc_adapter.cc index 845150e..a257099 100644 --- a/chrome/nacl/nacl_ipc_adapter.cc +++ b/chrome/nacl/nacl_ipc_adapter.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "build/build_config.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_platform_file.h" diff --git a/chrome/nacl/nacl_ipc_adapter.h b/chrome/nacl/nacl_ipc_adapter.h index c7569e6..3fe9aa0 100644 --- a/chrome/nacl/nacl_ipc_adapter.h +++ b/chrome/nacl/nacl_ipc_adapter.h @@ -14,8 +14,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/memory/shared_memory.h" #include "base/pickle.h" -#include "base/shared_memory.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/task_runner.h" diff --git a/chrome/renderer/extensions/dispatcher.h b/chrome/renderer/extensions/dispatcher.h index 0306b5c..a341369 100644 --- a/chrome/renderer/extensions/dispatcher.h +++ b/chrome/renderer/extensions/dispatcher.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/timer/timer.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/features/feature.h" diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 3034bc5..d309188 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -8,10 +8,10 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/memory/shared_memory.h" #include "base/metrics/histogram.h" #include "base/perftimer.h" #include "base/pickle.h" -#include "base/shared_memory.h" #include "base/strings/stringprintf.h" #include "chrome/common/extensions/csp_handler.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/renderer/extensions/user_script_slave.h b/chrome/renderer/extensions/user_script_slave.h index 3c6331b..cc11ac2 100644 --- a/chrome/renderer/extensions/user_script_slave.h +++ b/chrome/renderer/extensions/user_script_slave.h @@ -11,7 +11,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/stl_util.h" #include "base/strings/string_piece.h" #include "chrome/common/extensions/user_script.h" diff --git a/chrome/renderer/media/chrome_webrtc_log_message_delegate.h b/chrome/renderer/media/chrome_webrtc_log_message_delegate.h index 0ce6e4d..23ce4cd 100644 --- a/chrome/renderer/media/chrome_webrtc_log_message_delegate.h +++ b/chrome/renderer/media/chrome_webrtc_log_message_delegate.h @@ -7,7 +7,7 @@ #include <string> -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "content/public/renderer/webrtc_log_message_delegate.h" #include "ipc/ipc_channel_proxy.h" diff --git a/chrome/renderer/media/webrtc_logging_message_filter.h b/chrome/renderer/media/webrtc_logging_message_filter.h index e6c38de..4d3ae5f 100644 --- a/chrome/renderer/media/webrtc_logging_message_filter.h +++ b/chrome/renderer/media/webrtc_logging_message_filter.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_MEDIA_WEBRTC_LOGGING_MESSAGE_FILTER_H_ #define CHROME_RENDERER_MEDIA_WEBRTC_LOGGING_MESSAGE_FILTER_H_ -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "ipc/ipc_channel_proxy.h" namespace base { diff --git a/chrome/renderer/mock_printer.cc b/chrome/renderer/mock_printer.cc index 64ceed2..9c16728b 100644 --- a/chrome/renderer/mock_printer.cc +++ b/chrome/renderer/mock_printer.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/file_util.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/print_messages.h" diff --git a/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc b/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc index c568218..f445993 100644 --- a/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc +++ b/chrome/renderer/pepper/pepper_shared_memory_message_filter.cc @@ -5,8 +5,8 @@ #include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "base/process_util.h" -#include "base/shared_memory.h" #include "content/public/common/content_client.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/renderer_ppapi_host.h" diff --git a/chrome/renderer/printing/print_web_view_helper.h b/chrome/renderer/printing/print_web_view_helper.h index e1f9499..989a47f 100644 --- a/chrome/renderer/printing/print_web_view_helper.h +++ b/chrome/renderer/printing/print_web_view_helper.h @@ -9,7 +9,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/time/time.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer_tracker.h" diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc index 2433b15..b94a534 100644 --- a/chrome/test/base/chrome_test_suite.cc +++ b/chrome/test/base/chrome_test_suite.cc @@ -58,7 +58,7 @@ #endif #if defined(OS_POSIX) -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #endif namespace { diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc index 6d094e4..f9cd8a9 100644 --- a/chrome_frame/dll_redirector.cc +++ b/chrome_frame/dll_redirector.cc @@ -12,8 +12,8 @@ #include "base/file_version_info.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/memory/shared_memory.h" #include "base/path_service.h" -#include "base/shared_memory.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" diff --git a/chrome_frame/dll_redirector.h b/chrome_frame/dll_redirector.h index 81c882b..d4c61c1 100644 --- a/chrome_frame/dll_redirector.h +++ b/chrome_frame/dll_redirector.h @@ -11,8 +11,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" // Forward namespace ATL { diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index 9040204..bb9cbd8 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -10,9 +10,9 @@ #include "base/file_version_info.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/memory/shared_memory.h" #include "base/path_service.h" #include "base/scoped_native_library.h" -#include "base/shared_memory.h" #include "base/strings/string_util.h" #include "base/version.h" #include "base/win/scoped_comptr.h" diff --git a/chrome_frame/test/dll_redirector_test.cc b/chrome_frame/test/dll_redirector_test.cc index 71dcee2..0506823 100644 --- a/chrome_frame/test/dll_redirector_test.cc +++ b/chrome_frame/test/dll_redirector_test.cc @@ -4,7 +4,7 @@ #include "chrome_frame/dll_redirector.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "base/win/scoped_handle.h" diff --git a/components/visitedlink/browser/visitedlink_event_listener.cc b/components/visitedlink/browser/visitedlink_event_listener.cc index 9e8e4c1..a96a0e3 100644 --- a/components/visitedlink/browser/visitedlink_event_listener.cc +++ b/components/visitedlink/browser/visitedlink_event_listener.cc @@ -4,7 +4,7 @@ #include "components/visitedlink/browser/visitedlink_event_listener.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "components/visitedlink/browser/visitedlink_delegate.h" #include "components/visitedlink/common/visitedlink_messages.h" #include "content/public/browser/notification_service.h" diff --git a/components/visitedlink/browser/visitedlink_master.h b/components/visitedlink/browser/visitedlink_master.h index 2670bc7..aff4e49 100644 --- a/components/visitedlink/browser/visitedlink_master.h +++ b/components/visitedlink/browser/visitedlink_master.h @@ -15,7 +15,7 @@ #include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/threading/sequenced_worker_pool.h" #include "components/visitedlink/common/visitedlink_common.h" diff --git a/components/visitedlink/common/visitedlink_messages.h b/components/visitedlink/common/visitedlink_messages.h index ec557b7..c087776 100644 --- a/components/visitedlink/common/visitedlink_messages.h +++ b/components/visitedlink/common/visitedlink_messages.h @@ -6,7 +6,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "content/public/common/common_param_traits_macros.h" #include "ipc/ipc_message_macros.h" diff --git a/components/visitedlink/renderer/visitedlink_slave.cc b/components/visitedlink/renderer/visitedlink_slave.cc index 804e10b..7d3e321 100644 --- a/components/visitedlink/renderer/visitedlink_slave.cc +++ b/components/visitedlink/renderer/visitedlink_slave.cc @@ -5,7 +5,7 @@ #include "components/visitedlink/renderer/visitedlink_slave.h" #include "base/logging.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "components/visitedlink/common/visitedlink_messages.h" #include "third_party/WebKit/public/web/WebView.h" diff --git a/components/visitedlink/renderer/visitedlink_slave.h b/components/visitedlink/renderer/visitedlink_slave.h index 82b492b..425c03e 100644 --- a/components/visitedlink/renderer/visitedlink_slave.h +++ b/components/visitedlink/renderer/visitedlink_slave.h @@ -6,7 +6,7 @@ #define COMPONENTS_VISITEDLINK_RENDERER_VISITEDLINK_SLAVE_H_ #include "base/compiler_specific.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "components/visitedlink/common/visitedlink_common.h" #include "content/public/renderer/render_process_observer.h" diff --git a/components/visitedlink/test/visitedlink_perftest.cc b/components/visitedlink/test/visitedlink_perftest.cc index 14216ea..9ced41c76 100644 --- a/components/visitedlink/test/visitedlink_perftest.cc +++ b/components/visitedlink/test/visitedlink_perftest.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/files/file_path.h" +#include "base/memory/shared_memory.h" #include "base/perftimer.h" -#include "base/shared_memory.h" #include "base/strings/stringprintf.h" #include "base/test/test_file_util.h" #include "components/visitedlink/browser/visitedlink_master.h" diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc index 36df65e..e10e2ec 100644 --- a/components/visitedlink/test/visitedlink_unittest.cc +++ b/components/visitedlink/test/visitedlink_unittest.cc @@ -7,11 +7,11 @@ #include <vector> #include "base/file_util.h" +#include "base/memory/shared_memory.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/run_loop.h" -#include "base/shared_memory.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "components/visitedlink/browser/visitedlink_delegate.h" |