Make SpeechRecognition per RenderFrame instead of per RenderView.

content/public/test/fake_speech_recognition_manager.cc

 // Copyright (c) 2013 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.
 
 #include "content/public/test/fake_speech_recognition_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const char kTestResult[] = "Pictures of the moon";
 
 void RunCallback(const base::Closure recognition_started_closure) {
   recognition_started_closure.Run();
@@ skipping 71 matching lines @@
   session_id_ = 0;
   listener_ = NULL;
 }
 
 void FakeSpeechRecognitionManager::StopAudioCaptureForSession(int session_id) {
   VLOG(1) << "StopRecording invoked.";
   EXPECT_EQ(session_id_, session_id);
   // Nothing to do here since we aren't really recording.
 }
 
-void FakeSpeechRecognitionManager::AbortAllSessionsForRenderProcess(
-    int render_process_id) {
+void FakeSpeechRecognitionManager::AbortAllSessionsForRenderFrame(
+    int render_process_id, int render_frame_id) {
   VLOG(1) << "CancelAllRequestsWithDelegate invoked.";
   EXPECT_TRUE(should_send_fake_response_ ||
-              session_ctx_.render_process_id == render_process_id);
+              (session_ctx_.render_process_id == render_process_id &&
+               session_ctx_.render_frame_id == render_frame_id));
   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 render_frame_id,
                                              int request_id) const {
   return session_ctx_.render_process_id == render_process_id &&
-         session_ctx_.render_view_id == render_view_id &&
+         session_ctx_.render_frame_id == render_frame_id &&
          session_ctx_.request_id == request_id;
 }
 
 const SpeechRecognitionSessionConfig&
     FakeSpeechRecognitionManager::GetSessionConfig(int session_id) const {
   EXPECT_EQ(session_id, session_id_);
   return session_config_;
 }
 
 SpeechRecognitionSessionContext FakeSpeechRecognitionManager::GetSessionContext(
@@ skipping 14 matching lines @@
   SpeechRecognitionResults results;
   results.push_back(result);
   listener_->OnRecognitionResults(session_id_, results);
   listener_->OnRecognitionEnd(session_id_);
   session_id_ = 0;
   listener_ = NULL;
   VLOG(1) << "Finished setting fake recognition result.";
 }
 
 }  // namespace content