| Index: chrome/browser/resources/google_now/utility_unittest.gtestjs
|
| diff --git a/chrome/browser/resources/google_now/utility_unittest.gtestjs b/chrome/browser/resources/google_now/utility_unittest.gtestjs
|
| index 64ba1d84b5a9166b0716144599e35a2dbc7c1f65..8a10e7a68eb493cb1a39f0fd3d3e2100e2683fb4 100644
|
| --- a/chrome/browser/resources/google_now/utility_unittest.gtestjs
|
| +++ b/chrome/browser/resources/google_now/utility_unittest.gtestjs
|
| @@ -207,7 +207,7 @@ TEST_F('GoogleNowUtilityUnitTest', 'WrapperWrapCallbackEvent', function() {
|
| 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').
|
| @@ -242,7 +242,7 @@ TEST_F('GoogleNowUtilityUnitTest', 'WrapperWrapCallbackPlugin', function() {
|
| // Step 2. Wrap a callback.
|
| // Expectations.
|
| this.mockLocalFunctions.expects(once()).
|
| - pluginFactory().
|
| + pluginFactory(undefined).
|
| will(returnValue({
|
| prologue: this.mockLocalFunctions.functions().prologue,
|
| epilogue: this.mockLocalFunctions.functions().epilogue
|
| @@ -348,7 +348,7 @@ TEST_F('GoogleNowUtilityUnitTest',
|
| // Step 6. Invoke the API with another callback.
|
| // Expectations.
|
| this.mockLocalFunctions.expects(once()).
|
| - pluginFactory().
|
| + pluginFactory(undefined).
|
| will(returnValue({
|
| prologue: this.mockLocalFunctions.functions().prologue,
|
| epilogue: this.mockLocalFunctions.functions().epilogue
|
| @@ -505,7 +505,7 @@ function setUpTaskManagerTest(fixture) {
|
| 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);
|
|
|
| @@ -688,7 +688,7 @@ TEST_F('GoogleNowUtilityUnitTest', 'TaskManagerSuspendSuccess', function() {
|
| });
|
|
|
| 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.
|
|
|
|
|