ServiceWorker: Introduce ExtendableMessageEvent to replace MessageEvent

content/common/service_worker/service_worker_messages.h

Index: content/common/service_worker/service_worker_messages.h
diff --git a/content/common/service_worker/service_worker_messages.h b/content/common/service_worker/service_worker_messages.h
index d52998dfdffe4aa016500b7ffc974c10a0745932..50d393d1c085e50e666f94310f674f3f412e2f62 100644
--- a/content/common/service_worker/service_worker_messages.h
+++ b/content/common/service_worker/service_worker_messages.h
@@ -161,9 +161,10 @@ IPC_MESSAGE_CONTROL3(ServiceWorkerHostMsg_GetRegistrationForReady,
                      int /* provider_id */)
 
 // Sends a 'message' event to a service worker (renderer->browser).
-IPC_MESSAGE_CONTROL3(
+IPC_MESSAGE_CONTROL4(
     ServiceWorkerHostMsg_PostMessageToWorker,
     int /* handle_id */,
+    int /* provider_id */,
     base::string16 /* message */,
     std::vector<content::TransferredMessagePort> /* sent_message_ports */)
 
@@ -237,6 +238,8 @@ IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_GeofencingEventFinished,
 IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_CrossOriginConnectEventFinished,
                     int /* request_id */,
                     bool /* accept_connection */)
+IPC_MESSAGE_ROUTED1(ServiceWorkerHostMsg_MessageEventFinished,
+                    int /* request_id */)
 
 // Responds to a Ping from the browser.
 // Routed to the target ServiceWorkerVersion.
@@ -316,9 +319,10 @@ IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_DisassociateRegistration,
                      int /* provider_id */)
 
 // Response to ServiceWorkerHostMsg_RegisterServiceWorker.
-IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_ServiceWorkerRegistered,
+IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_ServiceWorkerRegistered,
                      int /* thread_id */,
                      int /* request_id */,
+                     int /* provider_id */,
                      content::ServiceWorkerRegistrationObjectInfo,
                      content::ServiceWorkerVersionAttributes)
 
@@ -329,23 +333,26 @@ IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_ServiceWorkerUnregistered,
                      bool /* is_success */)
 
 // Response to ServiceWorkerHostMsg_GetRegistration.
-IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_DidGetRegistration,
+IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_DidGetRegistration,
                      int /* thread_id */,
                      int /* request_id */,
+                     int /* provider_id */,
                      content::ServiceWorkerRegistrationObjectInfo,
                      content::ServiceWorkerVersionAttributes)
 
 // Response to ServiceWorkerHostMsg_GetRegistrations.
-IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_DidGetRegistrations,
+IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_DidGetRegistrations,
                      int /* thread_id */,
                      int /* request_id */,
+                     int /* provider_id */,
                      std::vector<content::ServiceWorkerRegistrationObjectInfo>,
                      std::vector<content::ServiceWorkerVersionAttributes>)
 
 // Response to ServiceWorkerHostMsg_GetRegistrationForReady.
-IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_DidGetRegistrationForReady,
+IPC_MESSAGE_CONTROL5(ServiceWorkerMsg_DidGetRegistrationForReady,
                      int /* thread_id */,
                      int /* request_id */,
+                     int /* provider_id */,
                      content::ServiceWorkerRegistrationObjectInfo,
                      content::ServiceWorkerVersionAttributes)
 
@@ -438,8 +445,17 @@ IPC_MESSAGE_CONTROL4(ServiceWorkerMsg_GeofencingEvent,
 IPC_MESSAGE_CONTROL2(ServiceWorkerMsg_CrossOriginConnectEvent,
                      int /* request_id */,
                      content::NavigatorConnectClient /* client */)
-IPC_MESSAGE_CONTROL3(
-    ServiceWorkerMsg_MessageToWorker,
+IPC_MESSAGE_CONTROL5(
+    ServiceWorkerMsg_ClientMessageEvent,
+    int /* request_id */,
+    content::ServiceWorkerClientInfo /* client */,
+    base::string16 /* message */,
+    std::vector<content::TransferredMessagePort> /* sent_message_ports */,
+    std::vector<int> /* new_routing_ids */)
+IPC_MESSAGE_CONTROL5(
+    ServiceWorkerMsg_WorkerMessageEvent,
+    int /* request_id */,
+    content::ServiceWorkerObjectInfo /* client */,
     base::string16 /* message */,
     std::vector<content::TransferredMessagePort> /* sent_message_ports */,
     std::vector<int> /* new_routing_ids */)