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

chrome/browser/resources/google_now/cards_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.
 
 /**
  * Test fixture for cards.js.
  * @constructor
  * @extends {testing.Test}
  */
 function GoogleNowCardsUnitTest () {
@@ skipping 35 matching lines @@
 var testDismissalB = {testDismissalField: 'TEST DISMISSAL VALUE B'};
 var EXPLANATORY_CARDS_LINK_THRESHOLD = 4;
 var localStorage = {explanatoryCardsShown: 0};
 var notificationUpdateSuccessful = true;
 var notificationUpdateFailed = false;
 
 function setUpCardManagerTest(fixture) {
   fixture.makeAndRegisterMockApis([
       'chrome.alarms.clear',
       'chrome.alarms.create',
-      'instrumented.notifications.clear',
       'chrome.storage.local.set',
       'countExplanatoryCard',
+      'fillFromChromeLocalStorage',
       'instrumented.alarms.onAlarm.addListener',
+      'instrumented.notifications.clear',
       'instrumented.notifications.create',
       'instrumented.notifications.update',
-      'instrumented.storage.local.get',
       'tasks.add'
   ]);
 
   chrome.runtime = {}; // No error.
 
   var onAlarmSavedArgs = new SaveMockArguments();
   fixture.mockApis.expects(once()).
       instrumented_alarms_onAlarm_addListener(
           onAlarmSavedArgs.match(ANYTHING));
 
@@ skipping 430 matching lines @@
   };
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   var tasksAddSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       tasks_add(
           tasksAddSavedArgs.match(eq(UPDATE_CARD_TASK_NAME)),
           tasksAddSavedArgs.match(ANYTHING)).
       will(invokeCallback(tasksAddSavedArgs,1));
-  var storageGetSavedArgs = new SaveMockArguments();
-  this.mockApis.expects(once()).
-      instrumented_storage_local_get(
-          storageGetSavedArgs.match(
-              eqJSON(['notificationsData', 'notificationGroups'])),
-          storageGetSavedArgs.match(ANYTHING)).
-      will(invokeCallback(
-          storageGetSavedArgs,
-          1,
-          {
-            notificationsData: {
-              'TEST CARD ID': {
-                actionUrls: testActionUrlsA,
-                timestamp: 299998,
-                combinedCard: [testUncombinedNotification]
-              },
-              'TEST CARD ID 1': {testField: 'TEST VALUE 1'}
-            },
-            notificationGroups: {
-              A: {
-                cards: [
-                  {chromeNotificationId: 'ID1'},
-                  {chromeNotificationId: testCardId}
-                ]
-              },
-              B: {
-                cards: [
-                  {chromeNotificationId: testCardId},
-                  {chromeNotificationId: 'ID2'}
-                ]
-            }}}));
+  expectChromeLocalStorageGet(
+      this,
+      {
+        notificationsData: {},
+        notificationGroups: {}
+      },
+      {
+        notificationsData: {
+          'TEST CARD ID': {
+            actionUrls: testActionUrlsA,
+            timestamp: 299998,
+            combinedCard: [testUncombinedNotification]
+          },
+          'TEST CARD ID 1': {testField: 'TEST VALUE 1'}
+        },
+        notificationGroups: {
+          A: {
+            cards: [
+              {chromeNotificationId: 'ID1'},
+              {chromeNotificationId: testCardId}
+            ]
+          },
+          B: {
+            cards: [
+              {chromeNotificationId: testCardId},
+              {chromeNotificationId: 'ID2'}
+            ]
+        }}});
   this.mockApis.expects(once()).
       instrumented_notifications_clear(testCardId, ANYTHING);
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedAlarmId);
   this.mockApis.expects(once()).
       chrome_storage_local_set(eqJSON({
         notificationsData: {
           'TEST CARD ID 1': {testField: 'TEST VALUE 1'}
         },
         notificationGroups: {
@@ skipping 24 matching lines @@
   };
 
   // Setup and expectations.
   var test = setUpCardManagerTest(this);
   var tasksAddSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       tasks_add(
           tasksAddSavedArgs.match(eq(UPDATE_CARD_TASK_NAME)),
           tasksAddSavedArgs.match(ANYTHING)).
       will(invokeCallback(tasksAddSavedArgs,1));
-  var storageGetSavedArgs = new SaveMockArguments();
-  this.mockApis.expects(once()).
-      instrumented_storage_local_get(
-          storageGetSavedArgs.match(
-              eqJSON(['notificationsData', 'notificationGroups'])),
-          storageGetSavedArgs.match(ANYTHING)).
-      will(invokeCallback(
-          storageGetSavedArgs,
-          1,
-          {
-            notificationsData: {
-              'TEST CARD ID': {
-                actionUrls: testActionUrlsA,
-                timestamp: 299998,
-                combinedCard: [testUncombinedNotification]
-              }}}));
+  expectChromeLocalStorageGet(
+      this,
+      {
+        notificationsData: {},
+        notificationGroups: {}
+      },
+      {
+        notificationsData: {
+          'TEST CARD ID': {
+            actionUrls: testActionUrlsA,
+            timestamp: 299998,
+            combinedCard: [testUncombinedNotification]
+          }},
+        notificationGroups: {}
+      });
   this.mockApis.expects(once()).
       chrome_alarms_clear(expectedAlarmId);
   var chromeNotificationsUpdateSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_notifications_update(
           chromeNotificationsUpdateSavedArgs.match(eq(testCardId)),
           chromeNotificationsUpdateSavedArgs.match(eqJSON(testNotificationA)),
           chromeNotificationsUpdateSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           chromeNotificationsUpdateSavedArgs, 2, notificationUpdateSuccessful));
   this.mockApis.expects(once()).
       chrome_alarms_create(expectedAlarmId, eqJSON({when: 300001}));
   this.mockApis.expects(once()).
       chrome_storage_local_set(eqJSON({
             notificationsData: {
               'TEST CARD ID': {
                 actionUrls: testActionUrlsA,
                 timestamp: 300000,
                 combinedCard: [testUncombinedNotification]
               }
             },
             notificationGroups: {
             }}));
 
   // Call tested method.
   test.alarmCallback({name: expectedAlarmId});
 });