Looking up device id by session id for AudioRendererMixerInput

media/audio/audio_output_device.h

Index: media/audio/audio_output_device.h
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
index 26f711d38aca1ec3ef7143577b8e8e4df3335e78..d6a01c0e8e553195227396258c40e07b9e790216 100644
--- a/media/audio/audio_output_device.h
+++ b/media/audio/audio_output_device.h
@@ -73,14 +73,14 @@
 #include "media/audio/audio_output_ipc.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/scoped_task_runner_observer.h"
-#include "media/base/audio_renderer_sink.h"
+#include "media/base/audio_renderer_mixer_sink.h"
 #include "media/base/media_export.h"
 #include "media/base/output_device.h"
 
 namespace media {
 
 class MEDIA_EXPORT AudioOutputDevice
-    : NON_EXPORTED_BASE(public AudioRendererSink),
+    : NON_EXPORTED_BASE(public AudioRendererMixerSink),
       NON_EXPORTED_BASE(public AudioOutputIPCDelegate),
       NON_EXPORTED_BASE(public OutputDevice),
       NON_EXPORTED_BASE(public ScopedTaskRunnerObserver) {
@@ -114,12 +114,15 @@ class MEDIA_EXPORT AudioOutputDevice
   // AudioOutputIPCDelegate methods.
   void OnStateChanged(AudioOutputIPCDelegateState state) override;
   void OnDeviceAuthorized(OutputDeviceStatus device_status,
-                          const media::AudioParameters& output_params) override;
+                          const media::AudioParameters& output_params,
+                          const std::string& matched_device_id) override;
   void OnStreamCreated(base::SharedMemoryHandle handle,
                        base::SyncSocket::Handle socket_handle,
                        int length) override;
   void OnIPCClosed() override;
 
+  std::string GetDeviceId() override;

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

Add comment with description.

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

Acknowledged.

+
  protected:
   // Magic required by ref_counted.h to avoid any code deleting the object
   // accidentally while there are references to it.
@@ -185,6 +188,10 @@ class MEDIA_EXPORT AudioOutputDevice
   const std::string device_id_;
   const url::Origin security_origin_;
 
+  // If |device_id_| is empty and |session_id_| is not, |matched_device_id_| is
+  // received in OnDeviceAuthorized().
+  std::string matched_device_id_;
+
   // Our audio thread callback class.  See source file for details.
   class AudioThreadCallback;