GCMDriver.java shouldn't pass on special MultiplexingGcmListener keys

components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java

Index: components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java
diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java
index 966a783b4ddb64995fa412f8ffcc2156471406b9..c20f6b6c63fb9af17ec04dc9b6a6200865e6040b 100644
--- a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java
+++ b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java
@@ -150,14 +150,16 @@ public class GCMDriver {
             @Override public void run() {
                 final String BUNDLE_SENDER_ID = "from";
                 final String BUNDLE_COLLAPSE_KEY = "collapse_key";
+                final String BUNDLE_GCMMPLEX = "com.google.ipc.invalidation.gcmmplex.";
 
                 String senderId = extras.getString(BUNDLE_SENDER_ID);
                 String collapseKey = extras.getString(BUNDLE_COLLAPSE_KEY);
 
                 List<String> dataKeysAndValues = new ArrayList<String>();
                 for (String key : extras.keySet()) {
-                    // TODO(johnme): Check there aren't other default keys that we need to exclude.
-                    if (key == BUNDLE_SENDER_ID || key == BUNDLE_COLLAPSE_KEY)
+                    // TODO(johnme): Check there aren't other keys that we need to exclude.
+                    if (key == BUNDLE_SENDER_ID || key == BUNDLE_COLLAPSE_KEY ||
+                            key.startsWith(BUNDLE_GCMMPLEX))
                         continue;
                     dataKeysAndValues.add(key);
                     dataKeysAndValues.add(extras.getString(key));