Finishing API error processing, and cleanup

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 150 matching lines @@
 wrapper.instrumentChromeApiFunction('notifications.onClicked.addListener', 0);
 wrapper.instrumentChromeApiFunction('notifications.onClosed.addListener', 0);
 wrapper.instrumentChromeApiFunction('omnibox.onInputEntered.addListener', 0);
 wrapper.instrumentChromeApiFunction(
     'preferencesPrivate.googleGeolocationAccessEnabled.get',
     1);
 wrapper.instrumentChromeApiFunction(
     'preferencesPrivate.googleGeolocationAccessEnabled.onChange.addListener',
     0);
 wrapper.instrumentChromeApiFunction('permissions.contains', 1);
-wrapper.instrumentChromeApiFunction('permissions.remove', 1);
-wrapper.instrumentChromeApiFunction('permissions.request', 1);
 wrapper.instrumentChromeApiFunction('runtime.onInstalled.addListener', 0);
 wrapper.instrumentChromeApiFunction('runtime.onStartup.addListener', 0);
 wrapper.instrumentChromeApiFunction('tabs.create', 1);
 wrapper.instrumentChromeApiFunction('storage.local.get', 1);
 
 var updateCardsAttempts = buildAttemptManager(
     'cards-update',
     requestLocation,
     INITIAL_POLLING_PERIOD_SECONDS,
     MAXIMUM_POLLING_PERIOD_SECONDS);
