Update the PushEvent to have a nullable PushMessageData

chrome/browser/push_messaging/push_messaging_service_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/push_messaging_service.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
 #include "chrome/browser/push_messaging/push_messaging_permission_context.h"
 #include "chrome/browser/push_messaging/push_messaging_permission_context_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"
 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/gcm_driver/crypto/gcm_crypto_test_helpers.h"
 #include "components/gcm_driver/fake_gcm_client_factory.h"
 #include "components/gcm_driver/gcm_profile_service.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/push_event_payload.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTestOrigin[] = "https://example.com";
 const char kTestSenderId[] = "1234567890";
 const int64_t kTestServiceWorkerId = 42;
 const char kTestPayload[] = "Hello, world!";
 
@@ skipping 76 matching lines @@
 
     *subscription_id_out = registration_id;
     *p256dh_out = p256dh;
     *auth_out = auth;
   }
 
   // Callback to use when observing messages dispatched by the push service.
   void DidDispatchMessage(std::string* app_id_out,
                           GURL* origin_out,
                           int64_t* service_worker_registration_id_out,
-                          std::string* message_data_out,
+                          content::PushEventPayload* payload_out,
                           const std::string& app_id,
                           const GURL& origin,
                           int64_t service_worker_registration_id,
-                          const std::string& message_data) {
+                          const content::PushEventPayload& payload) {
     *app_id_out = app_id;
     *origin_out = origin;
     *service_worker_registration_id_out = service_worker_registration_id;
-    *message_data_out = message_data;
+    *payload_out = payload;
   }
 
  protected:
   PushMessagingTestingProfile* profile() { return &profile_; }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   PushMessagingTestingProfile profile_;
 };
 
@@ skipping 41 matching lines @@
   ASSERT_NE(kTestPayload, message.raw_data);
   ASSERT_FALSE(message.decrypted);
 
   // (4) Find the app_id that has been associated with the subscription.
   PushMessagingAppIdentifier app_identifier =
       PushMessagingAppIdentifier::FindByServiceWorker(profile(), origin,
                                                       kTestServiceWorkerId);
 
   ASSERT_FALSE(app_identifier.is_null());
 
-  std::string app_id, message_data;
+  std::string app_id;
   GURL dispatched_origin;
   int64_t service_worker_registration_id;
+  content::PushEventPayload payload;
 
   // (5) Observe message dispatchings from the Push Messaging service, and then
   // dispatch the |message| on the GCM driver as if it had actually been
   // received by Google Cloud Messaging.
-  push_service->SetMessageDispatchedCallbackForTesting(
-      base::Bind(&PushMessagingServiceTest::DidDispatchMessage,
-                 base::Unretained(this), &app_id, &dispatched_origin,
-                 &service_worker_registration_id, &message_data));
+  push_service->SetMessageDispatchedCallbackForTesting(base::Bind(
+      &PushMessagingServiceTest::DidDispatchMessage, base::Unretained(this),
+      &app_id, &dispatched_origin, &service_worker_registration_id, &payload));
 
   gcm::FakeGCMProfileService* fake_profile_service =
       static_cast<gcm::FakeGCMProfileService*>(
           gcm::GCMProfileServiceFactory::GetForProfile(profile()));
 
   fake_profile_service->DispatchMessage(app_identifier.app_id(), message);
 
   base::RunLoop().RunUntilIdle();
 
   // (6) Verify that the message, as received by the Push Messaging Service, has
   // indeed been decrypted by the GCM Driver, and has been forwarded to the
   // Service Worker that has been associated with the subscription.
   EXPECT_EQ(app_identifier.app_id(), app_id);
   EXPECT_EQ(origin, dispatched_origin);
   EXPECT_EQ(service_worker_registration_id, kTestServiceWorkerId);
 
-  EXPECT_EQ(kTestPayload, message_data);
+  EXPECT_FALSE(payload.isNull());
+  EXPECT_EQ(kTestPayload, payload.getData());
 }