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

google_apis/gcm/monitoring/gcm_stats_recorder.h

Index: google_apis/gcm/monitoring/gcm_stats_recorder.h
diff --git a/google_apis/gcm/monitoring/gcm_stats_recorder.h b/google_apis/gcm/monitoring/gcm_stats_recorder.h
index aee9179d6ff3eaee399798d95efa6528cfe0e0ad..bf777fcb50806d5ae59440aab539cf86617e8c1c 100644
--- a/google_apis/gcm/monitoring/gcm_stats_recorder.h
+++ b/google_apis/gcm/monitoring/gcm_stats_recorder.h
@@ -109,15 +109,21 @@ class GCM_EXPORT GCMStatsRecorder {
                                                 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,