Revert of Convert Google Now's Authentication Manager to use Promises (https://codereview.chromium.…

trunk/src/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 247 matching lines @@
   chrome.metricsPrivate.recordValue(metricDescription, event);
 }
 
 /**
  * Adds authorization behavior to the request.
  * @param {XMLHttpRequest} request Server request.
  * @param {function(boolean)} callbackBoolean Completion callback with 'success'
  *     parameter.
  */
 function setAuthorization(request, callbackBoolean) {
-  authenticationManager.getAuthToken().then(function(token) {
+  authenticationManager.getAuthToken(function(token) {
+    if (!token) {
+      callbackBoolean(false);
+      return;
+    }
+
     request.setRequestHeader('Authorization', 'Bearer ' + token);
 
     // Instrument onloadend to remove stale auth tokens.
     var originalOnLoadEnd = request.onloadend;
     request.onloadend = wrapper.wrapCallback(function(event) {
       if (request.status == HTTP_FORBIDDEN ||
           request.status == HTTP_UNAUTHORIZED) {
-        authenticationManager.removeToken(token).then(function() {
+        authenticationManager.removeToken(token, function() {
           originalOnLoadEnd(event);
         });
       } else {
         originalOnLoadEnd(event);
       }
     });
 
     callbackBoolean(true);
-  }).catch(function() {
-    callbackBoolean(false);
   });
 }
 
 /**
  * Shows parsed and combined cards as notifications.
  * @param {Object.<string, StoredNotificationGroup>} notificationGroups Map from
  *     group name to group information.
  * @param {Object.<ChromeNotificationId, CombinedCard>} cards Map from
  *     chromeNotificationId to the combined card, containing cards to show.
  * @param {function()} onSuccess Called on success.
@@ skipping 781 matching lines @@
   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() {
     Promise.all([
-        authenticationManager.isSignedIn(),
+        isSignedIn(),
         isGeolocationEnabled(),
         canEnableBackground(),
         isNotificationsEnabled(),
         isGoogleNowEnabled()])
         .then(function(results) {
           updateRunningState.apply(null, results);
         });
   });
 }
 
 /**
+ * Determines if the user is signed in.
+ * @return {Promise} A promise to evaluate the signed in state.
+ */
+function isSignedIn() {
+  return new Promise(function(resolve) {
+    authenticationManager.isSignedIn(function(signedIn) {
+      resolve(signedIn);
+    });
+  });
+}
+
+/**
  * Gets the geolocation enabled preference.
  * @return {Promise} A promise to get the geolocation enabled preference.
  */
 function isGeolocationEnabled() {
   return new Promise(function(resolve) {
     instrumented.preferencesPrivate.googleGeolocationAccessEnabled.get(
         {},
         function(prefValue) {
           resolve(!!prefValue.value);
         });
@@ skipping 153 matching lines @@
             lastPollNowPayloads: items.lastPollNowPayloads,
             notificationGroups: items.notificationGroups
           });
 
           updateNotificationsCards();
         }
       });
     });
   }
 });