Make SpeechRecognition per RenderFrame instead of per RenderView.

chrome/browser/speech/chrome_speech_recognition_manager_delegate.h

Index: chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
index b806b9979f88cdc7a18636eac5b6415fac9c2bba..4c484843a7c08428ac6fa2308373d0c72e75244d 100644
--- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
+++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.h
@@ -11,6 +11,10 @@
 #include "content/public/browser/speech_recognition_manager_delegate.h"
 #include "content/public/browser/speech_recognition_session_config.h"
 
+namespace content {
+class WebContents;
+}  // namespace content
+
 namespace speech {
 
 // This is Chrome's implementation of the SpeechRecognitionManagerDelegate
@@ -50,8 +54,8 @@ class ChromeSpeechRecognitionManagerDelegate
   content::SpeechRecognitionEventListener* GetEventListener() override;
   bool FilterProfanities(int render_process_id) override;
 
-  // Callback called by |tab_watcher_| on the IO thread to signal tab closure.
-  virtual void TabClosedCallback(int render_process_id, int render_view_id);
+  // Callback called by |tab_watcher_| on the UI thread to signal tab closure.
+  virtual void TabClosedCallback(content::WebContents* web_contents);
 
  private:
   class OptionalRequestInfo;
@@ -61,8 +65,7 @@ class ChromeSpeechRecognitionManagerDelegate
   // the result in the IO thread through |callback|.
   static void CheckRenderViewType(
       base::Callback<void(bool ask_user, bool is_allowed)> callback,
-      int render_process_id,
-      int render_view_id);
+      const content::SpeechRecognitionSessionContext& context);
 
   scoped_refptr<OptionalRequestInfo> optional_request_info_;
   scoped_refptr<TabWatcher> tab_watcher_;