Provide a mechanism for the GCM driver to send message receipts to GCM.

components/gcm_driver/gcm_client_impl_unittest.cc

Index: components/gcm_driver/gcm_client_impl_unittest.cc
diff --git a/components/gcm_driver/gcm_client_impl_unittest.cc b/components/gcm_driver/gcm_client_impl_unittest.cc
index 827a6056d468ff5ed8c453cc1b578ccfa889cf69..a57743fadad1ae124baa63cddfd23cb45ce77403 100644
--- a/components/gcm_driver/gcm_client_impl_unittest.cc
+++ b/components/gcm_driver/gcm_client_impl_unittest.cc
@@ -309,8 +309,10 @@ class GCMClientImplTest : public testing::Test,
   void OnSendFinished(const std::string& app_id,
                       const std::string& message_id,
                       GCMClient::Result result) override {}
-  void OnMessageReceived(const std::string& registration_id,
-                         const IncomingMessage& message) override;
+  void OnMessageReceived(
+      const std::string& registration_id,
+      const IncomingMessage& message,
+      const MessageReceiptCallback& receipt_callback) override;
   void OnMessagesDeleted(const std::string& app_id) override;
   void OnMessageSendError(
       const std::string& app_id,
@@ -616,8 +618,10 @@ void GCMClientImplTest::OnGCMReady(
   last_token_fetch_time_ = last_token_fetch_time;
 }
 
-void GCMClientImplTest::OnMessageReceived(const std::string& registration_id,
-                                          const IncomingMessage& message) {
+void GCMClientImplTest::OnMessageReceived(
+    const std::string& registration_id,
+    const IncomingMessage& message,
+    const MessageReceiptCallback& receipt_callback) {
   last_event_ = MESSAGE_RECEIVED;
   last_app_id_ = registration_id;
   last_message_ = message;
@@ -936,6 +940,9 @@ TEST_F(GCMClientImplTest, DispatchDownstreamMessage) {
   EXPECT_TRUE(message3.IsValid());
   ReceiveMessageFromMCS(message3);
 
+  // TODO(harkness): Add a check for invalid app handler once the
+  // DefaultAppHandler is removed.
+
   EXPECT_NE(MESSAGE_RECEIVED, last_event());
   EXPECT_NE(kExtensionAppId, last_app_id());
 }
@@ -1789,6 +1796,24 @@ TEST_F(GCMClientInstanceIDTest, DispatchDownstreamMessageWithoutSubtype) {
 
   EXPECT_NE(MESSAGE_RECEIVED, last_event());
 
+  // Check that the last message sent was a message receipt for a failed message
+  // and that it had the values expected.
+  mcs_proto::DataMessageStanza stanza =
+      mcs_client()->last_data_message_stanza();
+  EXPECT_EQ(kExtensionAppId, stanza.category());
+  const auto& app_data = stanza.app_data();
+  ASSERT_EQ(3, app_data.size());
+  for (const auto& pair : app_data) {
+    if (pair.key() == "message_id")
+      EXPECT_EQ("", pair.value());
+    else if (pair.key() == "status")
+      EXPECT_EQ("2", pair.value());
+    else if (pair.key() == "type")
+      EXPECT_EQ("message_receipt", pair.value());
+    else
+      EXPECT_TRUE(0);

[Peter Beverloo, 2017/02/13 13:47:07]

FAIL() << "Unexpected key: " << pair.key();

[harkness, 2017/02/14 19:22:29]

Done.

+  }
+
   reset_last_event();
 
   // Message for kSender will be received.
@@ -1850,6 +1875,24 @@ TEST_F(GCMClientInstanceIDTest, DispatchDownstreamMessageWithSubtype) {
 
   EXPECT_NE(MESSAGE_RECEIVED, last_event());
 
+  // Check that the last message sent was a message receipt for a failed message
+  // and that it had the values expected.
+  mcs_proto::DataMessageStanza stanza =
+      mcs_client()->last_data_message_stanza();
+  EXPECT_EQ(kSubtypeAppId, stanza.category());
+  const auto& app_data = stanza.app_data();
+  ASSERT_EQ(3, app_data.size());
+  for (const auto& pair : app_data) {
+    if (pair.key() == "message_id")
+      EXPECT_EQ("", pair.value());
+    else if (pair.key() == "status")
+      EXPECT_EQ("2", pair.value());
+    else if (pair.key() == "type")
+      EXPECT_EQ("message_receipt", pair.value());
+    else
+      EXPECT_TRUE(0);

[Peter Beverloo, 2017/02/13 13:47:07]

dito

[harkness, 2017/02/14 19:22:29]

Done.

+  }
+
   reset_last_event();
 
   // Message for kSender will be received.