Update the PushEvent to have a nullable PushMessageData

content/browser/push_messaging/push_messaging_router.h

Index: content/browser/push_messaging/push_messaging_router.h
diff --git a/content/browser/push_messaging/push_messaging_router.h b/content/browser/push_messaging/push_messaging_router.h
index dae9973de2627030fd2c66440d4a3b7434b48b51..5667bad839b234fa7c79dcd04d27265908543dd8 100644
--- a/content/browser/push_messaging/push_messaging_router.h
+++ b/content/browser/push_messaging/push_messaging_router.h
@@ -11,6 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/service_worker/service_worker_status_code.h"
+#include "content/public/common/push_event_payload.h"

[Peter Beverloo, 2016/01/25 17:39:06]

nit: You can forward declare PushEventPayload to avoid including the file in the
header. This does mean you have to include it in each file that uses it
separately.

[harkness, 2016/01/26 12:07:19]

Done.

 #include "content/public/common/push_messaging_status.h"
 #include "url/gurl.h"
 
@@ -31,7 +32,7 @@ class PushMessagingRouter {
       BrowserContext* browser_context,
       const GURL& origin,
       int64_t service_worker_registration_id,
-      const std::string& data,
+      const content::PushEventPayload& payload,
       const DeliverMessageCallback& deliver_message_callback);
 
  private:
@@ -40,7 +41,7 @@ class PushMessagingRouter {
   static void FindServiceWorkerRegistration(
       const GURL& origin,
       int64_t service_worker_registration_id,
-      const std::string& data,
+      const content::PushEventPayload& payload,
       const DeliverMessageCallback& deliver_message_callback,
       scoped_refptr<ServiceWorkerContextWrapper> service_worker_context);
 
@@ -48,7 +49,7 @@ class PushMessagingRouter {
   // |data| on the Service Worker identified by |service_worker_registration|.
   // Must be called on the IO thread.
   static void FindServiceWorkerRegistrationCallback(
-      const std::string& data,
+      const content::PushEventPayload& payload,
       const DeliverMessageCallback& deliver_message_callback,
       ServiceWorkerStatusCode service_worker_status,
       const scoped_refptr<ServiceWorkerRegistration>&