Convert Google Now's use of chrome.local.storage.get to use Promises

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 46 matching lines @@
  */
 function mockInitializeDependencies(fixture) {
   fixture.makeAndRegisterMockGlobals([
     'recordEvent',
     'setBackgroundEnable',
     'startPollingCards'
   ]);
   fixture.makeAndRegisterMockApis([
     'authenticationManager.isSignedIn',
     'chrome.storage.local.remove',
+    'fillFromChromeLocalStorage',
     'instrumented.metricsPrivate.getVariationParams',
     'instrumented.notifications.getAll',
     'instrumented.notifications.getPermissionLevel',
-    '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().
@@ skipping 31 matching lines @@
 
   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)).
-       will(invokeCallback(
-          storageGetSavedArgs, 1, {googleNowEnabled: testGoogleNowEnabled}));
+  expectChromeLocalStorageGet(
+      fixture,
+      {googleNowEnabled: false},
+      {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 81 matching lines @@
 });
 
 /**
  * Mocks global functions and APIs that onNotificationClicked() depends upon.
  * @param {Test} fixture Test fixture.
  */
 function mockOnNotificationClickedDependencies(fixture) {
   fixture.makeAndRegisterMockApis([
       'chrome.windows.create',
       'chrome.windows.update',
-      'instrumented.storage.local.get',
+      'fillFromChromeLocalStorage',
       'instrumented.tabs.create']);
 }
 
 TEST_F(
     'GoogleNowBackgroundUnitTest',
     'OnNotificationClicked_NoData',
     function() {
       // Tests the case when there is no data associated with notification id.
       // In this case, the function should do nothing.
 
       // Setup and expectations.
       var testNotificationId = 'TEST_ID';
-      var testNotificationData = {};
+      var testNotificationDataRequest = {notificationsData: {}};
+      var testNotificationData = {notificationsData: {}};
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
-      var storageGetSavedArgs = new SaveMockArguments();
-      this.mockApis.expects(once()).
-          instrumented_storage_local_get(
-              storageGetSavedArgs.match(eq('notificationsData')),
-              storageGetSavedArgs.match(ANYTHING)).
-          will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
+      expectChromeLocalStorageGet(
+          this, testNotificationDataRequest, testNotificationData);
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });
 
 TEST_F(
     'GoogleNowBackgroundUnitTest',
     'OnNotificationClicked_ActionUrlsUndefined',
     function() {
       // Tests the case when the data associated with notification id is
       // 'undefined'.
       // In this case, the function should do nothing.
 
       // Setup and expectations.
       var testActionUrls = undefined;
       var testNotificationId = 'TEST_ID';
+      var testNotificationDataRequest = {notificationsData: {}};
       var testNotificationData = {
           notificationsData: {'TEST_ID': {actionUrls: testActionUrls}}
       };
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
-      var storageGetSavedArgs = new SaveMockArguments();
-      this.mockApis.expects(once()).
-          instrumented_storage_local_get(
-              storageGetSavedArgs.match(eq('notificationsData')),
-              storageGetSavedArgs.match(ANYTHING)).
-          will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
+      expectChromeLocalStorageGet(
+          this, testNotificationDataRequest, testNotificationData);
+
       this.mockLocalFunctions.expects(once()).selector(undefined).will(
           returnValue(undefined));
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });
 
 TEST_F(
     'GoogleNowBackgroundUnitTest',
     'OnNotificationClicked_TabCreateSuccess',
     function() {
       // Tests the selected URL is OK and crome.tabs.create suceeds.
 
       // Setup and expectations.
       var testActionUrls = {testField: 'TEST VALUE'};
       var testNotificationId = 'TEST_ID';
+      var testNotificationDataRequest = {notificationsData: {}};
       var testNotificationData = {
           notificationsData: {'TEST_ID': {actionUrls: testActionUrls}}
       };
       var testActionUrl = 'http://testurl.com';
       var testCreatedTab = {windowId: 239};
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
-      var storageGetSavedArgs = new SaveMockArguments();
-      this.mockApis.expects(once()).
-          instrumented_storage_local_get(
-              storageGetSavedArgs.match(eq('notificationsData')),
-              storageGetSavedArgs.match(ANYTHING)).
-          will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
+      expectChromeLocalStorageGet(
+          this, testNotificationDataRequest, testNotificationData);
       this.mockLocalFunctions.expects(once()).selector(testActionUrls).will(
           returnValue(testActionUrl));
       var chromeTabsCreateSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
           instrumented_tabs_create(
               chromeTabsCreateSavedArgs.match(eqJSON({url: testActionUrl})),
               chromeTabsCreateSavedArgs.match(ANYTHING)).
           will(invokeCallback(chromeTabsCreateSavedArgs, 1, testCreatedTab));
       this.mockApis.expects(once()).chrome_windows_update(
           testCreatedTab.windowId,
           eqJSON({focused: true}));
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });
 
 TEST_F(
     'GoogleNowBackgroundUnitTest',
     'OnNotificationClicked_TabCreateFail',
     function() {
       // Tests the selected URL is OK and crome.tabs.create fails.
       // In this case, the function should invoke chrome.windows.create as a
       // second attempt.
 
       // Setup and expectations.
       var testActionUrls = {testField: 'TEST VALUE'};
       var testNotificationId = 'TEST_ID';
+      var testNotificationDataRequest = {notificationsData: {}};
       var testNotificationData = {
         notificationsData: {'TEST_ID': {actionUrls: testActionUrls}}
       };
       var testActionUrl = 'http://testurl.com';
       var testCreatedTab = undefined; // chrome.tabs.create fails
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
-      var storageGetSavedArgs = new SaveMockArguments();
-      this.mockApis.expects(once()).
-          instrumented_storage_local_get(
-              storageGetSavedArgs.match(eq('notificationsData')),
-              storageGetSavedArgs.match(ANYTHING)).
-          will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
+      expectChromeLocalStorageGet(
+          this, testNotificationDataRequest, testNotificationData);
       this.mockLocalFunctions.expects(once()).selector(testActionUrls).will(
           returnValue(testActionUrl));
       var chromeTabsCreateSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
           instrumented_tabs_create(
               chromeTabsCreateSavedArgs.match(eqJSON({url: testActionUrl})),
               chromeTabsCreateSavedArgs.match(ANYTHING)).
           will(invokeCallback(chromeTabsCreateSavedArgs, 1, testCreatedTab));
       this.mockApis.expects(once()).chrome_windows_create(
           eqJSON({url: testActionUrl, focused: true}));
@@ skipping 277 matching lines @@
         }
       };
 
       var expectedUpdatedRecentDismissals = {
         c5: 1800001
       };
 
       var fakeOnCardShownFunction = 'FAKE ON CARD SHOWN FUNCTION';
 
       this.makeAndRegisterMockGlobals([
-        'scheduleNextPoll',
         'combineAndShowNotificationCards',
-        'recordEvent'
+        'recordEvent',
+        'scheduleNextPoll'
       ]);
 
       this.makeAndRegisterMockApis([
         'chrome.storage.local.set',
-        'instrumented.storage.local.get'
+        'fillFromChromeLocalStorage'
       ]);
 
-      var storageGetSavedArgs = new SaveMockArguments();
-      this.mockApis.expects(once()).
-          instrumented_storage_local_get(
-              storageGetSavedArgs.match(
-                  eq(['notificationGroups', 'recentDismissals'])),
-              storageGetSavedArgs.match(ANYTHING)).
-          will(invokeCallback(
-              storageGetSavedArgs,
-              1,
-              {
-                notificationGroups: storedGroups,
-                recentDismissals: recentDismissals
-              }));
+      expectChromeLocalStorageGet(
+          this,
+          {
+            notificationGroups: {},
+            recentDismissals: {}
+          },
+          {
+            notificationGroups: storedGroups,
+            recentDismissals: recentDismissals
+          });
 
       this.mockGlobals.expects(once()).
           scheduleNextPoll(eqJSON(expectedUpdatedGroups), true);
 
       var combineAndShowNotificationCardsSavedArgs = new SaveMockArguments();
       this.mockGlobals.expects(once()).
           combineAndShowNotificationCards(
               combineAndShowNotificationCardsSavedArgs.match(
                   eqJSON(expectedUpdatedGroups)),
               combineAndShowNotificationCardsSavedArgs.match(
@@ skipping 42 matching lines @@
           nextPollTime: 10001
         }
       };
 
       var expectedUpdatedGroups = {
       };
 
       var fakeOnCardShownFunction = 'FAKE ON CARD SHOWN FUNCTION';
 
       this.makeAndRegisterMockGlobals([
-        'scheduleNextPoll',
         'combineAndShowNotificationCards',
+        'onStateChange',
         'recordEvent',
-        'onStateChange'
+        'scheduleNextPoll'
       ]);
 
       this.makeAndRegisterMockApis([
         'chrome.storage.local.set',
-        'instrumented.storage.local.get'
+        'fillFromChromeLocalStorage'
       ]);
 
       this.mockApis.expects(once()).
           chrome_storage_local_set(
               eqJSON({googleNowEnabled: false}));
 
       this.mockGlobals.expects(once()).onStateChange();
 
-      var storageGetSavedArgs = new SaveMockArguments();
-      this.mockApis.expects(once()).
-          instrumented_storage_local_get(
-              storageGetSavedArgs.match(
-                  eq(['notificationGroups', 'recentDismissals'])),
-              storageGetSavedArgs.match(ANYTHING)).
-          will(invokeCallback(
-              storageGetSavedArgs, 1, {notificationGroups: storedGroups}));
+      expectChromeLocalStorageGet(
+          this,
+          {
+            notificationGroups: {},
+            recentDismissals: {}
+          },
+          {
+            notificationGroups: storedGroups,
+            recentDismissals: {}
+          });
 
       this.mockGlobals.expects(once()).
           scheduleNextPoll(eqJSON(expectedUpdatedGroups), false);
 
       var combineAndShowNotificationCardsSavedArgs = new SaveMockArguments();
       this.mockGlobals.expects(once()).
           combineAndShowNotificationCards(
               combineAndShowNotificationCardsSavedArgs.match(
                   eqJSON(expectedUpdatedGroups)),
               combineAndShowNotificationCardsSavedArgs.match(
                   ANYTHING),
               combineAndShowNotificationCardsSavedArgs.match(
                   eq(fakeOnCardShownFunction))).
           will(invokeCallback(combineAndShowNotificationCardsSavedArgs, 1));
 
       this.mockApis.expects(once()).
           chrome_storage_local_set(
               eqJSON({
                 notificationGroups: expectedUpdatedGroups,
                 recentDismissals: {}}));
 
       this.mockGlobals.expects(once()).
           recordEvent(GoogleNowEvent.CARDS_PARSE_SUCCESS);
 
       // Invoking the tested function.
       processServerResponse(serverResponse, fakeOnCardShownFunction);
     });