Update the PushEvent to have a nullable PushMessageData

content/renderer/service_worker/service_worker_context_client.cc

Index: content/renderer/service_worker/service_worker_context_client.cc
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index 9119c5712fa26e496dbd9bdc301a726f474231e4..e1d18806891d84c2630f658b0045cc23ce3e4dda 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -32,6 +32,7 @@
 #include "content/common/mojo/service_registry_impl.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/common/service_worker/service_worker_messages.h"
+#include "content/public/common/push_event_payload.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/document_state.h"
@@ -760,11 +761,17 @@ void ServiceWorkerContextClient::OnNotificationClickEvent(
       action_index);
 }
 
-void ServiceWorkerContextClient::OnPushEvent(int request_id,
-                                             const std::string& data) {
+void ServiceWorkerContextClient::OnPushEvent(
+    int request_id,
+    const content::PushEventPayload& payload) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerContextClient::OnPushEvent");
-  proxy_->dispatchPushEvent(request_id, blink::WebString::fromUTF8(data));
+  // Only set data to be a valid string if the payload had decrypted data.
+  blink::WebString data;
+  if (!payload.isNull()) {

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

micro nit: no curly brackets

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

Done.

+    data.assign(blink::WebString::fromUTF8(payload.getData()));
+  }
+  proxy_->dispatchPushEvent(request_id, data);
 }
 
 void ServiceWorkerContextClient::OnGeofencingEvent(