Unit tests of AudioInputRendererHost. Some cleanups.

media/audio/audio_input_controller.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 "media/audio/audio_input_controller.h"
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
@@ skipping 110 matching lines @@
     EventHandler* event_handler,
     const AudioParameters& params,
     const std::string& device_id,
     UserInputMonitor* user_input_monitor) {
   DCHECK(audio_manager);
 
   if (!params.IsValid() || (params.channels() > kMaxInputChannels))
     return nullptr;
 
   if (factory_) {
-    return factory_->Create(
-        audio_manager, event_handler, params, user_input_monitor);
+    return factory_->Create(audio_manager->GetTaskRunner(),
+                            /*sync_writer*/ nullptr, audio_manager,
+                            event_handler, params, user_input_monitor);
   }
+
   scoped_refptr<AudioInputController> controller(new AudioInputController(
       event_handler, nullptr, nullptr, user_input_monitor, false));
 
   controller->task_runner_ = audio_manager->GetTaskRunner();
 
   // Create and open a new audio input stream from the existing
   // audio-device thread.
   if (!controller->task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&AudioInputController::DoCreate,
@@ skipping 16 matching lines @@
     SyncWriter* sync_writer,
     std::unique_ptr<AudioInputWriter> debug_writer,
     UserInputMonitor* user_input_monitor,
     const bool agc_is_enabled) {
   DCHECK(audio_manager);
   DCHECK(sync_writer);
 
   if (!params.IsValid() || (params.channels() > kMaxInputChannels))
     return nullptr;
 
+  if (factory_) {
+    return factory_->Create(audio_manager->GetTaskRunner(), sync_writer,
+                            audio_manager, event_handler, params,
+                            user_input_monitor);
+  }
+
   // Create the AudioInputController object and ensure that it runs on
   // the audio-manager thread.
   scoped_refptr<AudioInputController> controller(new AudioInputController(
       event_handler, sync_writer, std::move(debug_writer), user_input_monitor,
       agc_is_enabled));
   controller->task_runner_ = audio_manager->GetTaskRunner();
 
   // Create and open a new audio input stream from the existing
   // audio-device thread. Use the provided audio-input device.
   if (!controller->task_runner_->PostTask(
@@ skipping 13 matching lines @@
 scoped_refptr<AudioInputController> AudioInputController::CreateForStream(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     EventHandler* event_handler,
     AudioInputStream* stream,
     SyncWriter* sync_writer,
     std::unique_ptr<AudioInputWriter> debug_writer,
     UserInputMonitor* user_input_monitor) {
   DCHECK(sync_writer);
   DCHECK(stream);
 
+  if (factory_) {
+    return factory_->Create(
+        task_runner, sync_writer, AudioManager::Get(), event_handler,
+        media::AudioParameters::UnavailableDeviceParams(), user_input_monitor);
+  }
+
   // Create the AudioInputController object and ensure that it runs on
   // the audio-manager thread.
   scoped_refptr<AudioInputController> controller(new AudioInputController(
       event_handler, sync_writer, std::move(debug_writer), user_input_monitor,
       false));
   controller->task_runner_ = task_runner;
 
   if (!controller->task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&AudioInputController::DoCreateForStream,
@@ skipping 426 matching lines @@
   if (debug_writer_)
     debug_writer_->Write(std::move(data));
 }
 
 void AudioInputController::LogMessage(const std::string& message) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   handler_->OnLog(this, message);
 }
 
 }  // namespace media