[Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

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"
 #include "content/browser/speech/google_one_shot_remote_engine.h"
 #include "content/browser/speech/google_streaming_remote_engine.h"
 #include "content/browser/speech/speech_recognition_engine.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/browser/speech_recognition_manager_delegate.h"
 #include "content/public/browser/speech_recognition_session_config.h"
 #include "content/public/browser/speech_recognition_session_context.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 
@@ skipping 160 matching lines @@
 
   SessionsTable::iterator iter = sessions_.find(session_id);
   DCHECK(iter != sessions_.end());
   Session* session = iter->second;
 
   if (session->abort_requested)
     return;
 
   if (ask_user) {
     SpeechRecognitionSessionContext& context = session->context;
-    context.label = media_stream_manager_->MakeMediaAccessRequest(
-        context.render_process_id,
-        context.render_view_id,
-        context.request_id,
-        StreamOptions(true, false),
-        GURL(context.context_name),
-        base::Bind(
-            &SpeechRecognitionManagerImpl::MediaRequestPermissionCallback,
-            weak_factory_.GetWeakPtr(), session_id));
+    // TODO(miu): This is a hack to allow SpeechRecognition to operate with the
+    // MediaStreamManager, which partitions requests per RenderFrame, not per
+    // RenderView.  http://crbug.com/390749
+    RenderViewHost* const rvh = RenderViewHost::FromID(
+        context.render_process_id, context.render_view_id);

[ncarter (slow), 2014/07/11 22:32:25]

This code seems misplaced; you can't get an RVH on the IO thread. Should you
just go back to how it was in patch set 1?

[miu, 2014/07/12 03:16:29]

Done.  Yeah, I oops'ed; and also noticed the trybots caught it.  I put it back
the way it was.

+    RenderFrameHost* const main_frame = rvh ? rvh->GetMainFrame() : NULL;
+    if (main_frame) {
+      context.label = media_stream_manager_->MakeMediaAccessRequest(
+          main_frame->GetProcess()->GetID(),
+          main_frame->GetRoutingID(),
+          context.request_id,
+          StreamOptions(true, false),
+          GURL(context.context_name),
+          base::Bind(
+              &SpeechRecognitionManagerImpl::MediaRequestPermissionCallback,
+              weak_factory_.GetWeakPtr(), session_id));
+    }
     return;
   }
 
   if (is_allowed) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent,
                    weak_factory_.GetWeakPtr(),
                    session_id,
                    EVENT_START));
@@ skipping 475 matching lines @@
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     abort_requested(false),
     listener_is_active(true) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace content