[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"
@@ skipping 176 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;
+    DCHECK_NE(context.render_frame_id, 0);

[ncarter (slow), 2014/07/10 01:17:52]

Do you want to check "!= 0" or do you want to check "> 0"? Are you okay if it's
MSG_ROUTING_NONE?

[miu, 2014/07/10 22:16:12]

My intention was to confirm the value was being set, but I think I should
probably remove this DCHECK and guard the whole call to MakeMediaAccessRequest()
with a sanity-check.  In other words, we shouldn't be making the request unless
the RP ID and RF ID are both valid.

     context.label = media_stream_manager_->MakeMediaAccessRequest(
         context.render_process_id,
-        context.render_view_id,
+        context.render_frame_id,
         context.request_id,
         StreamOptions(true, false),
         GURL(context.context_name),
         base::Bind(
             &SpeechRecognitionManagerImpl::MediaRequestPermissionCallback,
             weak_factory_.GetWeakPtr(), session_id));
     return;
   }
 
   if (is_allowed) {
@@ skipping 481 matching lines @@
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     abort_requested(false),
     listener_is_active(true) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace content