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

chrome/browser/resources/google_now/utility_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 utility.js.
  * @constructor
  * @extends {testing.Test}
  */
 function GoogleNowUtilityUnitTest () {
@@ skipping 189 matching lines @@
       callback('test string', 239).
       will(callFunction(function() {
         wrapper.checkInWrappedCallback(); // it should succeed
       }));
 
   // Invoking tested function.
   wrappedCallback('test string', 239);
   Mock4JS.verifyAllMocks();
 
   // Step 3. Check that after the callback we are again in non-instrumented
-  // code. 
+  // code.
   // Expectations.
   this.mockGlobals.expects(once()).
       buildErrorWithMessageForServer('Not in instrumented callback').
       will(returnValue(testError));
   this.mockGlobals.expects(once()).
       reportError(eqJSON(testError));
 
   // Invocation.
   wrapper.checkInWrappedCallback();
 
@@ skipping 277 matching lines @@
 
   return {
     tasks: tasks,
     pluginFactory: registerWrapperPluginFactorySavedArgs.arguments[0]
   };
 }
 
 TEST_F('GoogleNowUtilityUnitTest', 'TaskManager2Sequential', function() {
   // Tests that 2 tasks get successfully executed consecutively, even if the
   // second one conflicts with the first.
-  
+
   // Setup.
   var test = setUpTaskManagerTest(this);
 
   // Step 1. Add 1st task that doesn't create pending callbacks.
   // Expectations.
   this.mockLocalFunctions.expects(once()).task1();
   // Invocation.
   test.tasks.add(taskNameA, this.mockLocalFunctions.functions().task1);
   Mock4JS.verifyAllMocks();
 
@@ skipping 162 matching lines @@
 
   // Step 2. Invoke task's callback and the onSuspend event of the task manager.
   // The 2 callbacks in onSuspendHandlerContainer are from the wrapper and the
   // task manager.
   task1PluginInstance.prologue();
   task1PluginInstance.epilogue();
   onSuspendHandlerContainer[1]();
 });
 
 TEST_F('GoogleNowUtilityUnitTest', 'TaskManager3Tasks', function() {
-  // Tests that 3 tasks can be executed too. In particular, that if the second 
+  // Tests that 3 tasks can be executed too. In particular, that if the second
   // task is a single-step task which execution was originally blocked by task1,
   // unblocking it causes immediate synchronous execution of both tasks 2 and 3.
 
   // Setup.
   var test = setUpTaskManagerTest(this);
   var task1PluginInstance;
 
   // Step 1. Add 1st task that creates a pending callback.
   // Expectations.
   this.mockLocalFunctions.expects(once()).task1().
@@ skipping 59 matching lines @@
 var testAttemptAlarmName = 'attempt-scheduler-testAttempts';
 var testAttemptStorageKey = 'current-delay-testAttempts';
 var testInitialDelaySeconds = 239;
 var testMaximumDelaySeconds = 2239;
 // Value to be returned by mocked Math.random(). We want the value returned by
 // Math.random() to be predictable to be able to check results against expected
 // values. A fixed seed would be okay, but fixed seeding isn't possible in JS at
 // the moment.
 var testRandomValue = 0.31415926;
 
-function createTestAttempStorageEntry(delaySeconds) {
-  // Creates a test storage object that attempt manager uses to store current
-  // delay.
+/**
+ * Creates a default storage current delay object.
+ */
+function createTestAttemptStorageEntryRequest() {
+  var storageObject = {};
+  storageObject[testAttemptStorageKey] = undefined;
+  return storageObject;
+}
+
+/**
+ * Creates a test storage object that attempt manager uses to store current
+ * delay.
+ */
+function createTestAttemptStorageEntry(delaySeconds) {
   var storageObject = {};
   storageObject[testAttemptStorageKey] = delaySeconds;
   return storageObject;
 }
 
 function setupAttemptManagerTest(fixture) {
   Math.random = function() { return testRandomValue; }
 
   fixture.makeMockLocalFunctions([
     'attempt',
     'planForNextCallback',
     'isRunningCallback'
   ]);
   fixture.makeAndRegisterMockApis([
     'chrome.alarms.clear',
     'chrome.alarms.create',
     'chrome.storage.local.remove',
     'chrome.storage.local.set',
-    'instrumented.alarms.get',
-    'instrumented.storage.local.get'
+    'fillFromChromeLocalStorage',
+    'instrumented.alarms.get'
   ]);
 
   var testAttempts = buildAttemptManager(
       'testAttempts',
       fixture.mockLocalFunctions.functions().attempt,
       testInitialDelaySeconds,
       testMaximumDelaySeconds);
   Mock4JS.verifyAllMocks();
 
   return {
@@ skipping 25 matching lines @@
   // Expectations.
   var expectedRetryDelaySeconds =
       testInitialDelaySeconds * (1 + testRandomValue * 0.2);
   this.mockApis.expects(once()).chrome_alarms_create(
     testAttemptAlarmName,
     eqJSON({
       delayInMinutes: expectedRetryDelaySeconds / 60,
       periodInMinutes: testMaximumDelaySeconds / 60
     }));
   this.mockApis.expects(once()).chrome_storage_local_set(
-      eqJSON(createTestAttempStorageEntry(expectedRetryDelaySeconds)));
+      eqJSON(createTestAttemptStorageEntry(expectedRetryDelaySeconds)));
   // Invocation.
   test.attempts.start();
   Mock4JS.verifyAllMocks();
 
   // Step 3. Check that attempt manager is running.
   // Expectations.
   alarmsGetSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_alarms_get(
           alarmsGetSavedArgs.match(eq(testAttemptAlarmName)),
@@ skipping 45 matching lines @@
 
   // Setup.
   var test = setupAttemptManagerTest(this);
   var testStoredRetryDelay = 433;
 
   // Call planForNext, which prepares next attempt. Current retry time
   // is less than 1/2 of the maximum delay.
   // Expectations.
   var expectedRetryDelaySeconds =
       testStoredRetryDelay * 2 * (1 + testRandomValue * 0.2);
-  var storageGetSavedArgs = new SaveMockArguments();
-  this.mockApis.expects(once()).instrumented_storage_local_get(
-          storageGetSavedArgs.match(eq(testAttemptStorageKey)),
-          storageGetSavedArgs.match(ANYTHING)).
-      will(invokeCallback(
-          storageGetSavedArgs,
-          1,
-          createTestAttempStorageEntry(testStoredRetryDelay)));
+  expectChromeLocalStorageGet(
+      this,
+      createTestAttemptStorageEntryRequest(),
+      createTestAttemptStorageEntry(testStoredRetryDelay),
+      true);
   this.mockApis.expects(once()).chrome_alarms_create(
       testAttemptAlarmName,
       eqJSON({
         delayInMinutes: expectedRetryDelaySeconds / 60,
         periodInMinutes: testMaximumDelaySeconds / 60}));
   this.mockApis.expects(once()).chrome_storage_local_set(
-      eqJSON(createTestAttempStorageEntry(expectedRetryDelaySeconds)));
+      eqJSON(createTestAttemptStorageEntry(expectedRetryDelaySeconds)));
   this.mockLocalFunctions.expects(once()).planForNextCallback();
   // Invocation.
   test.attempts.planForNext(
       this.mockLocalFunctions.functions().planForNextCallback);
 });
 
 TEST_F('GoogleNowUtilityUnitTest', 'AttemptManagerGrowthLimit', function() {
   // Tests that retry time stops growing at the maximum value.
 
   // Setup.
   var test = setupAttemptManagerTest(this);
   var testStoredRetryDelay = 1500;
 
   // Call planForNext, which prepares next attempt. Current retry time
   // is greater than 1/2 of the maximum delay.
   // Expectations.
   var expectedRetryDelaySeconds = testMaximumDelaySeconds;
-  var storageGetSavedArgs = new SaveMockArguments();
-  this.mockApis.expects(once()).
-      instrumented_storage_local_get(
-          storageGetSavedArgs.match(eq(testAttemptStorageKey)),
-          storageGetSavedArgs.match(ANYTHING)).
-      will(invokeCallback(
-          storageGetSavedArgs,
-          1,
-          createTestAttempStorageEntry(testStoredRetryDelay)));
+  expectChromeLocalStorageGet(
+      this,
+      createTestAttemptStorageEntryRequest(),
+      createTestAttemptStorageEntry(testStoredRetryDelay),
+      true);
   this.mockApis.expects(once()).chrome_alarms_create(
       testAttemptAlarmName,
       eqJSON({
         delayInMinutes: expectedRetryDelaySeconds / 60,
         periodInMinutes: testMaximumDelaySeconds / 60
       }));
   this.mockApis.expects(once()).chrome_storage_local_set(
-      eqJSON(createTestAttempStorageEntry(expectedRetryDelaySeconds)));
+      eqJSON(createTestAttemptStorageEntry(expectedRetryDelaySeconds)));
   this.mockLocalFunctions.expects(once()).planForNextCallback();
   // Invocation.
   test.attempts.planForNext(
       this.mockLocalFunctions.functions().planForNextCallback);
 });
 
 TEST_F('GoogleNowUtilityUnitTest', 'AttemptManagerAlarm', function() {
   // Tests that firing the alarm invokes the attempt.
 
   // Setup.
   var test = setupAttemptManagerTest(this);
   var onAlarmHandlerContainer = getMockHandlerContainer('alarms.onAlarm');
   assertEquals(1, onAlarmHandlerContainer.length);
 
   // Fire the alarm and check that this invokes the attempt callback.
   // Expectations.
   var alarmsGetSavedArgs = new SaveMockArguments();
   this.mockApis.expects(once()).
       instrumented_alarms_get(
           alarmsGetSavedArgs.match(eq(testAttemptAlarmName)),
           alarmsGetSavedArgs.match(ANYTHING)).
       will(invokeCallback(alarmsGetSavedArgs, 1, {testField: 'TEST VALUE'}));
   this.mockLocalFunctions.expects(once()).attempt();
   // Invocation.
   onAlarmHandlerContainer[0]({name: testAttemptAlarmName});
 });