Make SpeechRecognition per RenderFrame instead of per RenderView.

content/common/speech_recognition_messages.h

Index: content/common/speech_recognition_messages.h
diff --git a/content/common/speech_recognition_messages.h b/content/common/speech_recognition_messages.h
index 80eb7f74d2d7f76ef42015135ae2a7f8453870d9..adace1bd0ce743f0eb502e7135f65bd4027953eb 100644
--- a/content/common/speech_recognition_messages.h
+++ b/content/common/speech_recognition_messages.h
@@ -49,8 +49,6 @@ IPC_STRUCT_TRAITS_END()
 
 // Used to start a speech recognition session.
 IPC_STRUCT_BEGIN(SpeechRecognitionHostMsg_StartRequest_Params)
-  // The render view requesting speech recognition.
-  IPC_STRUCT_MEMBER(int, render_view_id)
   // Unique ID associated with the JS object making the calls.
   IPC_STRUCT_MEMBER(int, request_id)
   // Language to use for speech recognition.
@@ -71,31 +69,27 @@ IPC_STRUCT_END()
 
 
 // Requests the speech recognition service to start speech recognition.
-IPC_MESSAGE_CONTROL1(SpeechRecognitionHostMsg_StartRequest,
-                     SpeechRecognitionHostMsg_StartRequest_Params)
-
-// Requests the speech recognition service to abort speech recognition on
-// 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 */)
+IPC_MESSAGE_ROUTED1(SpeechRecognitionHostMsg_StartRequest,
+                    SpeechRecognitionHostMsg_StartRequest_Params)
 
-// 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
-// happening on behalf of some other render view, this call does nothing.
-IPC_MESSAGE_CONTROL2(SpeechRecognitionHostMsg_StopCaptureRequest,
-                     int /* render_view_id */,
+// Requests the speech recognition service to abort speech recognition
+// associated with |request_id|. If there are no sessions associated with the
+// |request_id| in the render frame, this call does nothing.
+IPC_MESSAGE_ROUTED1(SpeechRecognitionHostMsg_AbortRequest,
                      int /* request_id */)
 
+// Requests the speech recognition service to abort all speech recognitions
+// running for the frame. If speech recognition is not happening for that frame,
+// this call does nothing.
+IPC_MESSAGE_ROUTED0(SpeechRecognitionHostMsg_AbortAllRequests)
+
+// Requests the speech recognition service to stop audio capture associated with
+// |request_id|. Any audio recorded so far will be fed to the speech recognizer.
+// If there are no sessions associated with |request_id|, this call does
+// nothing.
+IPC_MESSAGE_ROUTED1(SpeechRecognitionHostMsg_StopCaptureRequest,
+                    int /* request_id */)
+
 // Browser -> Renderer messages.
 
 // The messages below follow exactly the same semantic of the corresponding