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

chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java

Index: chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
index 07fa5be9c0e83e15eccedf929c06ad60304e4ce3..d1a1660be5a4a59c13edd1a4acf117f01a0f9ee0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.services.gcm;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import com.google.android.gms.gcm.GcmListenerService;
 import com.google.ipc.invalidation.ticl.android2.channel.AndroidGcmController;
@@ -31,6 +32,9 @@ public class ChromeGcmListenerService extends GcmListenerService {
 
     @Override
     public void onMessageReceived(String from, Bundle data) {
+        boolean hasCollapseKey = !TextUtils.isEmpty(data.getString("collapse_key"));
+        GcmUma.recordDataMessageReceived(getApplicationContext(), hasCollapseKey);
+
         String invalidationSenderId = AndroidGcmController.get(this).getSenderId();
         if (from.equals(invalidationSenderId)) {
             AndroidGcmController.get(this).onMessageReceived(data);
@@ -56,6 +60,7 @@ public class ChromeGcmListenerService extends GcmListenerService {
         // TODO(johnme): Ask GCM to include the subtype in this event.
         Log.w(TAG, "Push messages were deleted, but we can't tell the Service Worker as we don't"
                 + "know what subtype (app ID) it occurred for.");
+        GcmUma.recordDeletedMessages(getApplicationContext());
     }
 
     private void pushMessageReceived(final String from, final Bundle data) {