Introduced SpeechRecognitionDispatcher(Host) classes, handling dispatch of IPC messages for continu…

content/browser/speech/speech_recognition_dispatcher_host.cc

Index: content/browser/speech/speech_recognition_dispatcher_host.cc
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc
new file mode 100644
index 0000000000000000000000000000000000000000..acb556cfc6d82472dcfc366695a82dfe3ed44458
--- /dev/null
+++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -0,0 +1,209 @@
+// 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.
+
+#include "content/browser/speech/speech_recognition_dispatcher_host.h"
+
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/lazy_instance.h"
+#include "content/common/speech_recognition_messages.h"
+#include "content/public/browser/speech_recognition_manager.h"
+#include "content/public/browser/speech_recognition_preferences.h"
+#include "content/public/browser/speech_recognition_session_config.h"
+#include "content/public/browser/speech_recognition_session_context.h"
+#include "content/public/common/content_switches.h"
+
+using content::BrowserThread;
+using content::SpeechRecognitionManager;
+using content::SpeechRecognitionSessionConfig;
+using content::SpeechRecognitionSessionContext;
+
+namespace speech {
+SpeechRecognitionManager* SpeechRecognitionDispatcherHost::manager_for_tests_;
+
+void SpeechRecognitionDispatcherHost::SetManagerForTests(
+    SpeechRecognitionManager* manager) {
+  manager_for_tests_ = manager;
+}
+
+SpeechRecognitionDispatcherHost::SpeechRecognitionDispatcherHost(
+    int render_process_id,
+    net::URLRequestContextGetter* context_getter,
+    content::SpeechRecognitionPreferences* recognition_preferences)
+    : render_process_id_(render_process_id),
+      context_getter_(context_getter),
+      recognition_preferences_(recognition_preferences) {
+  // Do not add any non-trivial initialization here, instead do it lazily when
+  // required (e.g. see the method |manager()|) or add an Init() method.
+}
+
+SpeechRecognitionDispatcherHost::~SpeechRecognitionDispatcherHost() {
+  if (SpeechRecognitionManager* sr_manager = manager())
+    sr_manager->AbortAllSessionsForListener(this);
+}
+
+SpeechRecognitionManager* SpeechRecognitionDispatcherHost::manager() {
+  if (manager_for_tests_)
+    return manager_for_tests_;
+
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kEnableScriptedSpeech))
+    return SpeechRecognitionManager::GetInstance();
+
+  return NULL;
+}
+
+bool SpeechRecognitionDispatcherHost::OnMessageReceived(
+    const IPC::Message& message, bool* message_was_ok) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP_EX(SpeechRecognitionDispatcherHost, message,
+                           *message_was_ok)
+    IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_StartRequest,
+                        OnStartRequest)
+    IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_AbortRequest,
+                        OnAbortRequest)
+    IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_StopCaptureRequest,
+                        OnStopCaptureRequest)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+void SpeechRecognitionDispatcherHost::OnStartRequest(
+    const SpeechRecognitionHostMsg_StartRequest_Params& params) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  SpeechRecognitionSessionContext context;
+  context.render_process_id = render_process_id_;
+  context.render_view_id = params.render_view_id;
+  context.js_handle_id = params.js_handle_id;

[Satish, 2012/05/20 22:57:46]

hmm I see my comment in the header file about the name 'js_handle_id' applies to
SpeechRecognitionSessionContext as well

[Primiano Tucci (use gerrit), 2012/05/21 13:38:25]

Ok, renamed here and everywhere else to request_id, so it is the same for both
x-webkit-speech and JS api, allowing to use a unified LookupSessionByContext
function.

