Route through the BGTaskScheduler when receiving a message for the GCM Driver

chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java
index 67f737182d03b37a8bb96234a18c8fe75d53486f..15db01fd7e30f2c471f8a36162c1107dbb918975 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java
@@ -30,6 +30,7 @@ import org.chromium.chrome.test.util.InfoBarUtil;
 import org.chromium.chrome.test.util.browser.TabTitleObserver;
 import org.chromium.chrome.test.util.browser.notifications.MockNotificationManagerProxy.NotificationEntry;
 import org.chromium.components.gcm_driver.GCMDriver;
+import org.chromium.components.gcm_driver.GCMMessage;
 import org.chromium.components.gcm_driver.instance_id.FakeInstanceIDWithSubtype;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -293,10 +294,14 @@ public class PushMessagingTest
             @Override
             public void run() {
                 Context context = getInstrumentation().getTargetContext().getApplicationContext();
+
                 Bundle extras = new Bundle();
+                extras.putString("subtype", appId);
+
+                GCMMessage message = new GCMMessage(senderId, extras);
                 try {
                     ChromeBrowserInitializer.getInstance(context).handleSynchronousStartup();
-                    GCMDriver.onMessageReceived(appId, senderId, extras);
+                    GCMDriver.dispatchMessage(message);
                 } catch (ProcessInitException e) {
                     fail("Chrome browser failed to initialize.");
                 }