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

content/renderer/pepper/pepper_platform_audio_input.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/renderer/pepper/pepper_platform_audio_input.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/pepper/pepper_audio_input_host.h"
 #include "content/renderer/pepper/pepper_media_device_manager.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_device_description.h"
 #include "ppapi/shared_impl/ppb_audio_config_shared.h"
 #include "url/gurl.h"
 
 namespace content {
 
 // static
 PepperPlatformAudioInput* PepperPlatformAudioInput::Create(
     int render_frame_id,
     const std::string& device_id,
     const GURL& document_url,
@@ skipping 138 matching lines @@
   params_.Reset(media::AudioParameters::AUDIO_PCM_LINEAR,
                 media::CHANNEL_LAYOUT_MONO,
                 sample_rate,
                 ppapi::kBitsPerAudioInputSample,
                 frames_per_buffer);
 
   // We need to open the device and obtain the label and session ID before
   // initializing.
   pending_open_device_id_ = GetMediaDeviceManager()->OpenDevice(
       PP_DEVICETYPE_DEV_AUDIOCAPTURE,
-      device_id.empty() ? media::AudioManagerBase::kDefaultDeviceId : device_id,
+      device_id.empty() ? media::AudioDeviceDescription::kDefaultDeviceId
+                        : device_id,
       document_url,
       base::Bind(&PepperPlatformAudioInput::OnDeviceOpened, this));
   pending_open_device_ = true;
 
   return true;
 }
 
 void PepperPlatformAudioInput::InitializeOnIOThread(int session_id) {
   DCHECK(io_task_runner_->BelongsToCurrentThread());
 
@@ skipping 90 matching lines @@
 PepperMediaDeviceManager* PepperPlatformAudioInput::GetMediaDeviceManager() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   RenderFrameImpl* const render_frame =
       RenderFrameImpl::FromRoutingID(render_frame_id_);
   return render_frame ?
       PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
 }
 
 }  // namespace content