Merge 285317 "Merge 285314 "Turn webspeech on/off when tab goes ..."

content/common/speech_recognition_messages.h

Index: content/common/speech_recognition_messages.h
===================================================================
--- content/common/speech_recognition_messages.h	(revision 286375)
+++ content/common/speech_recognition_messages.h	(working copy)
@@ -70,12 +70,19 @@
                      SpeechRecognitionHostMsg_StartRequest_Params)
 
 // Requests the speech recognition service to abort speech recognition on
-// behalf of the given |render_view_id|. If speech recognition is not happening
-// or is happening on behalf of some other render view, this call does nothing.
+// behalf of the given |render_view_id| and |request_id|. If there are no
+// sessions associated with the |request_id| in the render view, this call
+// does nothing.
 IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_AbortRequest,
                      int /* render_view_id */,
                      int /* request_id */)
 
+// Requests the speech recognition service to abort all speech recognitions on
+// behalf of the given |render_view_id|. If speech recognition is not happening
+// or is happening on behalf of some other render view, this call does nothing.
+IPC_MESSAGE_CONTROL1(SpeechRecognitionHostMsg_AbortAllRequests,
+                     int /* render_view_id */)
+
 // Requests the speech recognition service to stop audio capture on behalf of
 // 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