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

chrome/browser/resources/google_now/common_test_util.js

 // 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.
 
 // Common test utilities.
 
 /**
  * Allows console.log output.
  */
 var showConsoleLogOutput = false;
@@ skipping 111 matching lines @@
         });
       } else {
         results[i] = arrayOfPromises[i];
       }
     }
     var promise = new PromisePrototypeObject(function(resolve) {
       resolve(results);
     });
     return promise;
   }
+
+  function resolve(value) {
+    var promise = new PromisePrototypeObject(function(resolve) {
+      resolve(value);
+    });
+    return promise;
+  }
+
   PromisePrototypeObject.all = all;
+  PromisePrototypeObject.resolve = resolve;
   return PromisePrototypeObject;
 }();
+
+
+/**
+ * Sets up the test to expect a Chrome Local Storage call.
+ * @param {Object} fixture Mock JS Test Object.
+ * @param {Object} defaultObject Storage request default object.
+ * @param {Object} result Storage result.
+ * @param {boolean=} opt_AllowRejection Allow Promise Rejection
+ */
+function expectChromeLocalStorageGet(
+    fixture, defaultObject, result, opt_AllowRejection) {
+  if (opt_AllowRejection === undefined) {
+    fixture.mockApis.expects(once()).
+      fillFromChromeLocalStorage(eqJSON(defaultObject)).
+      will(returnValue(Promise.resolve(result)));
+  } else {
+    fixture.mockApis.expects(once()).
+      fillFromChromeLocalStorage(eqJSON(defaultObject), opt_AllowRejection).
+      will(returnValue(Promise.resolve(result)));
+  }
+}