From 3c541e6513ee9db5fbc97f26f3d6970a1b6f5cbe Mon Sep 17 00:00:00 2001 From: Colin Blundell Date: Tue, 8 Oct 2019 08:48:50 +0000 Subject: [PATCH] [IPC] Remove no-longer-needed *MsgStart defines Part of the elimination of the legacy IPC system. Bug: 1007300 Change-Id: Ia0f3a49c09156d5a66cf8b7075c08f954d78e8ed Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1833822 Commit-Queue: Colin Blundell Reviewed-by: Devlin Reviewed-by: Jochen Eisinger Reviewed-by: Mike West Reviewed-by: Dave Tapuska Reviewed-by: Martin Barbella Cr-Commit-Position: refs/heads/master@{#703630} --- chrome/common/apps/platform_apps/chrome_apps_messages.h | 2 -- content/common/resource_messages.h | 4 ---- ipc/ipc_message_start.h | 5 ----- tools/ipc_fuzzer/message_tools/message_list.cc | 4 ---- 4 files changed, 15 deletions(-) diff --git a/chrome/common/apps/platform_apps/chrome_apps_messages.h b/chrome/common/apps/platform_apps/chrome_apps_messages.h index 3169f24c903fb5..f8138b4fc56127 100644 --- a/chrome/common/apps/platform_apps/chrome_apps_messages.h +++ b/chrome/common/apps/platform_apps/chrome_apps_messages.h @@ -8,8 +8,6 @@ #include "chrome/common/apps/platform_apps/media_galleries_permission_data.h" #include "ipc/ipc_message_macros.h" -#define IPC_MESSAGE_START ChromeAppsMsgStart - IPC_STRUCT_TRAITS_BEGIN(chrome_apps::MediaGalleriesPermissionData) IPC_STRUCT_TRAITS_MEMBER(permission()) IPC_STRUCT_TRAITS_END() diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h index c31444de9a6620..0d31d88e8d4321 100644 --- a/content/common/resource_messages.h +++ b/content/common/resource_messages.h @@ -29,10 +29,6 @@ #endif // INTERNAL_CONTENT_COMMON_RESOURCE_MESSAGES_H_ -#define IPC_MESSAGE_START ResourceMsgStart -#undef IPC_MESSAGE_EXPORT -#define IPC_MESSAGE_EXPORT CONTENT_EXPORT - IPC_ENUM_TRAITS_MAX_VALUE(blink::WebMixedContentContextType, blink::WebMixedContentContextType::kLast) diff --git a/ipc/ipc_message_start.h b/ipc/ipc_message_start.h index 83460bdde7229e..2e7c90011da06e 100644 --- a/ipc/ipc_message_start.h +++ b/ipc/ipc_message_start.h @@ -24,7 +24,6 @@ enum IPCMessageStart { GpuChannelMsgStart, MediaMsgStart, PpapiMsgStart, - ResourceMsgStart, ChromeMsgStart, DragMsgStart, PrintMsgStart, @@ -36,9 +35,7 @@ enum IPCMessageStart { ChromotingMsgStart, BrowserPluginMsgStart, AndroidWebViewMsgStart, - MediaPlayerMsgStart, PeerConnectionTrackerMsgStart, - WebRtcLoggingMsgStart, NaClHostMsgStart, EncryptedMediaMsgStart, CastMsgStart, @@ -48,7 +45,6 @@ enum IPCMessageStart { WebTestMsgStart, NetworkHintsMsgStart, CastMediaMsgStart, - SyncCompositorMsgStart, ExtensionsGuestViewMsgStart, GuestViewMsgStart, // Note: CastCryptoMsgStart and CastChannelMsgStart reserved for Chromecast @@ -60,7 +56,6 @@ enum IPCMessageStart { SurfaceViewManagerMsgStart, ExtensionWorkerMsgStart, SubresourceFilterMsgStart, - ChromeAppsMsgStart, UnfreezableFrameMsgStart, LastIPCMsgStart // Must come last. }; diff --git a/tools/ipc_fuzzer/message_tools/message_list.cc b/tools/ipc_fuzzer/message_tools/message_list.cc index f94bd9bcd67eda..cdf378536f9253 100644 --- a/tools/ipc_fuzzer/message_tools/message_list.cc +++ b/tools/ipc_fuzzer/message_tools/message_list.cc @@ -54,9 +54,7 @@ static bool check_msgtable() { exemptions.push_back(CastMediaMsgStart); // Reserved for chromecast. exemptions.push_back(IPCTestMsgStart); exemptions.push_back(WorkerMsgStart); // Now only used by tests. - exemptions.push_back(ResourceMsgStart); // Cleanup underway. exemptions.push_back(ChromeUtilityPrintingMsgStart); // BUILDFLAGS, sigh. - exemptions.push_back(WebRtcLoggingMsgStart); #if !BUILDFLAG(ENABLE_NACL) exemptions.push_back(NaClMsgStart); @@ -64,11 +62,9 @@ static bool check_msgtable() { #if !defined(OS_ANDROID) - exemptions.push_back(MediaPlayerMsgStart); exemptions.push_back(EncryptedMediaMsgStart); exemptions.push_back(GinJavaBridgeMsgStart); exemptions.push_back(AndroidWebViewMsgStart); - exemptions.push_back(SyncCompositorMsgStart); exemptions.push_back(ExtensionWorkerMsgStart); exemptions.push_back(SurfaceViewManagerMsgStart); #endif // !defined(OS_ANDROID)