Make SpeechRecognition per RenderFrame instead of per RenderView.

content/browser/speech/speech_recognition_dispatcher_host.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 CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_DISPATCHER_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
-#include "net/url_request/url_request_context_getter.h"
 
 struct SpeechRecognitionHostMsg_StartRequest_Params;
 
+namespace net {
+class URLRequestContextGetter;
+} // namespace net
+
 namespace content {
 
 class SpeechRecognitionManager;
+class WebContents;
 struct SpeechRecognitionResult;
+struct SpeechRecognitionSessionContext;
+struct SpeechRecognitionSessionConfig;
 
 // SpeechRecognitionDispatcherHost is a delegate for Speech API messages used by
-// RenderMessageFilter. Basically it acts as a proxy, relaying the events coming
-// from the SpeechRecognitionManager to IPC messages (and vice versa).
-// It's the complement of SpeechRecognitionDispatcher (owned by RenderView).
+// BrowserMessageFilter. Basically it acts as a proxy, relaying the events
+// coming from the SpeechRecognitionManager to IPC messages (and vice versa).
+// It's the complement of SpeechRecognitionDispatcher (owned by RenderFrame).
 class CONTENT_EXPORT SpeechRecognitionDispatcherHost
     : public BrowserMessageFilter,
       public SpeechRecognitionEventListener {
  public:
-  SpeechRecognitionDispatcherHost(
-      int render_process_id,
-      net::URLRequestContextGetter* context_getter);
+  explicit SpeechRecognitionDispatcherHost(int render_process_id);
 
   base::WeakPtr<SpeechRecognitionDispatcherHost> AsWeakPtr();
 
   // SpeechRecognitionEventListener methods.
   void OnRecognitionStart(int session_id) override;
   void OnAudioStart(int session_id) override;
   void OnEnvironmentEstimationComplete(int session_id) override;
   void OnSoundStart(int session_id) override;
   void OnSoundEnd(int session_id) override;
   void OnAudioEnd(int session_id) override;
   void OnRecognitionEnd(int session_id) override;
   void OnRecognitionResults(int session_id,
                             const SpeechRecognitionResults& results) override;
   void OnRecognitionError(int session_id,
                           const SpeechRecognitionError& error) override;
   void OnAudioLevelsChange(int session_id,
                            float volume,
                            float noise_volume) override;
 
   // BrowserMessageFilter implementation.
   void OnDestruct() const override;
-  bool OnMessageReceived(const IPC::Message& message) override;
+  void OnChannelClosing() override;
   void OverrideThreadForMessage(const IPC::Message& message,
                                 BrowserThread::ID* thread) override;
-
-  void OnChannelClosing() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   friend class base::DeleteHelper<SpeechRecognitionDispatcherHost>;
   friend class BrowserThread;
 
-  ~SpeechRecognitionDispatcherHost() override;
+  virtual ~SpeechRecognitionDispatcherHost();
 
   void OnStartRequest(
       const SpeechRecognitionHostMsg_StartRequest_Params& params);
-  void OnStartRequestOnIO(
-      int embedder_render_process_id,
-      int embedder_render_view_id,
+  void StartSession(
       const SpeechRecognitionHostMsg_StartRequest_Params& params,
-      int params_render_frame_id,
+      const SpeechRecognitionSessionContext& context,
+      net::URLRequestContextGetter* url_request_context_getter,
       bool filter_profanities);
-  void OnAbortRequest(int render_view_id, int request_id);
-  void OnStopCaptureRequest(int render_view_id, int request_id);
-  void OnAbortAllRequests(int render_view_id);
-
-  int render_process_id_;
-  scoped_refptr<net::URLRequestContextGetter> context_getter_;
+  void OnAbortRequest(int request_id, int render_frame_id);

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

Why reverse these parameters?  I would normally expect the frame's routing ID to
come before the request ID, since request IDs are specific to a frame.  (Or did
that change?)

Also, since they're both ints, it seems like swapping the order would make it to
end up with bugs where they're passed in the wrong order, without compiler help
for detecting it.

Same for OnStopCaptureRequest.

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

Done.

+  void OnStopCaptureRequest(int request_id, int render_frame_id);
+  void OnAbortAllRequests(int render_frame_id);
 
   // Used for posting asynchronous tasks (on the IO thread) without worrying
   // about this class being destroyed in the meanwhile (due to browser shutdown)
   // since tasks pending on a destroyed WeakPtr are automatically discarded.
   base::WeakPtrFactory<SpeechRecognitionDispatcherHost> weak_factory_;
 
+  int render_process_id_;
+
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_DISPATCHER_HOST_H_