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

components/gcm_driver/gcm_driver_desktop.cc

 // Copyright 2014 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 "components/gcm_driver/gcm_driver_desktop.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 35 matching lines @@
   // Called on IO thread.
   void OnRegisterFinished(const linked_ptr<RegistrationInfo>& registration_info,
                           const std::string& registration_id,
                           GCMClient::Result result) override;
   void OnUnregisterFinished(
       const linked_ptr<RegistrationInfo>& registration_info,
       GCMClient::Result result) override;
   void OnSendFinished(const std::string& app_id,
                       const std::string& message_id,
                       GCMClient::Result result) override;
-  void OnMessageReceived(const std::string& app_id,
-                         const IncomingMessage& message) override;
+  void OnMessageReceived(
+      const std::string& app_id,
+      const IncomingMessage& message,
+      const MessageReceiptCallback& optional_receipt_callback) override;
   void OnMessagesDeleted(const std::string& app_id) override;
   void OnMessageSendError(
       const std::string& app_id,
       const GCMClient::SendErrorDetails& send_error_details) override;
   void OnSendAcknowledged(const std::string& app_id,
                           const std::string& message_id) override;
   void OnGCMReady(const std::vector<AccountMapping>& account_mappings,
                   const base::Time& last_token_fetch_time) override;
   void OnActivityRecorded() override;
   void OnConnected(const net::IPEndPoint& ip_endpoint) override;
@@ skipping 158 matching lines @@
   DCHECK(io_thread_->RunsTasksOnCurrentThread());
 
   ui_thread_->PostTask(
       FROM_HERE,
       base::Bind(&GCMDriverDesktop::SendFinished, service_, app_id, message_id,
                  result));
 }
 
 void GCMDriverDesktop::IOWorker::OnMessageReceived(
     const std::string& app_id,
-    const IncomingMessage& message) {
+    const IncomingMessage& message,
+    const MessageReceiptCallback& optional_receipt_callback) {
   DCHECK(io_thread_->RunsTasksOnCurrentThread());
 
-  ui_thread_->PostTask(
-      FROM_HERE,
-      base::Bind(&GCMDriverDesktop::MessageReceived,
-                 service_,
-                 app_id,
-                 message));
+  ui_thread_->PostTask(FROM_HERE,
+                       base::Bind(&GCMDriverDesktop::MessageReceived, service_,
+                                  app_id, message, optional_receipt_callback));
 }
 
 void GCMDriverDesktop::IOWorker::OnMessagesDeleted(const std::string& app_id) {
   DCHECK(io_thread_->RunsTasksOnCurrentThread());
 
   ui_thread_->PostTask(
       FROM_HERE,
       base::Bind(&GCMDriverDesktop::MessagesDeleted, service_, app_id));
 }
 
@@ skipping 953 matching lines @@
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
   // Remove all the queued tasks since they no longer make sense after
   // GCM service is stopped.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   gcm_started_ = false;
   delayed_task_controller_.reset();
   ClearCallbacks();
 }
 
-void GCMDriverDesktop::MessageReceived(const std::string& app_id,
-                                       const IncomingMessage& message) {
+void GCMDriverDesktop::MessageReceived(
+    const std::string& app_id,
+    const IncomingMessage& message,
+    const MessageReceiptCallback& optional_receipt_callback) {
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
 
   // Drop the event if the service has been stopped.
   if (!gcm_started_)
     return;
 
-  DispatchMessage(app_id, message);
+  // Dispatch the message to the GCMDriver, but wrap the IO bound callback in a
+  // new callback which should be called on the UI thread.
+  DispatchMessage(
+      app_id, message,
+      base::Bind(&GCMDriverDesktop::DoSendMessageReceipt,
+                 weak_ptr_factory_.GetWeakPtr(), optional_receipt_callback));
 }
 
 void GCMDriverDesktop::MessagesDeleted(const std::string& app_id) {
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
 
   // Drop the event if the service has been stopped.
   if (!gcm_started_)
     return;
 
   GetAppHandler(app_id)->OnMessagesDeleted(app_id);
@@ skipping 98 matching lines @@
     return false;
 
   if (std::get<1>(a) < std::get<1>(b))
     return true;
   if (std::get<1>(a) > std::get<1>(b))
     return false;
 
   return std::get<2>(a) < std::get<2>(b);
 }
 
+void GCMDriverDesktop::DoSendMessageReceipt(
+    const MessageReceiptCallback& optional_receipt_callback,
+    GCMMessageStatus status) {
+  DCHECK(ui_thread_->RunsTasksOnCurrentThread());
+
+  io_thread_->PostTask(FROM_HERE,
+                       base::Bind(optional_receipt_callback, status));
+}
 }  // namespace gcm