Make SpeechRecognition per RenderFrame instead of per RenderView.

extensions/shell/browser/shell_speech_recognition_manager_delegate.cc

Index: extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
diff --git a/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc b/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
index 7a96874e046e14880c62b6dfe161a59daf51986f..0b246ceda6f8a58d70a0cba3530527fd28631856 100644
--- a/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
+++ b/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/speech_recognition_manager.h"
 #include "content/public/browser/speech_recognition_session_context.h"
@@ -85,7 +86,7 @@ void ShellSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
                           base::Bind(&CheckRenderViewType,
                                      callback,
                                      context.render_process_id,
-                                     context.render_view_id));
+                                     context.render_frame_id));
 }
 
 content::SpeechRecognitionEventListener*
@@ -103,13 +104,17 @@ bool ShellSpeechRecognitionManagerDelegate::FilterProfanities(
 void ShellSpeechRecognitionManagerDelegate::CheckRenderViewType(
     base::Callback<void(bool ask_user, bool is_allowed)> callback,
     int render_process_id,
-    int render_view_id) {
+    int render_frame_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const content::RenderViewHost* render_view_host =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
+
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
   bool allowed = false;
   bool check_permission = false;
 
+  const content::RenderViewHost* render_view_host =

[Charlie Reis, 2014/12/09 00:52:33]

We don't need |render_view_host| if we use WebContents::FromRenderFrameHost
below, right?  Same for the #include.

[mlamouri (slow - plz ping), 2015/01/19 11:20:23]

Right ;)

+      render_frame_host ? render_frame_host->GetRenderViewHost() : nullptr;
+
   if (render_view_host) {
     WebContents* web_contents =
         WebContents::FromRenderViewHost(render_view_host);