Make SpeechRecognition per RenderFrame instead of per RenderView.

chrome/browser/ui/app_list/speech_recognizer.cc

 // Copyright 2014 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 "chrome/browser/ui/app_list/speech_recognizer.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/ui/app_list/speech_recognizer_delegate.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/browser/speech_recognition_manager.h"
 #include "content/public/browser/speech_recognition_session_config.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/app_list/speech_ui_model_observer.h"
 
 namespace app_list {
@@ skipping 12 matching lines @@
 // SpeechRecognizerDelegate via a weak pointer that is only ever referenced from
 // the UI thread.
 class SpeechRecognizer::EventListener
     : public base::RefCountedThreadSafe<SpeechRecognizer::EventListener>,
       public content::SpeechRecognitionEventListener {
  public:
   EventListener(const base::WeakPtr<SpeechRecognizerDelegate>& delegate,
                 net::URLRequestContextGetter* url_request_context_getter,
                 const std::string& locale);
 
-  void StartOnIOThread(int render_process_id);
+  void StartOnIOThread(int render_process_id, int render_frame_id);
   void StopOnIOThread();
 
  private:
   friend class base::RefCountedThreadSafe<SpeechRecognizer::EventListener>;
   ~EventListener();
 
   void NotifyRecognitionStateChanged(SpeechRecognitionState new_state);
 
   void StartSpeechTimeout();
   void StopSpeechTimeout();
@@ skipping 40 matching lines @@
       speech_timeout_(false, false),
       session_(kInvalidSessionId),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 SpeechRecognizer::EventListener::~EventListener() {
   DCHECK(!speech_timeout_.IsRunning());
 }
 
-void SpeechRecognizer::EventListener::StartOnIOThread(int render_process_id) {
+void SpeechRecognizer::EventListener::StartOnIOThread(int render_process_id,
+                                                      int render_frame_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (session_ != kInvalidSessionId)
     StopOnIOThread();
 
   content::SpeechRecognitionSessionConfig config;
   config.language = locale_;
   config.is_legacy_api = false;
   config.continuous = true;
   config.interim_results = true;
   config.max_hypotheses = 1;
   config.filter_profanities = true;
   config.url_request_context_getter = url_request_context_getter_;
   config.event_listener = weak_factory_.GetWeakPtr();
   config.initial_context.render_process_id = render_process_id;
+  config.initial_context.render_frame_id = render_frame_id;
 
   auto speech_instance = content::SpeechRecognitionManager::GetInstance();
   session_ = speech_instance->CreateSession(config);
   speech_instance->StartSession(session_);
 }
 
 void SpeechRecognizer::EventListener::StopOnIOThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (session_ == kInvalidSessionId)
     return;
@@ skipping 137 matching lines @@
     return;
   content::WebContents* contents = delegate_->GetSpeechContents();
   if (!contents)
     return;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&SpeechRecognizer::EventListener::StartOnIOThread,
                  speech_event_listener_,
-                 contents->GetRenderProcessHost()->GetID()));
+                 contents->GetMainFrame()->GetProcess()->GetID(),
+                 contents->GetMainFrame()->GetRoutingID()));
 }
 
 void SpeechRecognizer::Stop() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&SpeechRecognizer::EventListener::StopOnIOThread,
                  speech_event_listener_));
 }
 
 }  // namespace app_list