Fix ChromeVox next tests to fail instead of timing out where applicable.

chrome/browser/resources/chromeos/chromevox/testing/chromevox_unittest_base.js

 // Copyright 2014 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.
 
 GEN_INCLUDE([
     'chrome/browser/resources/chromeos/chromevox/testing/assert_additions.js']);
 GEN_INCLUDE([
-  'chrome/browser/resources/chromeos/chromevox/testing/common.js']);
+  'chrome/browser/resources/chromeos/chromevox/testing/common.js',
+  'chrome/browser/resources/chromeos/chromevox/testing/callback_helper.js']);
 
 /**
  * Base test fixture for ChromeVox unit tests.
  *
  * Note that while conceptually these are unit tests, these tests need
  * to run in a full web page, so they're actually run as WebUI browser
  * tests.
  *
  * @constructor
  * @extends {testing.Test}
  */
-function ChromeVoxUnitTestBase() {}
+function ChromeVoxUnitTestBase() {
+  if (this.isAsync) {
+    this.callbackHelper_ = new CallbackHelper(this);
+  }
+}
 
 ChromeVoxUnitTestBase.prototype = {
   __proto__: testing.Test.prototype,
 
   /** @override */
   closureModuleDeps: [
     'cvox.ChromeVoxTester',
     'cvox.ChromeVoxUserCommands',
     'cvox.SpokenListBuilder',
   ],
@@ skipping 77 matching lines @@
   /**
    * Waits for the queued events in ChromeVoxEventWatcher to be
    * handled, then calls a callback function with provided arguments
    * in the test case scope. Very useful for asserting the results of events.
    *
    * @param {function()} func A function to call when ChromeVox is ready.
    * @param {*} var_args Additional arguments to pass through to the function.
    * @return {ChromeVoxUnitTestBase} this.
    */
   waitForCalm: function(func, var_args) {
-    var me = this;
     var calmArguments = Array.prototype.slice.call(arguments);
     calmArguments.shift();
-    cvox.ChromeVoxEventWatcher.addReadyCallback(function() {
-      func.apply(me, calmArguments);
-    });
+    cvox.ChromeVoxEventWatcher.addReadyCallback(this.newCallback(function() {
+      func.apply(this, calmArguments);
+    }));
     return this; // for chaining.
   },
 
   /**
    * Asserts the TTS engine spoke a certain string. Clears the TTS buffer.
    * @param {string} expectedText The expected text.
    * @return {ChromeVoxUnitTestBase} this.
    */
   assertSpoken: function(expectedText) {
     assertEquals(expectedText,
@@ skipping 49 matching lines @@
   userCommand: function(command) {
     cvox.ChromeVoxUserCommands.commands[command]();
     return this; // for chaining.
   },
 
   /**
    * @return {cvox.SpokenListBuilder} A new builder.
    */
   spokenList: function() {
     return new cvox.SpokenListBuilder();
+  },
+
+  /**
+   * @type {CallbackHelper}
+   * @private
+   */
+  callbackHelper_: null,
+
+  /**
+   * Creates a callback that optionally calls {@code opt_callback} when
+   * called.  If this method is called one or more times, then
+   * {@code testDone()} will be called when all callbacks have been called.
+   * @param {Function=} opt_callback Wrapped callback that will have its this
+   *        reference bound to the test fixture.
+   * @return {Function}
+   */
+  newCallback: function(opt_callback) {
+    assertNotEquals(null, this.callbackHelper_);
+    return this.callbackHelper_.wrap(opt_callback);
   }
 };