| Index: chrome/browser/resources/google_now/common_test_util.js
|
| diff --git a/chrome/browser/resources/google_now/common_test_util.js b/chrome/browser/resources/google_now/common_test_util.js
|
| index fe5708234b67dfa7bcb38b8036e4f7bcd4ffc496..547d65e576f0a807abb04a3b1b976b09aa4c2e13 100644
|
| --- a/chrome/browser/resources/google_now/common_test_util.js
|
| +++ b/chrome/browser/resources/google_now/common_test_util.js
|
| @@ -40,11 +40,9 @@ function mockChromeEvent(topLevelContainer, eventIdentifier) {
|
| var originalMethodContainer = topLevelContainer;
|
| var mockEventContainer = mockEventHandlers;
|
| eventIdentifierParts.forEach(function(fragment) {
|
| - originalMethodContainer =
|
| - originalMethodContainer[fragment] =
|
| + originalMethodContainer = originalMethodContainer[fragment] =
|
| originalMethodContainer[fragment] || {};
|
| - mockEventContainer =
|
| - mockEventContainer[fragment] =
|
| + mockEventContainer = mockEventContainer[fragment] =
|
| mockEventContainer[fragment] || {};
|
| });
|
|
|
| @@ -103,14 +101,16 @@ var Promise = function() {
|
| funcResult = rejectResult;
|
| funcResolved = false;
|
| });
|
| - return { result: funcResult, resolved: funcResolved };
|
| + return {result: funcResult, resolved: funcResolved};
|
| }
|
|
|
| function then(onResolve, onReject) {
|
| - var resolutionHandler =
|
| - isCallable(onResolve) ? onResolve : function() { return result; };
|
| - var rejectionHandler =
|
| - isCallable(onReject) ? onReject : function() { return result; };
|
| + var resolutionHandler = isCallable(onResolve) ? onResolve : function() {
|
| + return result;
|
| + };
|
| + var rejectionHandler = isCallable(onReject) ? onReject : function() {
|
| + return result;
|
| + };
|
| var handlerResult =
|
| resolved ? resolutionHandler(result) : rejectionHandler(result);
|
| var promiseResolved = resolved;
|
| @@ -194,12 +194,12 @@ var Promise = function() {
|
| function expectChromeLocalStorageGet(
|
| fixture, defaultObject, result, opt_AllowRejection) {
|
| if (opt_AllowRejection === undefined) {
|
| - fixture.mockApis.expects(once()).
|
| - fillFromChromeLocalStorage(eqJSON(defaultObject)).
|
| - will(returnValue(Promise.resolve(result)));
|
| + 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)));
|
| + fixture.mockApis.expects(once())
|
| + .fillFromChromeLocalStorage(eqJSON(defaultObject), opt_AllowRejection)
|
| + .will(returnValue(Promise.resolve(result)));
|
| }
|
| }
|
|
|