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

components/gcm_driver/gcm_driver.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.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "components/gcm_driver/gcm_app_handler.h"
+#include "components/gcm_driver/gcm_message_status.h"

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

nit: this is already included in the header

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

Done.

 
 namespace gcm {
 
 namespace {
 
 const size_t kMaxSenders = 100;
 
 }  // namespace
 
 InstanceIDHandler::InstanceIDHandler() {
@@ skipping 246 matching lines @@
   return register_callbacks_.find(app_id) != register_callbacks_.end();
 }
 
 void GCMDriver::ClearCallbacks() {
   register_callbacks_.clear();
   unregister_callbacks_.clear();
   send_callbacks_.clear();
 }
 
 void GCMDriver::DispatchMessage(const std::string& app_id,
-                                const IncomingMessage& message) {
+                                const IncomingMessage& message,
+                                const MessageReceiptCallback& callback) {
   encryption_provider_.DecryptMessage(
-      app_id, message, base::Bind(&GCMDriver::DispatchMessageInternal,
-                                  weak_ptr_factory_.GetWeakPtr(), app_id));
+      app_id, message,
+      base::Bind(&GCMDriver::DispatchMessageInternal,
+                 weak_ptr_factory_.GetWeakPtr(), app_id, callback));
 }
 
 void GCMDriver::DispatchMessageInternal(
     const std::string& app_id,
+    const MessageReceiptCallback& callback,
     GCMEncryptionProvider::DecryptionResult result,
     const IncomingMessage& message) {
   UMA_HISTOGRAM_ENUMERATION("GCM.Crypto.DecryptMessageResult", result,
                             GCMEncryptionProvider::DECRYPTION_RESULT_LAST + 1);
 
   switch (result) {
     case GCMEncryptionProvider::DECRYPTION_RESULT_UNENCRYPTED:
     case GCMEncryptionProvider::DECRYPTION_RESULT_DECRYPTED:
+      // TODO(beverloo): When the DefaultAppHandler is gone, call
+      // SendMessageReceipt here if there isn't a valid app handler.
       GetAppHandler(app_id)->OnMessage(app_id, message);
       return;
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_ENCRYPTION_HEADER:
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_CRYPTO_KEY_HEADER:
     case GCMEncryptionProvider::DECRYPTION_RESULT_NO_KEYS:
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_SHARED_SECRET:
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_PAYLOAD:
+      DoSendMessageReceipt(callback, GCMMessageStatus::GCM_ENCRYPTION_FAILURE);

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

I'd argue that this should just be SendMessageReceipt() that lives on the UI
thread.

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

Now it just invokes the callback.

       RecordDecryptionFailure(app_id, result);
       return;
   }
 
   NOTREACHED();
 }
 
 void GCMDriver::RegisterAfterUnregister(
     const std::string& app_id,
     const std::vector<std::string>& normalized_sender_ids,
     const UnregisterCallback& unregister_callback,
     GCMClient::Result result) {
   // Invoke the original unregister callback.
   unregister_callback.Run(result);
 
   // Trigger the pending registration.
   DCHECK(register_callbacks_.find(app_id) != register_callbacks_.end());
   RegisterImpl(app_id, normalized_sender_ids);
 }
 
 }  // namespace gcm