Reland 15721002: Hook up the device selection to the WebAudio live audio

media/audio/audio_output_device.cc

Index: media/audio/audio_output_device.cc
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index 192823ae06a9d2b2b0e41a47a46d49fca273ab98..b0319df41eb9a379aa27365fbc05c0973a919624 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -48,6 +48,7 @@ AudioOutputDevice::AudioOutputDevice(
       ipc_(ipc.Pass()),
       state_(IDLE),
       play_on_start_(true),
+      session_id_(-1),
       stopping_hack_(false) {
   CHECK(ipc_);
 
@@ -59,12 +60,19 @@ AudioOutputDevice::AudioOutputDevice(
   COMPILE_ASSERT(PAUSED < PLAYING, invalid_enum_value_assignment_3);
 }
 
-void AudioOutputDevice::Initialize(const AudioParameters& params,
-                                   RenderCallback* callback) {
-  DCHECK(!callback_) << "Calling Initialize() twice?";
+void AudioOutputDevice::InitializeUnifiedStream(const AudioParameters& params,
+                                                RenderCallback* callback,
+                                                int session_id) {
+  DCHECK(!callback_) << "Calling InitializeUnifiedStream() twice?";
   DCHECK(params.IsValid());
   audio_parameters_ = params;
   callback_ = callback;
+  session_id_ = session_id;
+}
+
+void AudioOutputDevice::Initialize(const AudioParameters& params,
+                                   RenderCallback* callback) {
+  InitializeUnifiedStream(params, callback, 0);
 }
 
 AudioOutputDevice::~AudioOutputDevice() {
@@ -117,7 +125,7 @@ void AudioOutputDevice::CreateStreamOnIOThread(const AudioParameters& params) {
   DCHECK(message_loop()->BelongsToCurrentThread());
   if (state_ == IDLE) {
     state_ = CREATING_STREAM;
-    ipc_->CreateStream(this, params);
+    ipc_->CreateStream(this, params, session_id_);
   }
 }