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

components/gcm_driver/gcm_account_mapper.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_account_mapper.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/time/clock.h"
 #include "base/time/default_clock.h"
 #include "components/gcm_driver/gcm_driver_desktop.h"
+#include "components/gcm_driver/gcm_message_status.h"
 #include "google_apis/gcm/engine/gcm_store.h"
 
 namespace gcm {
 
 namespace {
 
 const char kGCMAccountMapperSenderId[] = "745476177629";
 const char kGCMAccountMapperSendTo[] = "google.com";
 const int kGCMAddMappingMessageTTL = 30 * 60;  // 0.5 hours in seconds.
 const int kGCMRemoveMappingMessageTTL = 24 * 60 * 60;  // 1 day in seconds.
 const int kGCMUpdateIntervalHours = 24;
 // Because adding an account mapping dependents on a fresh OAuth2 token, we
 // allow the update to happen earlier than update due time, if it is within
 // the early start time to take advantage of that token.
 const int kGCMUpdateEarlyStartHours = 6;
 const char kRegistrationIdMessgaeKey[] = "id";
 const char kTokenMessageKey[] = "t";
 const char kAccountMessageKey[] = "a";
 const char kRemoveAccountKey[] = "r";
 const char kRemoveAccountValue[] = "1";
 // Use to handle send to Gaia ID scenario:
 const char kGCMSendToGaiaIdAppIdKey[] = "gcmb";
 
 
 std::string GenerateMessageID() {
   return base::GenerateGUID();
 }
 
+void NullReceiptCallback(GCMMessageStatus status) {}
+
 }  // namespace
 
 const char kGCMAccountMapperAppId[] = "com.google.android.gms";
 
 GCMAccountMapper::GCMAccountMapper(GCMDriver* gcm_driver)
     : gcm_driver_(gcm_driver),
       clock_(new base::DefaultClock),
       initialized_(false),
       weak_ptr_factory_(this) {
 }
@@ skipping 122 matching lines @@
 
   std::string embedded_app_id = it->second;
   if (embedded_app_id.empty()) {
     DVLOG(1) << "Send to Gaia ID failure: Embedded app ID is empty.";
     return;
   }
 
   // Ensuring the message does not carry the embedded app ID.
   IncomingMessage new_message = message;
   new_message.data.erase(new_message.data.find(kGCMSendToGaiaIdAppIdKey));
-  dispatch_message_callback_.Run(embedded_app_id, new_message);
+  // TODO(harkness): Update this to use a real callback once callbacks are
+  // plumbed to all GCMAppHandlers.
+  dispatch_message_callback_.Run(embedded_app_id, new_message,
+                                 base::Bind(&NullReceiptCallback));
 }
 
 void GCMAccountMapper::OnMessagesDeleted(const std::string& app_id) {
   // Account message does not expect messages right now.
 }
 
 void GCMAccountMapper::OnSendError(
     const std::string& app_id,
     const GCMClient::SendErrorDetails& send_error_details) {
   DCHECK_EQ(app_id, kGCMAccountMapperAppId);
@@ skipping 195 matching lines @@
   }
 
   return accounts_.end();
 }
 
 void GCMAccountMapper::SetClockForTesting(std::unique_ptr<base::Clock> clock) {
   clock_ = std::move(clock);
 }
 
 }  // namespace gcm