Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

components/audio_modem/audio_recorder_impl.cc

 // Copyright 2015 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 "components/audio_modem/audio_recorder_impl.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/audio_modem/public/audio_modem_types.h"
 #include "content/public/browser/browser_thread.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_manager.h"
-#include "media/audio/audio_manager_base.h"
 #include "media/base/audio_bus.h"
 
 namespace audio_modem {
 
 namespace {
 
 const float kProcessIntervalMs = 500.0f;  // milliseconds.
 
 void AudioBusToString(std::unique_ptr<media::AudioBus> source,
                       std::string* buffer) {
@@ skipping 66 matching lines @@
 // Private methods.
 
 void AudioRecorderImpl::InitializeOnAudioThread() {
   DCHECK(media::AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
 
   media::AudioParameters params;
   if (params_for_testing_) {
     params = *params_for_testing_;
   } else {
     params = media::AudioManager::Get()->GetInputStreamParameters(
-        media::AudioManagerBase::kDefaultDeviceId);
+        media::AudioDeviceDescription::kDefaultDeviceId);
     params.set_effects(media::AudioParameters::NO_EFFECTS);
   }
 
   total_buffer_frames_ = kProcessIntervalMs * params.sample_rate() / 1000;
   buffer_ = media::AudioBus::Create(params.channels(), total_buffer_frames_);
   buffer_frame_index_ = 0;
 
   stream_ = input_stream_for_testing_
                 ? input_stream_for_testing_.get()
                 : media::AudioManager::Get()->MakeAudioInputStream(
-                      params, media::AudioManagerBase::kDefaultDeviceId);
+                      params, media::AudioDeviceDescription::kDefaultDeviceId);
 
   if (!stream_ || !stream_->Open()) {
     LOG(ERROR) << "Failed to open an input stream.";
     if (stream_) {
       stream_->Close();
       stream_ = nullptr;
     }
     return;
   }
   stream_->SetVolume(stream_->GetMaxVolume());
@@ skipping 65 matching lines @@
 
 void AudioRecorderImpl::OnError(media::AudioInputStream* /* stream */) {
   LOG(ERROR) << "Error during sound recording.";
   media::AudioManager::Get()->GetTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&AudioRecorderImpl::StopAndCloseOnAudioThread,
                  base::Unretained(this)));
 }
 
 }  // namespace audio_modem