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

content/browser/renderer_host/media/audio_input_renderer_host.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/renderer_host/media/audio_input_renderer_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_math.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "content/browser/media/capture/desktop_capture_device_uma_types.h"
 #include "content/browser/media/capture/web_contents_audio_input_stream.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/media/webrtc/webrtc_internals.h"
 #include "content/browser/renderer_host/media/audio_input_debug_writer.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/public/browser/web_contents_media_capture_id.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_device_description.h"
 #include "media/base/audio_bus.h"
 
 namespace content {
 
 namespace {
 
 #ifdef ENABLE_WEBRTC
 const base::FilePath::CharType kDebugRecordingFileNameAddition[] =
     FILE_PATH_LITERAL("source_input");
 const base::FilePath::CharType kDebugRecordingFileNameExtension[] =
@@ skipping 339 matching lines @@
   }
 
   media::AudioParameters audio_params(config.params);
   if (media_stream_manager_->audio_input_device_manager()
           ->ShouldUseFakeDevice())
     audio_params.set_format(media::AudioParameters::AUDIO_FAKE);
 
   // Check if we have the permission to open the device and which device to use.
   MediaStreamType type = MEDIA_NO_SERVICE;
   std::string device_name;
-  std::string device_id = media::AudioManagerBase::kDefaultDeviceId;
+  std::string device_id = media::AudioDeviceDescription::kDefaultDeviceId;
   if (audio_params.format() != media::AudioParameters::AUDIO_FAKE) {
     const StreamDeviceInfo* info = media_stream_manager_->
         audio_input_device_manager()->GetOpenedDeviceInfoById(session_id);
     if (!info) {
       SendErrorMessage(stream_id, PERMISSION_DENIED);
       DLOG(WARNING) << "No permission has been granted to input stream with "
                     << "session_id=" << session_id;
       MaybeUnregisterKeyboardMicStream(config);
       return;
     }
@@ skipping 62 matching lines @@
         audio_params,
         device_id,
         entry->writer.get(),
         user_input_monitor_,
         config.automatic_gain_control);
     oss << ", AGC=" << config.automatic_gain_control;
 
     // Only count for captures from desktop media picker dialog and system loop
     // back audio.
     if (entry->controller.get() && type == MEDIA_DESKTOP_AUDIO_CAPTURE &&
-        device_id == media::AudioManagerBase::kLoopbackInputDeviceId) {
+        device_id == media::AudioDeviceDescription::kLoopbackInputDeviceId) {
       IncrementDesktopCaptureCounter(SYSTEM_LOOPBACK_AUDIO_CAPTURER_CREATED);
     }
   }
 
   if (!entry->controller.get()) {
     SendErrorMessage(stream_id, STREAM_CREATE_ERROR);
     MaybeUnregisterKeyboardMicStream(config);
     return;
   }
 
@@ skipping 247 matching lines @@
   if (entry->input_debug_writer.get()) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&DeleteInputDebugWriterOnFileThread,
                    base::Passed(std::move(entry->input_debug_writer))));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace content