Make SpeechRecognition per RenderFrame instead of per RenderView.

content/public/test/fake_speech_recognition_manager.cc

Index: content/public/test/fake_speech_recognition_manager.cc
diff --git a/content/public/test/fake_speech_recognition_manager.cc b/content/public/test/fake_speech_recognition_manager.cc
index 91e94dd1a66c311e46fa943d0ba78d4e7f6ad0f7..fc4b5d4af7a887f0827ee791174f25b312cf8909 100644
--- a/content/public/test/fake_speech_recognition_manager.cc
+++ b/content/public/test/fake_speech_recognition_manager.cc
@@ -7,6 +7,8 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "content/public/test/test_utils.h"
@@ -98,30 +100,23 @@ void FakeSpeechRecognitionManager::StopAudioCaptureForSession(int session_id) {
   // Nothing to do here since we aren't really recording.
 }
 
-void FakeSpeechRecognitionManager::AbortAllSessionsForRenderProcess(
-    int render_process_id) {
+void FakeSpeechRecognitionManager::AbortAllSessionsForRenderFrame(
+    RenderFrameHost* render_frame_host) {
   VLOG(1) << "CancelAllRequestsWithDelegate invoked.";
   EXPECT_TRUE(should_send_fake_response_ ||
-              session_ctx_.render_process_id == render_process_id);
+              session_ctx_.render_frame_host == render_frame_host);
   did_cancel_all_ = true;
 }
 
-void FakeSpeechRecognitionManager::AbortAllSessionsForRenderView(
-    int render_process_id, int render_view_id) {
-  NOTREACHED();
-}
-
 bool FakeSpeechRecognitionManager::HasAudioInputDevices() { return true; }
 
 base::string16 FakeSpeechRecognitionManager::GetAudioInputDeviceModel() {
   return base::string16();
 }
 
-int FakeSpeechRecognitionManager::GetSession(int render_process_id,
-                                             int render_view_id,
+int FakeSpeechRecognitionManager::GetSession(RenderFrameHost* render_frame_host,
                                              int request_id) const {
-  return session_ctx_.render_process_id == render_process_id &&
-         session_ctx_.render_view_id == render_view_id &&
+  return session_ctx_.render_frame_host == render_frame_host &&
          session_ctx_.request_id == request_id;
 }