GCM: Add Android UMA, and UMA for deleted/collapsed messages

google_apis/gcm/monitoring/gcm_stats_recorder.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 GOOGLE_APIS_GCM_MONITORING_GCM_STATS_RECORDER_H_
 #define GOOGLE_APIS_GCM_MONITORING_GCM_STATS_RECORDER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 91 matching lines @@
       const std::string& source,
       UnregistrationRequest::Status status) = 0;
 
   // Records that an unregistration retry has been requested and delayed due to
   // backoff logic.
   virtual void RecordUnregistrationRetryDelayed(const std::string& app_id,
                                                 const std::string& source,
                                                 int64_t delay_msec,
                                                 int retries_left) = 0;
 
-  // Records that a data message has been received. If this message is not
-  // sent to a registered app, to_registered_app shoudl be false. If it
-  // indicates that a message has been dropped on the server, is_message_dropped
-  // should be true.
+  // Records that a data message or dirty ping (indicating that one or more
+  // messages were deleted on the server) has been received. If this message is
+  // not sent to a registered app, to_registered_app should be false.
+  // - For data messages |message_type| should be DATA_MESSAGE,
+  //   |has_collapse_key| should be set and |deleted_count| is ignored.
+  // - For dirty pings |message_type| should be DELETED_MESSAGES,
+  //   |has_collapse_key| is ignored, and |deleted_count| should be set, or 0 if
+  //   unknown.
   virtual void RecordDataMessageReceived(const std::string& app_id,
                                          const std::string& from,
                                          int message_byte_size,
                                          bool to_registered_app,
-                                         ReceivedMessageType message_type) = 0;
+                                         ReceivedMessageType message_type,
+                                         bool has_collapse_key,
+                                         int deleted_count) = 0;
 
   // Records that an outgoing data message was sent over the wire.
   virtual void RecordDataSentToWire(const std::string& app_id,
                                     const std::string& receiver_id,
                                     const std::string& message_id,
                                     int queued) = 0;
   // Records that the MCS client sent a 'send status' notification to callback.
   virtual void RecordNotifySendStatus(const std::string& app_id,
                                       const std::string& receiver_id,
                                       const std::string& message_id,
                                       MCSClient::MessageSendStatus status,
                                       int byte_size,
                                       int ttl) = 0;
   // Records that a 'send error' message was received.
   virtual void RecordIncomingSendError(const std::string& app_id,
                                        const std::string& receiver_id,
                                        const std::string& message_id) = 0;
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_MONITORING_GCM_STATS_RECORDER_H_