Fixes hotword nacl handler to support the new behavior.

- 'stopped' won't appear during initialization, the check doesn't
  work well.
- 'audio' means recognizer has started. This is mostly harmless but
  better to stop when it's not used.
- the recognition pattern has changed to 'hotword: '

BUG=356873
R=xiyuan@chromium.org
TEST=manually

Review URL: https://codereview.chromium.org/215573002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260440 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/app_list/plugin_manager.js

@@ -16,9 +16,8 @@ cr.define('speech', function() {
   var PluginState = {
     UNINITIALIZED: 0,
     LOADED: 1,
-    SAMPLING_RATE_READY: 2,
-    READY: 3,
-    RECOGNIZING: 4
+    READY: 2,
+    RECOGNIZING: 3
   };
 
   /**
@@ -35,7 +34,7 @@ cr.define('speech', function() {
   /**
    * The regexp pattern of the hotword recognition result.
    */
-  var recognitionPattern = /^HotwordFiredEvent:/;
+  var recognitionPattern = /^(HotwordFiredEvent:|hotword)/;
 
   /**
    * @constructor
@@ -67,17 +66,13 @@ cr.define('speech', function() {
    * @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)
-        this.onReady_(this);
+      var wasNotReady = this.state < PluginState.READY;
       this.state = PluginState.RECOGNIZING;
-    } else if (messageEvent.data == 'stopped') {
+      if (wasNotReady)
+        this.onReady_(this);
+    } else if (messageEvent.data == 'stopped' &&
+               this.state == PluginState.RECOGNIZING) {
       this.state = PluginState.READY;
     } else if (recognitionPattern.exec(messageEvent.data)) {
       this.onRecognized_();

chrome/browser/resources/app_list/speech_manager.js

@@ -82,6 +82,7 @@ cr.define('speech', function() {
       this.audioManager_.start();
       this.setState_(SpeechState.HOTWORD_RECOGNIZING);
     } else {
+      this.pluginManager_.stopRecognizer();
       this.setState_(SpeechState.READY);
     }
     chrome.send('setHotwordRecognizerState', [true]);