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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.push_messaging;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
@@ skipping 12 matching lines @@
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.infobar.InfoBar;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.notifications.NotificationTestBase;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
 import org.chromium.chrome.browser.tab.Tab;
 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;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Instrumentation tests for the Push API and the integration with the Notifications API on Android.
@@ skipping 243 matching lines @@
     }
 
     private void sendPushAndWaitForCallback(Pair<String, String> appIdAndSenderId)
             throws InterruptedException, TimeoutException {
         final String appId = appIdAndSenderId.first;
         final String senderId = appIdAndSenderId.second;
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @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.");
                 }
             }
         });
         mMessageHandledHelper.waitForCallback(mMessageHandledHelper.getCallCount());
     }
 
     private void waitForTitle(Tab tab, String expectedTitle) throws InterruptedException {
         TabTitleObserver titleObserver = new TabTitleObserver(tab, expectedTitle);
@@ skipping 20 matching lines @@
     private void waitForInfobarToClose() {
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return getInfoBars().isEmpty();
             }
         });
         assertEquals(0, getInfoBars().size());
     }
 }