Make SpeechRecognition per RenderFrame instead of per RenderView.

chrome/browser/speech/chrome_speech_recognition_manager_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
 #define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.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"
 
+namespace content {
+class WebContents;
+}  // namespace content
+
 namespace speech {
 
 // This is Chrome's implementation of the SpeechRecognitionManagerDelegate
 // interface.
 class ChromeSpeechRecognitionManagerDelegate
     : public content::SpeechRecognitionManagerDelegate,
       public content::SpeechRecognitionEventListener {
  public:
   ChromeSpeechRecognitionManagerDelegate();
   ~ChromeSpeechRecognitionManagerDelegate() override;
@@ skipping 19 matching lines @@
 
   // SpeechRecognitionManagerDelegate methods.
   void GetDiagnosticInformation(bool* can_report_metrics,
                                 std::string* hardware_info) override;
   void CheckRecognitionIsAllowed(
       int session_id,
       base::Callback<void(bool ask_user, bool is_allowed)> callback) override;
   content::SpeechRecognitionEventListener* GetEventListener() override;
   bool FilterProfanities(int render_process_id) override;
 
   // Callback called by |tab_watcher_| on the IO thread to signal tab closure.

[Charlie Reis, 2014/12/01 23:49:43]

This is called on the UI thread and not the IO thread, correct?  (Otherwise we
couldn't pass WebContents to it.)

[mlamouri (slow - plz ping), 2014/12/08 17:41:04]

Correct. Fixed.

-  virtual void TabClosedCallback(int render_process_id, int render_view_id);
+  virtual void TabClosedCallback(content::WebContents* web_contents);
 
  private:
   class OptionalRequestInfo;
   class TabWatcher;
 
   // Checks for VIEW_TYPE_TAB_CONTENTS host in the UI thread and notifies back
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionManagerDelegate);
 };
 
 }  // namespace speech
 
 #endif  // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_