Make SpeechRecognition per RenderFrame instead of per RenderView.

content/browser/speech/speech_recognition_manager_impl.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/browser/speech/speech_recognition_manager_impl.h"
 
 #include "base/bind.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
@@ skipping 416 matching lines @@
     listener->OnRecognitionEnd(session_id);
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent,
                  weak_factory_.GetWeakPtr(),
                  session_id,
                  EVENT_RECOGNITION_ENDED));
 }
 
 int SpeechRecognitionManagerImpl::GetSession(
-    int render_process_id, int render_view_id, int request_id) const {
+    int render_process_id, int render_frame_id, int request_id) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  SessionsTable::const_iterator iter;
-  for (iter = sessions_.begin(); iter != sessions_.end(); ++iter) {
-    const int session_id = iter->first;
-    const SpeechRecognitionSessionContext& context = iter->second->context;
-    if (context.render_process_id == render_process_id &&
-        context.render_view_id == render_view_id &&
-        context.request_id == request_id) {
-      return session_id;
+
+  for (const auto& it : sessions_) {
+    Session* session = it.second;
+    if (session->context.render_process_id == render_process_id &&
+        session->context.render_frame_id == render_frame_id &&
+        session->context.request_id == request_id) {
+      return session->id;
     }
   }
+
   return kSessionIDInvalid;
 }
 
 SpeechRecognitionSessionContext
 SpeechRecognitionManagerImpl::GetSessionContext(int session_id) const {
   return GetSession(session_id)->context;
 }
 
-void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderProcess(
-    int render_process_id) {
-  // This method gracefully destroys sessions for the listener. However, since
-  // the listener itself is likely to be destroyed after this call, we avoid
-  // dispatching further events to it, marking the |listener_is_active| flag.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  for (SessionsTable::iterator it = sessions_.begin(); it != sessions_.end();
-       ++it) {
-    Session* session = it->second;
-    if (session->context.render_process_id == render_process_id) {
-      AbortSession(session->id);
-      session->listener_is_active = false;
-    }
-  }
-}
+void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderFrame(
+    int render_process_id, int render_frame_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-void SpeechRecognitionManagerImpl::AbortAllSessionsForRenderView(
-    int render_process_id,
-    int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  for (SessionsTable::iterator it = sessions_.begin(); it != sessions_.end();
-       ++it) {
-    Session* session = it->second;
+  for (const auto& it : sessions_) {
+    Session* session = it.second;
     if (session->context.render_process_id == render_process_id &&
-        session->context.render_view_id == render_view_id) {
+        session->context.render_frame_id == render_frame_id) {
       AbortSession(session->id);
     }
   }
 }
 
 // -----------------------  Core FSM implementation ---------------------------
 void SpeechRecognitionManagerImpl::DispatchEvent(int session_id,
                                                  FSMEvent event) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 202 matching lines @@
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     abort_requested(false),
     listener_is_active(true) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace content