Convert now component to use GCM rather than pushMessaging.

chrome/browser/resources/google_now/background.js

 // Copyright (c) 2013 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.
 
 'use strict';
 
 /**
  * @fileoverview The event page for Google Now for Chrome implementation.
  * The Google Now event page gets Google Now cards from the server and shows
  * them as Chrome notifications.
@@ skipping 171 matching lines @@
     // send dismissals is scheduled.
     return true;
   }
 
   return false;
 }
 
 var tasks = buildTaskManager(areTasksConflicting);
 
 // Add error processing to API calls.
+wrapper.instrumentChromeApiFunction('gcm.onMessage.addListener', 0);
 wrapper.instrumentChromeApiFunction('metricsPrivate.getVariationParams', 1);
 wrapper.instrumentChromeApiFunction('notifications.clear', 1);
 wrapper.instrumentChromeApiFunction('notifications.create', 2);
 wrapper.instrumentChromeApiFunction('notifications.getPermissionLevel', 0);
 wrapper.instrumentChromeApiFunction('notifications.update', 2);
 wrapper.instrumentChromeApiFunction('notifications.getAll', 0);
 wrapper.instrumentChromeApiFunction(
     'notifications.onButtonClicked.addListener', 0);
 wrapper.instrumentChromeApiFunction('notifications.onClicked.addListener', 0);
 wrapper.instrumentChromeApiFunction('notifications.onClosed.addListener', 0);
 wrapper.instrumentChromeApiFunction(
     'notifications.onPermissionLevelChanged.addListener', 0);
 wrapper.instrumentChromeApiFunction(
     'notifications.onShowSettings.addListener', 0);
 wrapper.instrumentChromeApiFunction('permissions.contains', 1);
-wrapper.instrumentChromeApiFunction('pushMessaging.onMessage.addListener', 0);
-wrapper.instrumentChromeApiFunction('storage.onChanged.addListener', 0);
 wrapper.instrumentChromeApiFunction('runtime.onInstalled.addListener', 0);
 wrapper.instrumentChromeApiFunction('runtime.onStartup.addListener', 0);
+wrapper.instrumentChromeApiFunction('storage.onChanged.addListener', 0);
 wrapper.instrumentChromeApiFunction('tabs.create', 1);
 
 var updateCardsAttempts = buildAttemptManager(
     'cards-update',
     requestCards,
     INITIAL_POLLING_PERIOD_SECONDS,
     MAXIMUM_POLLING_PERIOD_SECONDS);
 var optInPollAttempts = buildAttemptManager(
     'optin',
     pollOptedInNoImmediateRecheck,
@@ skipping 787 matching lines @@
   // We don't clear localStorage since those values are still relevant
   // across Google Now start-stop events.
   chrome.storage.local.clear();
 }
 
 /**
  * Initializes the event page on install or on browser startup.
  */
 function initialize() {
   recordEvent(GoogleNowEvent.EXTENSION_START);
+  registerForGcm();
   onStateChange();
 }
 
 /**
  * Starts or stops the main pipeline for polling cards.
  * @param {boolean} shouldPollCardsRequest true to start and
  *     false to stop polling cards.
  */
 function setShouldPollCards(shouldPollCardsRequest) {
   updateCardsAttempts.isRunning(function(currentValue) {
@@ skipping 299 matching lines @@
 
 // Handles state change notifications for the Google Now enabled bit.
 instrumented.storage.onChanged.addListener(function(changes, areaName) {
   if (areaName === 'local') {
     if ('googleNowEnabled' in changes) {
       onStateChange();
     }
   }
 });
 
-instrumented.pushMessaging.onMessage.addListener(function(message) {
-  // message.payload will be '' when the extension first starts.
-  // Each time after signing in, we'll get latest payload for all channels.
-  // So, we need to poll the server only when the payload is non-empty and has
-  // changed.
-  console.log('pushMessaging.onMessage ' + JSON.stringify(message));
-  if (message.payload.indexOf('REQUEST_CARDS') == 0) {
+instrumented.gcm.onMessage.addListener(function(message) {
+  console.log('gcm.onMessage ' + JSON.stringify(message));
+  if (!message || !message.data) {
+    return;
+  }
+
+  var payload = message.data.payload;
+  var subchannel = message.data.subchannelId;

[robliao, 2015/02/18 00:04:25]

So we still need subchannel ID? I thought subchannel Ids were an artifact of
Chrome Push Messaging and aren't needed for Android style GCM. Maybe we can
transform this into some sort of tag instead.

If we still need this, keep this as 'var subchannelId' for consistency.

[skare_, 2015/02/19 16:48:10]

made this 'tag' - I also don't think we'll need it, could remove if desired. let
me know.

+  if (payload.indexOf('REQUEST_CARDS') == 0) {
     tasks.add(ON_PUSH_MESSAGE_START_TASK_NAME, function() {
       // Accept promise rejection on failure since it's safer to do nothing,
       // preventing polling the server when the payload really didn't change.
       fillFromChromeLocalStorage({
         lastPollNowPayloads: {},
         /** @type {Object<string, StoredNotificationGroup>} */
         notificationGroups: {}
       }, PromiseRejection.ALLOW).then(function(items) {
-        if (items.lastPollNowPayloads[message.subchannelId] !=
-            message.payload) {
-          items.lastPollNowPayloads[message.subchannelId] = message.payload;
+        if (items.lastPollNowPayloads[message.subchannelId] != payload) {

[robliao, 2015/02/18 00:04:25]

message.subchannelId -> subchannelId
Two more instances below.

[skare_, 2015/02/19 16:48:10]

Done.

+          items.lastPollNowPayloads[message.subchannelId] = payload;
 
           items.notificationGroups['PUSH' + message.subchannelId] = {
             cards: [],
             nextPollTime: Date.now()
           };
 
           chrome.storage.local.set({
             lastPollNowPayloads: items.lastPollNowPayloads,
             notificationGroups: items.notificationGroups
           });
 
           pollOptedInWithRecheck();
         }
       });
     });
   }
 });