Applying changes to the existing speech input code to support the extension API.

content/renderer/speech_input_dispatcher.cc

 // Copyright (c) 2011 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.
 
 #include "content/renderer/speech_input_dispatcher.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/common/speech_input_messages.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ skipping 66 matching lines @@
   VLOG(1) << "SpeechInputDispatcher::cancelRecognition exit";
 }
 
 void SpeechInputDispatcher::stopRecording(int request_id) {
   VLOG(1) << "SpeechInputDispatcher::stopRecording enter";
   Send(new SpeechInputHostMsg_StopRecording(routing_id(), request_id));
   VLOG(1) << "SpeechInputDispatcher::stopRecording exit";
 }
 
 void SpeechInputDispatcher::OnSpeechRecognitionResult(
-    int request_id, const speech_input::SpeechInputResultArray& result) {
+    int request_id,
+    const speech_input::SpeechInputResult& result) {
   VLOG(1) << "SpeechInputDispatcher::OnSpeechRecognitionResult enter";
-  WebKit::WebSpeechInputResultArray webkit_result(result.size());
-  for (size_t i = 0; i < result.size(); ++i)
-    webkit_result[i].set(result[i].utterance, result[i].confidence);
+  WebKit::WebSpeechInputResultArray webkit_result(result.hypotheses.size());
+  for (size_t i = 0; i < result.hypotheses.size(); ++i) {
+    webkit_result[i].set(result.hypotheses[i].utterance,
+        result.hypotheses[i].confidence);
+  }
   listener_->setRecognitionResult(request_id, webkit_result);
   VLOG(1) << "SpeechInputDispatcher::OnSpeechRecognitionResult exit";
 }
 
 void SpeechInputDispatcher::OnSpeechRecordingComplete(int request_id) {
   VLOG(1) << "SpeechInputDispatcher::OnSpeechRecordingComplete enter";
   listener_->didCompleteRecording(request_id);
   VLOG(1) << "SpeechInputDispatcher::OnSpeechRecordingComplete exit";
 }
 
@@ skipping 26 matching lines @@
     return;
   if (!input_element->isSpeechInputEnabled())
     return;
 
   if (input_element->getSpeechInputState() == WebInputElement::Idle) {
     input_element->startSpeechInput();
   } else {
     input_element->stopSpeechInput();
   }
 }