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

content/renderer/media/audio_renderer_mixer_manager.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
 #define CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_device_description.h"
 #include "media/base/audio_parameters.h"
 #include "media/base/output_device_info.h"
 #include "url/origin.h"
 
 namespace media {
 class AudioHardwareConfig;
 class AudioRendererMixer;
 class AudioRendererMixerInput;
 class AudioRendererSink;
 }
@@ skipping 73 matching lines @@
         return a.source_render_frame_id < b.source_render_frame_id;
       if (a.params.channels() != b.params.channels())
         return a.params.channels() < b.params.channels();
 
       // Ignore effects(), bits_per_sample(), format(), and frames_per_buffer(),
       // these parameters do not affect mixer reuse.  All AudioRendererMixer
       // units disable FIFO, so frames_per_buffer() can be safely ignored.
       if (a.params.channel_layout() != b.params.channel_layout())
         return a.params.channel_layout() < b.params.channel_layout();
 
-      if (media::AudioManagerBase::IsDefaultDeviceId(a.device_id) &&
-          media::AudioManagerBase::IsDefaultDeviceId(b.device_id)) {
+      if (media::AudioDeviceDescription::IsDefaultDevice(a.device_id) &&
+          media::AudioDeviceDescription::IsDefaultDevice(b.device_id)) {
         // Both device IDs represent the same default device => do not compare
         // them; the default device is always authorized => ignoring security
         // origin.
         return false;
       }
 
       if (a.device_id != b.device_id)
         return a.device_id < b.device_id;
 
       return a.security_origin < b.security_origin;
@@ skipping 13 matching lines @@
   // Active mixers.
   AudioRendererMixerMap mixers_;
   base::Lock mixers_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_