Update the PushEvent to have a nullable PushMessageData

content/browser/service_worker/service_worker_version.cc

Index: content/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index b77ba3b06ec0ab61b2ac67e528e0bd38e8612d57..ea91d315d4a1b7bf1c1471323adf1540d67fcc42 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -40,6 +40,7 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/push_event_payload.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/service_registry.h"
 #include "mojo/common/common_type_converters.h"
@@ -656,24 +657,24 @@ void ServiceWorkerVersion::DispatchNotificationClickEvent(
   }
 }
 
-void ServiceWorkerVersion::DispatchPushEvent(const StatusCallback& callback,
-                                             const std::string& data) {
+void ServiceWorkerVersion::DispatchPushEvent(
+    const StatusCallback& callback,
+    const content::PushEventPayload& payload) {

[Peter Beverloo, 2016/01/26 12:35:18]

s/content:://

[harkness, 2016/01/26 14:49:20]

Done.

   OnBeginEvent();
   DCHECK_EQ(ACTIVATED, status()) << status();
   if (running_status() != RUNNING) {
     // Schedule calling this method after starting the worker.
-    StartWorker(base::Bind(&RunTaskAfterStartWorker,
-                           weak_factory_.GetWeakPtr(), callback,
-                           base::Bind(&self::DispatchPushEvent,
-                                      weak_factory_.GetWeakPtr(),
-                                      callback, data)));
+    StartWorker(base::Bind(
+        &RunTaskAfterStartWorker, weak_factory_.GetWeakPtr(), callback,
+        base::Bind(&self::DispatchPushEvent, weak_factory_.GetWeakPtr(),
+                   callback, payload)));
     return;
   }
 
   int request_id = AddRequest(callback, &push_requests_, REQUEST_PUSH,
                               ServiceWorkerMetrics::EventType::PUSH);
   ServiceWorkerStatusCode status = embedded_worker_->SendMessage(
-      ServiceWorkerMsg_PushEvent(request_id, data));
+      ServiceWorkerMsg_PushEvent(request_id, payload));
   if (status != SERVICE_WORKER_OK) {
     push_requests_.Remove(request_id);
     RunSoon(base::Bind(callback, status));