Switch Speech Recognition to asynchronous callback-based AudioManager interactions.

content/browser/browser_main_loop.cc

 // 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/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 74 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/tracing_controller.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "device/battery/battery_status_service.h"
 #include "device/gamepad/gamepad_service.h"
 #include "device/sensors/device_sensor_service.h"
+#include "media/audio/audio_system_impl.h"
 #include "media/base/media.h"
 #include "media/base/user_input_monitor.h"
 #include "media/midi/midi_service.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "net/base/network_change_notifier.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/ssl/ssl_config_service.h"
 #include "ppapi/features/features.h"
 #include "services/service_manager/runner/common/client_util.h"
@@ skipping 1425 matching lines @@
   // MediaStreamManager needs the IO thread to be created.
   {
     TRACE_EVENT0("startup",
       "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager");
     media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
   }
 
   {
     TRACE_EVENT0("startup",
       "BrowserMainLoop::BrowserThreadsStarted:InitSpeechRecognition");
-    speech_recognition_manager_.reset(
-        new SpeechRecognitionManagerImpl(media_stream_manager_.get()));
+    speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl(

[Avi (use Gerrit), 2017/02/06 16:14:21]

base::MakeUnique?

[o1ka, 2017/02/06 16:40:06]

Unfortunately this won't compile:
for some reason SpeechRecognitionImpl has a protected constructor;
BrowserMainLoop is its friend.
- Changing this behavior is out of scope of the CL.

+        audio_system_.get(), media_stream_manager_.get()));
   }
 
   {
     TRACE_EVENT0(
         "startup",
         "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor");
     user_input_monitor_ = media::UserInputMonitor::Create(
         io_thread_->task_runner(), main_thread_->task_runner());
   }
 
@@ skipping 238 matching lines @@
 
   audio_manager_ = GetContentClient()->browser()->CreateAudioManager(
       MediaInternals::GetInstance());
   if (!audio_manager_) {
     audio_thread_ = base::MakeUnique<AudioManagerThread>();
     audio_manager_ = media::AudioManager::Create(
         audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
+
+  audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
+  CHECK(audio_system_);
 }
 
 }  // namespace content