Restoring recently deleted unit tests

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 424 matching lines @@
   var combinedCards = {};
 
   for (var groupName in notificationGroups)
     combineGroup(combinedCards, notificationGroups[groupName]);
 
   showNotificationCards(
       notificationGroups, combinedCards, onSuccess, onCardShown);
 }
 
 /**
- * Parses JSON response from the notification server, shows notifications and
- * schedules next update.
- * @param {string} response Server response.
+ * Based on a response response from the notification server, shows

[rgustafson, 2014/01/07 20:36:45]

response x2

[vadimt, 2014/01/08 02:19:01]

Done.

+ * notifications and schedules next update.
+ * @param {ServerResponse} response Server response.
  * @param {function(ReceivedNotification)=} onCardShown Optional parameter
  *     called when each card is shown.
  */
-function parseAndShowNotificationCards(response, onCardShown) {
-  console.log('parseAndShowNotificationCards ' + response);
-  /** @type {ServerResponse} */
-  var parsedResponse = JSON.parse(response);
+function processServerResponse(response, onCardShown) {
+  console.log('processServerResponse ' + JSON.stringify(response));
 
-  if (parsedResponse.googleNowDisabled) {
+  if (response.googleNowDisabled) {
     chrome.storage.local.set({googleNowEnabled: false});
     // TODO(vadimt): Remove the line below once the server stops sending groups
     // with 'googleNowDisabled' responses.
-    parsedResponse.groups = {};
+    response.groups = {};
     // Google Now was enabled; now it's disabled. This is a state change.
     onStateChange();
   }
 
-  var receivedGroups = parsedResponse.groups;
+  var receivedGroups = response.groups;
 
   instrumented.storage.local.get(
       ['notificationGroups', 'recentDismissals'],
       function(items) {
         console.log(
-            'parseAndShowNotificationCards-get ' + JSON.stringify(items));
+            'processServerResponse-get ' + JSON.stringify(items));
         items = items || {};
         /** @type {Object.<string, StoredNotificationGroup>} */
         items.notificationGroups = items.notificationGroups || {};
         /** @type {Object.<NotificationId, number>} */
         items.recentDismissals = items.recentDismissals || {};
 
         // Build a set of non-expired recent dismissals. It will be used for
         // client-side filtering of cards.
         /** @type {Object.<NotificationId, number>} */
         var updatedRecentDismissals = {};
         var now = Date.now();
         for (var notificationId in items.recentDismissals) {
           var dismissalAge = now - items.recentDismissals[notificationId];
           if (dismissalAge < DISMISS_RETENTION_TIME_MS) {
             updatedRecentDismissals[notificationId] =
                 items.recentDismissals[notificationId];
           }
         }
 
         // Populate groups with corresponding cards.
-        if (parsedResponse.notifications) {
-          for (var i = 0; i < parsedResponse.notifications.length; ++i) {
+        if (response.notifications) {
+          for (var i = 0; i < response.notifications.length; ++i) {
             /** @type {ReceivedNotification} */
-            var card = parsedResponse.notifications[i];
+            var card = response.notifications[i];
             if (!(card.notificationId in updatedRecentDismissals)) {
               var group = receivedGroups[card.groupName];
               group.cards = group.cards || [];
               group.cards.push(card);
             }
           }
         }
 
         // Build updated set of groups.
         var updatedGroups = {};
@@ skipping 26 matching lines @@
           // 'nextPollSeconds' may be sent even for groups that don't contain
           // cards updates.
           if (receivedGroup.nextPollSeconds !== undefined) {
             storedGroup.nextPollTime =
                 now + receivedGroup.nextPollSeconds * MS_IN_SECOND;
           }
 
           updatedGroups[groupName] = storedGroup;
         }
 
-        scheduleNextPoll(updatedGroups, !parsedResponse.googleNowDisabled);
+        scheduleNextPoll(updatedGroups, !response.googleNowDisabled);
         combineAndShowNotificationCards(
             updatedGroups,
             function() {
               chrome.storage.local.set({
                 notificationGroups: updatedGroups,
                 recentDismissals: updatedRecentDismissals
               });
               recordEvent(GoogleNowEvent.CARDS_PARSE_SUCCESS);
             },
             onCardShown);
@@ skipping 35 matching lines @@
   });
 
   console.log('requestNotificationGroups: request=' + requestParameters);
 
   var request = buildServerRequest('GET', 'notifications' + requestParameters);
 
   request.onloadend = function(event) {
     console.log('requestNotificationGroups-onloadend ' + request.status);
     if (request.status == HTTP_OK) {
       recordEvent(GoogleNowEvent.REQUEST_FOR_CARDS_SUCCESS);
-      parseAndShowNotificationCards(request.responseText, cardShownCallback);
+      processServerResponse(
+          JSON.parse(request.responseText), cardShownCallback);
     }
   };
 
   setAuthorization(request, function(success) {
     if (success)
       request.send();
   });
 }
 
 /**
@@ skipping 627 matching lines @@
             lastPollNowPayloads: items.lastPollNowPayloads,
             notificationGroups: items.notificationGroups
           });
 
           updateNotificationsCards();
         }
       });
     });
   }
 });