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

trunk/src/chrome/browser/resources/google_now/background_unittest.gtestjs

 // Copyright 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.
 
 // TODO(robliao,vadimt): Determine the granularity of testing to perform.
 
 /**
  * Test fixture for background.js.
  * @constructor
  * @extends {testing.Test}
@@ skipping 52 matching lines @@
   ]);
   fixture.makeAndRegisterMockApis([
     'authenticationManager.isSignedIn',
     'chrome.location.clearWatch',
     'chrome.storage.local.remove',
     'instrumented.metricsPrivate.getVariationParams',
     'instrumented.notifications.getAll',
     'instrumented.notifications.getPermissionLevel',
     'instrumented.preferencesPrivate.googleGeolocationAccessEnabled.get',
     'instrumented.storage.local.get',
-    'instrumented.webstorePrivate.getBrowserLogin',
     'tasks.add',
     'updateCardsAttempts.isRunning',
     'updateCardsAttempts.stop'
   ]);
 }
 
 /**
  * Sets up the test to expect the state machine calls and send
  * the specified state machine state. Currently used to test initialize().
  * Note that this CAN NOT be used if any of the methods below are called
  * outside of this context with the same argument matchers.
  * expects() calls cannot be chained with the same argument matchers.
  * @param {object} fixture Test fixture.
  * @param {string} testIdentityToken getAuthToken callback token.
  * @param {boolean} testGeolocationPref Geolocation Preference callback value.
  * @param {object} testExperimentVariationParams Response of
  *     metricsPrivate.getVariationParams.
  * @param {string} testExperimentVariationParams Response of
  *     notifications.getPermissionLevel.
  * @param {boolean} testGoogleNowEnabled True if the user is opted in to Google
  *     Now.
  */
 function expectStateMachineCalls(
     fixture,
     testIdentityToken,
     testGeolocationPref,
     testExperimentVariationParams,
     testNotificationPermissionLevel,
     testGoogleNowEnabled) {
+  var authenticationManagerIsSignedInSavedArgs = new SaveMockArguments();
   fixture.mockApis.expects(once()).
-      authenticationManager_isSignedIn().
-      will(returnValue(new Promise(function(resolve) {
-        resolve(!!testIdentityToken);
-      })));
+      authenticationManager_isSignedIn(
+          authenticationManagerIsSignedInSavedArgs.match(ANYTHING)).
+      will(invokeCallback(
+          authenticationManagerIsSignedInSavedArgs,
+          0,
+          testIdentityToken));
 
   var getVariationParamsSavedArgs = new SaveMockArguments();
   fixture.mockApis.expects(once()).
       instrumented_metricsPrivate_getVariationParams(
           getVariationParamsSavedArgs.match(ANYTHING),
           getVariationParamsSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           getVariationParamsSavedArgs, 1, testExperimentVariationParams));
 
   var googleGeolocationPrefGetSavedArgs = new SaveMockArguments();
   fixture.mockApis.expects(once()).
       instrumented_preferencesPrivate_googleGeolocationAccessEnabled_get(
           googleGeolocationPrefGetSavedArgs.match(eqJSON({})),
           googleGeolocationPrefGetSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           googleGeolocationPrefGetSavedArgs, 1, {value: testGeolocationPref}));
 
   var notificationGetPermissionLevelSavedArgs = new SaveMockArguments();
   fixture.mockApis.expects(once()).
       instrumented_notifications_getPermissionLevel(
           notificationGetPermissionLevelSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           notificationGetPermissionLevelSavedArgs,
           0,
           testNotificationPermissionLevel))
 
-   var storageGetSavedArgs = new SaveMockArguments();
-   fixture.mockApis.expects(once()).
-       instrumented_storage_local_get(
-           storageGetSavedArgs.match(eq('googleNowEnabled')),
-           storageGetSavedArgs.match(ANYTHING)).
+   var storageGetSavedArgs = new SaveMockArguments();    
+   fixture.mockApis.expects(once()).     
+       instrumented_storage_local_get(   
+           storageGetSavedArgs.match(eq('googleNowEnabled')),    
+           storageGetSavedArgs.match(ANYTHING)).         
        will(invokeCallback(
-          storageGetSavedArgs, 1, {googleNowEnabled: testGoogleNowEnabled}));
+          storageGetSavedArgs, 1, {googleNowEnabled: testGoogleNowEnabled}));    
 
   fixture.mockGlobals.expects(once()).
       setBackgroundEnable(ANYTHING);
 }
 
 /**
  * Sets up the test to expect the initialization calls that
  * initialize() invokes.
  * Note that this CAN NOT be used if any of the methods below are called
  * outside of this context with the same argument matchers.
@@ skipping 437 matching lines @@
           receivedNotificationWithShowTime
         ]
       };
 
       // Invoking the tested function.
       combineGroup(combinedCards, storedGroup);
 
       // Check the output value.
       var expectedCombinedCards = {
         'EXISTING CARD': [
-          1,
+          1, 
           {
             receivedNotification: receivedNotificationNoShowTime,
             hideTime: 11000
           }
         ],
         'NEW CARD': [
           {
             receivedNotification: receivedNotificationWithShowTime,
             showTime: 12000,
             hideTime: 13000
@@ skipping 278 matching lines @@
               eqJSON({
                 notificationGroups: expectedUpdatedGroups,
                 recentDismissals: {}}));
 
       this.mockGlobals.expects(once()).
           recordEvent(GoogleNowEvent.CARDS_PARSE_SUCCESS);
 
       // Invoking the tested function.
       processServerResponse(serverResponse, fakeOnCardShownFunction);
     });