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

components/gcm_driver/gcm_account_mapper.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_GCM_ACCOUNT_MAPPER_H_
 #define COMPONENTS_GCM_DRIVER_GCM_ACCOUNT_MAPPER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
+#include "components/gcm_driver/gcm_message_status.h"
 #include "google_apis/gcm/engine/account_mapping.h"
 
 namespace base {
 class Clock;
 }
 
 namespace gcm {
 
 class GCMDriver;
 extern const char kGCMAccountMapperAppId[];
 
 // Class for mapping signed-in GAIA accounts to the GCM Device ID.
 class GCMAccountMapper : public GCMAppHandler {
  public:
   // List of account mappings.
   typedef std::vector<AccountMapping> AccountMappings;
   typedef base::Callback<void(const std::string& app_id,
-                              const IncomingMessage& message)>
+                              const IncomingMessage& message,
+                              const MessageReceiptCallback& callback)>
       DispatchMessageCallback;

[Peter Beverloo, 2017/02/08 17:09:09]

nit: I know you're just passing by, but mind updating these typedefs to the
newer `using` syntax?

[harkness, 2017/02/09 16:27:29]

Done.

 
   explicit GCMAccountMapper(GCMDriver* gcm_driver);
   ~GCMAccountMapper() override;
 
   void Initialize(const AccountMappings& account_mappings,
                   const DispatchMessageCallback& callback);
 
   // Called by AccountTracker, when a new list of account tokens is available.
   // This will cause a refresh of account mappings and sending updates to GCM.
   void SetAccountTokens(
@@ skipping 79 matching lines @@
   bool initialized_;
 
   base::WeakPtrFactory<GCMAccountMapper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMAccountMapper);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_ACCOUNT_MAPPER_H_