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

content/renderer/media/media_stream_impl.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/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 73 matching lines @@
         (type == WebKit::WebMediaStreamSource::TypeAudio) ? "a" : "v";
     std::string source_id = base::StringPrintf("%s%s%u", label.c_str(),
                                                track_type,
                                                static_cast<unsigned int>(i));
     webkit_sources[i].initialize(
           UTF8ToUTF16(source_id),
           type,
           UTF8ToUTF16(devices[i].device.name));
     webkit_sources[i].setExtraData(
         new content::MediaStreamSourceExtraData(devices[i], webkit_sources[i]));
-    webkit_sources[i].setDeviceId(UTF8ToUTF16(devices[i].device.id.c_str()));
+    webkit_sources[i].setDeviceId(UTF8ToUTF16(
+        base::IntToString(devices[i].session_id)));
   }
 }
 
 webrtc::MediaStreamInterface* GetNativeMediaStream(
     const WebKit::WebMediaStream& descriptor) {
   content::MediaStreamExtraData* extra_data =
       static_cast<content::MediaStreamExtraData*>(descriptor.extraData());
   if (!extra_data)
     return NULL;
   return extra_data->stream().get();
@@ skipping 520 matching lines @@
   }
 
   for (size_t i = 0; i < video_sources.size(); ++i) {
     video_sources[i].setReadyState(
             WebKit::WebMediaStreamSource::ReadyStateEnded);
     video_sources[i].setExtraData(NULL);
   }
 }
 
 }  // namespace content