+
+  SpeechRecognitionSessionConfig config;
+  config.is_one_shot = params.is_one_shot;
+  config.language = params.language;
+  config.grammars = params.grammars;
+  config.origin_url = params.origin_url;
+  config.initial_context = context;
+  config.url_request_context_getter = context_getter_.get();
+  config.filter_profanities = recognition_preferences_->FilterProfanities();
+  config.event_listener = this;
+
+  int session_id = manager()->CreateSession(config);
+  DCHECK_NE(session_id, content::SpeechRecognitionManager::kSessionIDInvalid);
+  manager()->StartSession(session_id);
+}
+
+namespace {

[Satish, 2012/05/20 22:57:46]

It is customary to have the anonymous namespace at top of file

[hans, 2012/05/21 09:08:41]

I asked for the function to be moved here so it would be close to where it's
used.

Let's declare it "static" instead of using an anonymous namespace.

[Primiano Tucci (use gerrit), 2012/05/21 13:38:25]

Done.

+bool IsSameContext(int render_process_id,
+                   int render_view_id,
+                   int js_handle_id,
+                   const SpeechRecognitionSessionContext& context) {
+  return context.render_process_id == render_process_id &&
+         context.render_view_id == render_view_id &&
+         context.js_handle_id == js_handle_id;
+}
+}  // namespace
+
+void SpeechRecognitionDispatcherHost::OnAbortRequest(int render_view_id,
+                                                     int js_handle_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  int session_id = manager()->LookupSessionByContext(

[Satish, 2012/05/20 22:57:46]

In an earlier CL we discussed about replacing the LookupSessionByContext with a
direct lookup function that takes in the 3 parameters instead of a closure. I
see there is a TODO above "SpeechRecognitionManagerImpl::LookupSessionByContext"
method about this. Since now it is clear that both InputTagSpeechDispatcherHost
and SpeechRecognitionDispatcherHost are having the same 3 parameters to lookup
sessions, can you address the todo and simplify this?

[Primiano Tucci (use gerrit), 2012/05/21 13:38:25]

Done.

+      base::Bind(&IsSameContext,
+                 render_process_id_,
+                 render_view_id,
+                 js_handle_id));
+  if (session_id != content::SpeechRecognitionManager::kSessionIDInvalid)
+    manager()->AbortSession(session_id);
+}
+
+void SpeechRecognitionDispatcherHost::OnStopCaptureRequest(
+    int render_view_id, int js_handle_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  int session_id = manager()->LookupSessionByContext(
+      base::Bind(&IsSameContext,
+                 render_process_id_,
+                 render_view_id,
+                 js_handle_id));
+  if (session_id != content::SpeechRecognitionManager::kSessionIDInvalid)
+    manager()->StopAudioCaptureForSession(session_id);
+}
+
+// -------- SpeechRecognitionEventListener interface implementation -----------
+
+void SpeechRecognitionDispatcherHost::OnRecognitionStart(int session_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+      manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_Started(context.render_view_id,
+                                        context.js_handle_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnAudioStart(int session_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+      manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_AudioStarted(context.render_view_id,
+                                             context.js_handle_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnSoundStart(int session_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+        manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_SoundStarted(context.render_view_id,
+                                             context.js_handle_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnSoundEnd(int session_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+        manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_SoundEnded(context.render_view_id,
+                                           context.js_handle_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnAudioEnd(int session_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+        manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_AudioEnded(context.render_view_id,
+                                           context.js_handle_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnRecognitionEnd(int session_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+        manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_Ended(context.render_view_id,
+                                      context.js_handle_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnRecognitionResult(
+      int session_id, const content::SpeechRecognitionResult& result) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+        manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_ResultRetrieved(context.render_view_id,
+                                                context.js_handle_id,
+                                                result));
+}
+
+void SpeechRecognitionDispatcherHost::OnRecognitionError(
+    int session_id, const content::SpeechRecognitionError& error) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  const SpeechRecognitionSessionContext& context =
+        manager()->GetSessionContext(session_id);
+  Send(new SpeechRecognitionMsg_ErrorOccurred(context.render_view_id,
+                                              context.js_handle_id,
+                                              error));
+}
+
+// The events below are currently not used by speech JS APIs implementation.
+void SpeechRecognitionDispatcherHost::OnAudioLevelsChange(
+    int session_id, float volume, float noise_volume) {}
+void SpeechRecognitionDispatcherHost::OnEnvironmentEstimationComplete(
+    int session_id) {}
+
+}  // namespace speech