Fixes hotword nacl handler to support the new behavior.

chrome/browser/resources/app_list/plugin_manager.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.
 
 /**
  * @fileoverview The manager of offline hotword speech recognizer plugin.
  */
 
 cr.define('speech', function() {
   'use strict';
 
   /**
    * The type of the plugin state.
    ** @enum {number}
    */
   var PluginState = {
     UNINITIALIZED: 0,
     LOADED: 1,
-    SAMPLING_RATE_READY: 2,
-    READY: 3,
-    RECOGNIZING: 4
+    READY: 2,
+    RECOGNIZING: 3
   };
 
   /**
    * The command names of the plugin.
    * @enum {string}
    */
   var pluginCommands = {
     SET_SAMPLING_RATE: 'h',
     SET_CONFIG: 'm',
     START_RECOGNIZING: 'r',
     STOP_RECOGNIZING: 's'
   };
 
   /**
    * The regexp pattern of the hotword recognition result.
    */
-  var recognitionPattern = /^HotwordFiredEvent:/;
+  var recognitionPattern = /^(HotwordFiredEvent:|hotword)/;
 
   /**
    * @constructor
    */
   function PluginManager(onReady, onRecognized) {
     this.state = PluginState.UNINITIALIZED;
     this.onReady_ = onReady;
     this.onRecognized_ = onRecognized;
     this.samplingRate_ = null;
     this.config_ = null;
@@ skipping 11 matching lines @@
     recognizer.addEventListener('load', this.onLoad_.bind(this));
   };
 
   /**
    * The event handler of the plugin status.
    *
    * @param {Event} messageEvent the event object from the plugin.
    * @private
    */
   PluginManager.prototype.onMessage_ = function(messageEvent) {
-    if (this.state == PluginState.LOADED) {
-      if (messageEvent.data == 'stopped')
-        this.state = PluginState.SAMPLING_RATE_READY;
-      return;
-    }
-
     if (messageEvent.data == 'audio') {
-      if (this.state < PluginState.READY)
+      var wasNotReady = this.state < PluginState.READY;
+      this.state = PluginState.RECOGNIZING;
+      if (wasNotReady)
         this.onReady_(this);
-      this.state = PluginState.RECOGNIZING;
-    } else if (messageEvent.data == 'stopped') {
+    } else if (messageEvent.data == 'stopped' &&
+               this.state == PluginState.RECOGNIZING) {
       this.state = PluginState.READY;
     } else if (recognitionPattern.exec(messageEvent.data)) {
       this.onRecognized_();
     }
   };
 
   /**
    * The event handler when the plugin is loaded.
    *
    * @private
@@ skipping 60 matching lines @@
   PluginManager.prototype.sendAudioData = function(event) {
     if (this.state == PluginState.RECOGNIZING)
       $('recognizer').postMessage(event.data.buffer);
   };
 
   return {
     PluginManager: PluginManager,
     PluginState: PluginState,
   };
 });