Revert 232766 "Refactor MediaStreamManager to never output real ..."

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/strings/string_number_conversions.h"
@@ skipping 401 matching lines @@
 }
 
 void MediaStreamImpl::CreateWebKitSourceVector(
     const std::string& label,
     const StreamDeviceInfoArray& devices,
     WebKit::WebMediaStreamSource::Type type,
     WebKit::WebFrame* frame,
     WebKit::WebVector<WebKit::WebMediaStreamSource>& webkit_sources) {
   CHECK_EQ(devices.size(), webkit_sources.size());
   for (size_t i = 0; i < devices.size(); ++i) {
+    const char* track_type =
+        (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));
+
     const WebKit::WebMediaStreamSource* existing_source =
         FindLocalSource(devices[i]);
     if (existing_source) {
       webkit_sources[i] = *existing_source;
       DVLOG(1) << "Source already exist. Reusing source with id "
                << webkit_sources[i]. id().utf8();
       continue;
     }
     webkit_sources[i].initialize(
-        UTF8ToUTF16(devices[i].device.id),
+        UTF8ToUTF16(source_id),
         type,
         UTF8ToUTF16(devices[i].device.name));
     MediaStreamSourceExtraData* source_extra_data(
         new content::MediaStreamSourceExtraData(
             devices[i],
             base::Bind(&MediaStreamImpl::OnLocalSourceStop, AsWeakPtr())));
     // |source_extra_data| is owned by webkit_sources[i].
     webkit_sources[i].setExtraData(source_extra_data);
     webkit_sources[i].setDeviceId(UTF8ToUTF16(
         base::IntToString(devices[i].session_id)));
@@ skipping 75 matching lines @@
 
 const WebKit::WebMediaStreamSource* MediaStreamImpl::FindLocalSource(
     const StreamDeviceInfo& device) const {
   for (LocalStreamSources::const_iterator it = local_sources_.begin();
        it != local_sources_.end(); ++it) {
     MediaStreamSourceExtraData* extra_data =
         static_cast<MediaStreamSourceExtraData*>(
             it->source.extraData());
     const StreamDeviceInfo& active_device = extra_data->device_info();
     if (active_device.device.id == device.device.id &&
-        active_device.device.type == device.device.type) {
+        active_device.session_id == device.session_id) {
       return &it->source;
     }
   }
   return NULL;
 }
 
 bool MediaStreamImpl::FindSourceInRequests(
     const WebKit::WebMediaStreamSource& source) const {
   for (UserMediaRequests::const_iterator req_it = user_media_requests_.begin();
        req_it != user_media_requests_.end(); ++req_it) {
@@ skipping 319 matching lines @@
       enable_automatic_output_device_selection(
           enable_automatic_output_device_selection),
       frame(frame),
       request(request) {
 }
 
 MediaStreamImpl::UserMediaRequestInfo::~UserMediaRequestInfo() {
 }
 
 }  // namespace content