GCM: Fix for null Sender ID on Android

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 462d515cb995e9c9506802552fc2a22667765b86..547f7216e6abc0f608fa23c0fe45535dc756638d 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
@@ -120,7 +120,8 @@ public class GCMDriver {
 
     // The caller of this function is responsible for setting the PathUtils Private Data Directory
     // Suffix before calling onMessageReceived().
-    public static void onMessageReceived(Context context, final String appId, final Bundle extras) {
+    public static void onMessageReceived(
+            Context context, final String appId, final String senderId, final Bundle extras) {
         // TODO(johnme): Store message and redeliver later if Chrome is killed before delivery.
         ThreadUtils.assertOnUiThread();
         launchNativeThen(context, new Runnable() {
@@ -131,7 +132,6 @@ public class GCMDriver {
                 final String bundleRawData = "rawData";
                 final String bundleGcmplex = "com.google.ipc.invalidation.gcmmplex.";
 
-                String senderId = extras.getString(bundleSenderId);
                 String collapseKey = extras.getString(bundleCollapseKey);  // May be null.
                 byte[] rawData = extras.getByteArray(bundleRawData);  // May be null.