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

content/common/speech_input_messages.h

Index: content/common/speech_input_messages.h
diff --git a/content/common/speech_input_messages.h b/content/common/speech_input_messages.h
index 2e2e27e65b26d65454eb3f4a9c025cb32ca8b2ea..5dd30154376a748db92fb24220ba82ebb66f9b81 100644
--- a/content/common/speech_input_messages.h
+++ b/content/common/speech_input_messages.h
@@ -29,11 +29,18 @@ IPC_STRUCT_BEGIN(SpeechInputHostMsg_StartRecognition_Params)
   IPC_STRUCT_MEMBER(std::string, origin_url)
 IPC_STRUCT_END()
 
-IPC_STRUCT_TRAITS_BEGIN(speech_input::SpeechInputResultItem)
+IPC_STRUCT_TRAITS_BEGIN(speech_input::SpeechInputHypothesis)
   IPC_STRUCT_TRAITS_MEMBER(utterance)
   IPC_STRUCT_TRAITS_MEMBER(confidence)
 IPC_STRUCT_TRAITS_END()
 
+IPC_ENUM_TRAITS(speech_input::SpeechInputError)
+
+IPC_STRUCT_TRAITS_BEGIN(speech_input::SpeechInputResult)
+  IPC_STRUCT_TRAITS_MEMBER(error)
+  IPC_STRUCT_TRAITS_MEMBER(hypotheses)
+IPC_STRUCT_TRAITS_END()
+
 // Speech input messages sent from the renderer to the browser.
 
 // Requests the speech input service to start speech recognition on behalf of
@@ -61,7 +68,7 @@ IPC_MESSAGE_CONTROL2(SpeechInputHostMsg_StopRecording,
 // Relay a speech recognition result, either partial or final.
 IPC_MESSAGE_ROUTED2(SpeechInputMsg_SetRecognitionResult,
                     int /* request_id */,
-                    speech_input::SpeechInputResultArray /* result */)
+                    speech_input::SpeechInputResult /* result */)
 
 // Indicate that speech recognizer has stopped recording and started
 // recognition.