@@ skipping 79 matching lines @@
  * @param {Object.<string, MergedCard>} cards Map from chromeNotificationId to
  *     the merged card, containing cards to show.
  */
 function showNotificationCards(cards) {
   console.log('showNotificationCards ' + JSON.stringify(cards));
 
   instrumented.storage.local.get(['notificationsData', 'recentDismissals'],
       function(items) {
         console.log('showNotificationCards-get ' +
             JSON.stringify(items));
+        items = items || {};
         items.notificationsData = items.notificationsData || {};
         items.recentDismissals = items.recentDismissals || {};
 
         instrumented.notifications.getAll(function(notifications) {
           console.log('showNotificationCards-getAll ' +
               JSON.stringify(notifications));
           // TODO(vadimt): Figure out what to do when notifications are
           // disabled for our extension.
           notifications = notifications || {};
 
@@ skipping 181 matching lines @@
     for (var i = 0; i != parsedResponse.notifications.length; ++i) {
       var card = parsedResponse.notifications[i];
       var group = groups[card.groupName];
       group.cards = group.cards || [];
       group.cards.push(card);
     }
   }
 
   instrumented.storage.local.get('notificationGroups', function(items) {
     console.log('parseAndShowNotificationCards-get ' + JSON.stringify(items));
+    items = items || {};
     items.notificationGroups = items.notificationGroups || {};
 
     var now = Date.now();
 
     // Build updated set of groups and merge cards from all groups into one set.
     var updatedGroups = {};
     var mergedCards = {};
 
     for (var groupName in groups) {
       var receivedGroup = groups[groupName];
@@ skipping 40 matching lines @@
       ' from ' + NOTIFICATION_CARDS_URL);
 
   if (!NOTIFICATION_CARDS_URL)
     return;
 
   recordEvent(GoogleNowEvent.REQUEST_FOR_CARDS_TOTAL);
 
   instrumented.storage.local.get('notificationGroups', function(items) {
     console.log('requestNotificationCards-storage-get ' +
                 JSON.stringify(items));
+    items = items || {};
 
     var requestParameters = '?timeZoneOffsetMs=' +
         (-new Date().getTimezoneOffset() * MS_IN_MINUTE);
 
     if (items.notificationGroups) {
       var now = Date.now();
 
       for (var groupName in items.notificationGroups) {
         var group = items.notificationGroups[groupName];
         if (group.nextPollTime <= now)
@@ skipping 139 matching lines @@
 /**
  * Tries to send dismiss requests for all pending dismissals.
  * @param {function(boolean)} callbackBoolean Completion callback with 'success'
  *     parameter. Success means that no pending dismissals are left.
  */
 function processPendingDismissals(callbackBoolean) {
   instrumented.storage.local.get(['pendingDismissals', 'recentDismissals'],
       function(items) {
         console.log('processPendingDismissals-storage-get ' +
                     JSON.stringify(items));
+        items = items || {};
         items.pendingDismissals = items.pendingDismissals || [];
         items.recentDismissals = items.recentDismissals || {};
 
         var dismissalsChanged = false;
 
         function onFinish(success) {
           if (dismissalsChanged) {
             chrome.storage.local.set({
               pendingDismissals: items.pendingDismissals,
               recentDismissals: items.recentDismissals
@@ skipping 108 matching lines @@
   }
 
   // At this point we are guaranteed that the notification is a now card.
   chrome.metricsPrivate.recordUserAction('GoogleNow.Dismissed');
 
   tasks.add(DISMISS_CARD_TASK_NAME, function() {
     dismissalAttempts.start();
 
     instrumented.storage.local.get(
         ['pendingDismissals', 'notificationsData'], function(items) {
+      items = items || {};
       items.pendingDismissals = items.pendingDismissals || [];
       items.notificationsData = items.notificationsData || {};
 
       // Deleting the notification in case it was re-added while this task was
       // scheduled, waiting for execution; also cleaning notification's data
       // from storage.
       cardSet.clear(chromeNotificationId, true);
 
       var notificationData = items.notificationsData[chromeNotificationId];
 
@@ skipping 49 matching lines @@
   // determine if we are already running). To mitigate this, we will
   // shut everything down on initialize before starting everything up.
   stopPollingCards();
   onStateChange();
 }
 
 /**
  * Starts or stops the polling of cards.
  * @param {boolean} shouldPollCardsRequest true to start and
  *     false to stop polling cards.
- * @param {function} callback Called on completion.
  */
-function setShouldPollCards(shouldPollCardsRequest, callback) {
-  tasks.debugSetStepName(
-        'setShouldRun-shouldRun-updateCardsAttemptsIsRunning');
+function setShouldPollCards(shouldPollCardsRequest) {
   updateCardsAttempts.isRunning(function(currentValue) {
     if (shouldPollCardsRequest != currentValue) {
       console.log('Action Taken setShouldPollCards=' + shouldPollCardsRequest);
       if (shouldPollCardsRequest)
         startPollingCards();
       else
         stopPollingCards();
     } else {
       console.log(
           'Action Ignored setShouldPollCards=' + shouldPollCardsRequest);
     }
-    callback();
   });
 }
 
 /**
  * Shows or hides the toast.
  * @param {boolean} visibleRequest true to show the toast and
  *     false to hide the toast.
- * @param {function} callback Called on completion.
  */
-function setToastVisible(visibleRequest, callback) {
-  tasks.debugSetStepName(
-      'setToastVisible-shouldSetToastVisible-getAllNotifications');
+function setToastVisible(visibleRequest) {
   instrumented.notifications.getAll(function(notifications) {
     // TODO(vadimt): Figure out what to do when notifications are disabled for
     // our extension.
     notifications = notifications || {};
 
     if (visibleRequest != !!notifications[WELCOME_TOAST_NOTIFICATION_ID]) {
       console.log('Action Taken setToastVisible=' + visibleRequest);
       if (visibleRequest)
         showWelcomeToast();
       else
         hideWelcomeToast();
     } else {
       console.log('Action Ignored setToastVisible=' + visibleRequest);
     }
-
-    callback();
   });
 }
 
 /**
  * Enables or disables the Google Now background permission.
  * @param {boolean} backgroundEnable true to run in the background.
  *     false to not run in the background.
- * @param {function} callback Called on completion.
  */
-function setBackgroundEnable(backgroundEnable, callback) {
+function setBackgroundEnable(backgroundEnable) {
   instrumented.permissions.contains({permissions: ['background']},
       function(hasPermission) {
         if (backgroundEnable != hasPermission) {
           console.log('Action Taken setBackgroundEnable=' + backgroundEnable);
           if (backgroundEnable)
-            instrumented.permissions.request(
-                {permissions: ['background']},
-                function() {
-                  callback();
-                });
+            chrome.permissions.request({permissions: ['background']});
           else
-            instrumented.permissions.remove(
-                {permissions: ['background']},
-                function() {
-                  callback();
-                });
+            chrome.permissions.remove({permissions: ['background']});
         } else {
           console.log('Action Ignored setBackgroundEnable=' + backgroundEnable);
-          callback();
         }
       });
 }
 
 /**
  * Does the actual work of deciding what Google Now should do
  * based off of the current state of Chrome.
  * @param {boolean} signedIn true if the user is signed in.
  * @param {boolean} geolocationEnabled true if
  *     the geolocation option is enabled.
  * @param {boolean} userRespondedToToast true if
  *     the user has responded to the toast.
  * @param {boolean} enableBackground true if
  *     the background permission should be requested.
- * @param {function()} callback Call this function on completion.
  */
 function updateRunningState(
     signedIn,
     geolocationEnabled,
     userRespondedToToast,
-    enableBackground,
-    callback) {
+    enableBackground) {
   console.log(
       'State Update signedIn=' + signedIn + ' ' +
       'geolocationEnabled=' + geolocationEnabled + ' ' +
       'userRespondedToToast=' + userRespondedToToast);
 
   // TODO(vadimt): Remove this line once state machine design is finalized.
   geolocationEnabled = userRespondedToToast = true;
 
   var shouldSetToastVisible = false;
   var shouldPollCards = false;
@@ skipping 21 matching lines @@
     }
   } else {
     recordEvent(GoogleNowEvent.STOPPED);
   }
 
   console.log(
       'Requested Actions shouldSetBackground=' + shouldSetBackground + ' ' +
       'setToastVisible=' + shouldSetToastVisible + ' ' +
       'setShouldPollCards=' + shouldPollCards);
 
-  setBackgroundEnable(shouldSetBackground, function() {
-    setToastVisible(shouldSetToastVisible, function() {
-      setShouldPollCards(shouldPollCards, callback);
-    });
-  });
+  setBackgroundEnable(shouldSetBackground);
+  setToastVisible(shouldSetToastVisible);
+  setShouldPollCards(shouldPollCards);
 }
 
 /**
  * Coordinates the behavior of Google Now for Chrome depending on
  * Chrome and extension state.
  */
 function onStateChange() {
-  tasks.add(STATE_CHANGED_TASK_NAME, function(callback) {
-    tasks.debugSetStepName('onStateChange-isSignedIn');
+  tasks.add(STATE_CHANGED_TASK_NAME, function() {
     authenticationManager.isSignedIn(function(token) {
       var signedIn = !!token && !!NOTIFICATION_CARDS_URL;
       instrumented.metricsPrivate.getVariationParams(
           'GoogleNow',
           function(response) {
             var enableBackground =
                 (!response || (response.enableBackground != 'false'));
-            tasks.debugSetStepName(
-                'onStateChange-get-googleGeolocationAccessEnabledPref');
             instrumented.
                 preferencesPrivate.
                 googleGeolocationAccessEnabled.
                 get({}, function(prefValue) {
                   var geolocationEnabled = !!prefValue.value;
-                  tasks.debugSetStepName(
-                    'onStateChange-get-userRespondedToToast');
                   instrumented.storage.local.get(
                       'userRespondedToToast',
                       function(items) {
                         var userRespondedToToast =
                             !items || !!items.userRespondedToToast;
                         updateRunningState(
                             signedIn,
                             geolocationEnabled,
                             userRespondedToToast,
-                            enableBackground,
-                            callback);
+                            enableBackground);
                       });
                 });
           });
     });
   });
 }
 
 /**
  * Displays a toast to the user asking if they want to opt in to receiving
  * Google Now cards.
@@ skipping 79 matching lines @@
 
 instrumented.location.onLocationUpdate.addListener(function(position) {
   recordEvent(GoogleNowEvent.LOCATION_UPDATE);
   updateNotificationsCards(position);
 });
 
 instrumented.omnibox.onInputEntered.addListener(function(text) {
   localStorage['server_url'] = NOTIFICATION_CARDS_URL = text;
   initialize();
 });