Fix assertion error when NaCl detector is stopped immediately after starting.

chrome/browser/resources/hotword/nacl_manager.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.
 
 cr.define('hotword', function() {
 'use strict';
 
 /**
  * Class used to manage the state of the NaCl recognizer plugin. Handles all
  * control of the NaCl plugin, including creation, start, stop, trigger, and
@@ skipping 154 matching lines @@
   } else {
     throw 'Attempting to start NaCl recogniser not in STOPPED or STOPPING ' +
         'state';
   }
 };
 
 /**
  * Stops the hotword recognizer.
  */
 NaClManager.prototype.stopRecognizer = function() {
+  if (this.recognizerState_ == ManagerState_.STARTING) {
+    // If the recognizer is stopped before it finishes starting, it causes an
+    // assertion to be raised in waitForMessage_() since we're waiting for the
+    // READY_FOR_AUDIO message. Clear the current timeout and expecting message
+    // since we no longer expect it and may never receive it.
+    this.clearTimeout_();
+    this.expectingMessage_ = null;
+  }
   this.sendDataToPlugin_(hotword.constants.NaClPlugin.STOP);
   this.recognizerState_ = ManagerState_.STOPPING;
   this.waitForMessage_(hotword.constants.TimeoutMs.NORMAL,
                        hotword.constants.NaClPlugin.STOPPED);
 };
 
 /**
  * Checks whether the file at the given path exists.
  * @param {!string} path Path to a file. Can be any valid URL.
  * @return {boolean} True if the patch exists.
@@ skipping 318 matching lines @@
         break;
     }
   }
 };
 
 return {
   NaClManager: NaClManager
 };
 
 });