Reland review 34393006: Refactor MediaStreamManager to not output real device id.

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 431 matching lines @@
 }
 
 void MediaStreamImpl::CreateWebKitSourceVector(
     const std::string& label,
     const StreamDeviceInfoArray& devices,
     blink::WebMediaStreamSource::Type type,
     blink::WebFrame* frame,
     blink::WebVector<blink::WebMediaStreamSource>& webkit_sources) {
   CHECK_EQ(devices.size(), webkit_sources.size());
   for (size_t i = 0; i < devices.size(); ++i) {
-    const char* track_type =
-        (type == blink::WebMediaStreamSource::TypeAudio) ? "a" : "v";
-    std::string source_id = base::StringPrintf("%s%s%u", label.c_str(),
-                                               track_type,
-                                               static_cast<unsigned int>(i));
-
     const blink::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(source_id),
+        UTF8ToUTF16(devices[i].device.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);
     local_sources_.push_back(LocalStreamSource(frame, webkit_sources[i]));
   }
@@ skipping 413 matching lines @@
       enable_automatic_output_device_selection(
           enable_automatic_output_device_selection),
       frame(frame),
       request(request) {
 }
 
 MediaStreamImpl::UserMediaRequestInfo::~UserMediaRequestInfo() {
 }
 
 }  // namespace content