Looking up device id by session id for AudioRendererMixerInput

content/renderer/media/audio_renderer_mixer_manager.h

Index: content/renderer/media/audio_renderer_mixer_manager.h
diff --git a/content/renderer/media/audio_renderer_mixer_manager.h b/content/renderer/media/audio_renderer_mixer_manager.h
index 8b13388de2599c7acbf4d968f1b80d5b8d97b60e..c44add762155507e83d5c06258f0f66ae940341e 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.h
+++ b/content/renderer/media/audio_renderer_mixer_manager.h
@@ -12,6 +12,7 @@
 #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_parameters.h"
 #include "media/base/output_device.h"
 #include "url/origin.h"
@@ -51,6 +52,7 @@ class CONTENT_EXPORT AudioRendererMixerManager {
   // device to use
   media::AudioRendererMixerInput* CreateInput(
       int source_render_frame_id,
+      int session_id,

[Henrik Grunell, 2016/03/08 21:09:57]

Is |session_id| optional or compulsory? Seems like we only care about it if
|device_id| is empty. Add info in the comment.

[o1ka, 2016/04/05 15:13:38]

Done.

       const std::string& device_id,
       const url::Origin& security_origin);
 
@@ -102,8 +104,16 @@ class CONTENT_EXPORT AudioRendererMixerManager {
       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)) {
+        // 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.device_id < b.device_id);

[o1ka, 2016/03/07 15:25:49]

nit: I'll remove brackets.

[o1ka, 2016/04/05 15:13:38]

Done.

 
       return a.security_origin < b.security_origin;
     }
@@ -134,8 +144,6 @@ class CONTENT_EXPORT AudioRendererMixerManager {
   AudioRendererMixerMap mixers_;
   base::Lock mixers_lock_;
 
-  media::AudioRendererSink* sink_for_testing_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager);
 };