[Extensions] Pass EventFilteringInfo directly in DispatchEvent message

extensions/common/extension_messages.h

Index: extensions/common/extension_messages.h
diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h
index 7d628b3b7b2a10789918b2fc64ac39fd7d4cbe58..1f257aeefa69d33e05feac642dd4474fdf0683d2 100644
--- a/extensions/common/extension_messages.h
+++ b/extensions/common/extension_messages.h
@@ -18,6 +18,7 @@
 #include "extensions/common/api/messaging/message.h"
 #include "extensions/common/api/messaging/port_id.h"
 #include "extensions/common/draggable_region.h"
+#include "extensions/common/event_filtering_info.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/features/feature_session_type.h"
@@ -137,7 +138,7 @@ IPC_STRUCT_BEGIN(ExtensionMsg_DispatchEvent_Params)
   IPC_STRUCT_MEMBER(bool, is_user_gesture)
 
   // Additional filtering info for the event.
-  IPC_STRUCT_MEMBER(base::DictionaryValue, filtering_info)
+  IPC_STRUCT_MEMBER(extensions::EventFilteringInfo, filtering_info)
 IPC_STRUCT_END()
 
 // Allows an extension to execute code in a tab.
@@ -271,6 +272,14 @@ IPC_STRUCT_TRAITS_BEGIN(extensions::PortId)
   IPC_STRUCT_TRAITS_MEMBER(is_opener)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(extensions::EventFilteringInfo)
+  IPC_STRUCT_TRAITS_MEMBER(url)
+  IPC_STRUCT_TRAITS_MEMBER(service_type)
+  IPC_STRUCT_TRAITS_MEMBER(instance_id)
+  IPC_STRUCT_TRAITS_MEMBER(window_type)
+  IPC_STRUCT_TRAITS_MEMBER(window_exposed_by_default)
+IPC_STRUCT_TRAITS_END()
+
 // Singly-included section for custom IPC traits.
 #ifndef EXTENSIONS_COMMON_EXTENSION_MESSAGES_H_
 #define EXTENSIONS_COMMON_EXTENSION_MESSAGES_H_