[SyncInvalidations] Fix a bug in FCMHandler::OnMessage.

Server puts the invalidation payload in message.raw_data, and not in
message.data["payload"].

Bug: 1140988

Change-Id: I92a01fc6e7e83cc0065fb464660dd6e25a5cbe27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489888Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Rushan Suleymanov <rushans@google.com>
Commit-Queue: Paula Vidas <paulavidas@google.com>
Cr-Commit-Position: refs/heads/master@{#819378}

components/sync/invalidations/fcm_handler.cc

@@ -18,8 +18,6 @@
 
 namespace syncer {
 
-const char kPayloadKey[] = "payload";
-
 // Lower bound time between two token validations when listening.
 const int kTokenValidationPeriodMinutesDefault = 60 * 24;
 
@@ -109,14 +107,8 @@ void FCMHandler::OnMessage(const std::string& app_id,
   DCHECK_EQ(app_id, app_id_);
   DCHECK(base::FeatureList::IsEnabled(switches::kUseSyncInvalidations));
 
-  auto it = message.data.find(kPayloadKey);
-  std::string payload;
-  if (it != message.data.end()) {
-    payload = it->second;
-  }
-
   for (InvalidationsListener& listener : listeners_) {
-    listener.OnInvalidationReceived(payload);
+    listener.OnInvalidationReceived(message.raw_data);
   }
 }
 

components/sync/invalidations/fcm_handler_unittest.cc

@@ -36,7 +36,6 @@ namespace {
 
 const char kDefaultSenderId[] = "fake_sender_id";
 const char kSyncInvalidationsAppId[] = "com.google.chrome.sync.invalidations";
-const char kPayloadKey[] = "payload";
 
 const int kTokenValidationPeriodMinutesDefault = 60 * 24;
 
@@ -150,7 +149,7 @@ TEST_F(FCMHandlerTest, ShouldPropagatePayloadToListener) {
   fcm_handler_.AddListener(&mock_listener);
 
   gcm::IncomingMessage gcm_message;
-  gcm_message.data[kPayloadKey] = kPayloadValue;
+  gcm_message.raw_data = kPayloadValue;
 
   EXPECT_CALL(mock_listener, OnInvalidationReceived(kPayloadValue));
   fcm_handler_.OnMessage(kSyncInvalidationsAppId, gcm_message);