Prepare declarativeContent API for new script injection feature. Added Javascript types and functio…

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 edf49a403aaef36b02979cedbfa62f7dc3ce908e..2a04ddc91c1a500a327ac0e201a627e2e5740165 100644
--- a/extensions/common/extension_messages.h
+++ b/extensions/common/extension_messages.h
@@ -23,6 +23,7 @@
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "extensions/common/view_type.h"
+#include "extensions/common/watched_pages_recipient.h"
 #include "ipc/ipc_message_macros.h"
 #include "url/gurl.h"
 
@@ -31,6 +32,8 @@
 IPC_ENUM_TRAITS_MAX_VALUE(extensions::ViewType, extensions::VIEW_TYPE_LAST)
 IPC_ENUM_TRAITS_MAX_VALUE(content::SocketPermissionRequest::OperationType,
                           content::SocketPermissionRequest::OPERATION_TYPE_LAST)
+IPC_ENUM_TRAITS_MAX_VALUE(extensions::WatchedPagesRecipient,
+                          extensions::WATCHED_PAGES_RECIPIENT_LAST)
 
 // Parameters structure for ExtensionHostMsg_AddAPIActionToActivityLog and
 // ExtensionHostMsg_AddEventToActivityLog.
@@ -453,7 +456,9 @@ IPC_MESSAGE_ROUTED0(ExtensionMsg_AppWindowClosed)
 // searches match the active page.  This message replaces the old set of
 // searches, and triggers ExtensionHostMsg_OnWatchedPageChange messages from
 // each tab to keep the browser updated about changes.
-IPC_MESSAGE_CONTROL1(ExtensionMsg_WatchPages,
+IPC_MESSAGE_CONTROL3(ExtensionMsg_WatchPages,
+                     std::string, /* event_name */
+                     extensions::WatchedPagesRecipient,
                      std::vector<std::string> /* CSS selectors */)
 
 // Send by the browser to indicate a Blob handle has been transferred to the
@@ -661,7 +666,8 @@ IPC_MESSAGE_CONTROL2(ExtensionHostMsg_AddDOMActionToActivityLog,
 //   main frame.
 // * Something changed on an existing frame causing the set of matching searches
 //   to change.
-IPC_MESSAGE_ROUTED1(ExtensionHostMsg_OnWatchedPageChange,
+IPC_MESSAGE_ROUTED2(ExtensionHostMsg_OnWatchedPageChange,
+                    std::string, /* event_name */
                     std::vector<std::string> /* Matching CSS selectors */)
 
 // Sent by the renderer when it has received a Blob handle from the browser.