Revert 170701 since the WebKit change has now been rolled in again.

content/common/speech_recognition_messages.h

 // Copyright (c) 2012 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.
 
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_grammar.h"
@@ skipping 61 matching lines @@
 // the given |render_view_id|. Any audio recorded so far will be fed to the
 // speech recognizer. If speech recognition is not happening nor or is
 // happening on behalf of some other render view, this call does nothing.
 IPC_MESSAGE_CONTROL2(InputTagSpeechHostMsg_StopRecording,
                      int /* render_view_id */,
                      int /* request_id */)
 
 // Browser -> Renderer messages.
 
 // Relays a speech recognition result, either partial or final.
-IPC_MESSAGE_ROUTED2(InputTagSpeechMsg_SetRecognitionResult,
+IPC_MESSAGE_ROUTED2(InputTagSpeechMsg_SetRecognitionResults,
                     int /* request_id */,
-                    content::SpeechRecognitionResult /* result */)
+                    content::SpeechRecognitionResults /* results */)
 
 // Indicates that speech recognizer has stopped recording and started
 // recognition.
 IPC_MESSAGE_ROUTED1(InputTagSpeechMsg_RecordingComplete,
                     int /* request_id */)
 
 // Indicates that speech recognizer has completed recognition. This will be the
 // last message sent in response to a InputTagSpeechHostMsg_StartRecognition.
 IPC_MESSAGE_ROUTED1(InputTagSpeechMsg_RecognitionComplete,
                     int /* request_id */)
@@ skipping 47 matching lines @@
 IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_StopCaptureRequest,
                      int /* render_view_id */,
                      int /* request_id */)
 
 // Browser -> Renderer messages.
 
 // The messages below follow exactly the same semantic of the corresponding
 // events defined in content/public/browser/speech_recognition_event_listener.h.
 IPC_MESSAGE_ROUTED2(SpeechRecognitionMsg_ResultRetrieved,
                     int /* request_id */,
-                    content::SpeechRecognitionResult /* result */)
+                    content::SpeechRecognitionResults /* results */)
 
 IPC_MESSAGE_ROUTED2(SpeechRecognitionMsg_ErrorOccurred,
                     int /* request_id */,
                     content::SpeechRecognitionError /* error */)
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_Started, int /* request_id */)
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_AudioStarted, int /* request_id */)
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_SoundStarted, int /* request_id */)
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_SoundEnded, int /* request_id */)
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_AudioEnded, int /* request_id */)
 
 IPC_MESSAGE_ROUTED1(SpeechRecognitionMsg_Ended, int /* request_id */)