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

https://src.chromium.org/viewvc/chrome?revision=232766&view=revision

Refactor MediaStreamManager to never output physical device ids. It now output sourceId in the form of a HMAC.
DeviceMessageFilter now don't need to create a source id.
This also fix a bug that made the source ids useless unless you have called gum once.
Note that the sourceIds are still just using the security origin as salt. Next step is to add a random number that is stored in the profile.

BUG= 269139,313192

Review URL: https://codereview.chromium.org/88283002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237825 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 11 deletions

diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index 462dcf6..aa2733f 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -465,12 +465,6 @@ void MediaStreamImpl::CreateWebKitSourceVector(
     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) {
@@ -480,7 +474,7 @@ void MediaStreamImpl::CreateWebKitSourceVector(
       continue;
     }
     webkit_sources[i].initialize(
-        UTF8ToUTF16(source_id),
+        UTF8ToUTF16(devices[i].device.id),
         type,
         UTF8ToUTF16(devices[i].device.name));
     MediaStreamSourceExtraData* source_extra_data(
diff --git a/content/renderer/media/mock_media_stream_dispatcher.cc b/content/renderer/media/mock_media_stream_dispatcher.cc
index a1b9527..793fe3a 100644
--- a/content/renderer/media/mock_media_stream_dispatcher.cc
+++ b/content/renderer/media/mock_media_stream_dispatcher.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/media/mock_media_stream_dispatcher.h"
 
-#include "base/strings/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "content/public/common/media_stream_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -28,13 +28,13 @@ void MockMediaStreamDispatcher::GenerateStream(
     const GURL& url) {
   request_id_ = request_id;
 
-  stream_label_ = base::StringPrintf("%s%d","local_stream",request_id);
+  stream_label_ = "local_stream" + base::IntToString(request_id);
   audio_array_.clear();
   video_array_.clear();
 
   if (IsAudioMediaType(components.audio_type)) {
     StreamDeviceInfo audio;
-    audio.device.id = "audio_device_id";
+    audio.device.id = "audio_device_id" + base::IntToString(session_id_);
     audio.device.name = "microphone";
     audio.device.type = components.audio_type;
     audio.session_id = session_id_;
@@ -42,7 +42,7 @@ void MockMediaStreamDispatcher::GenerateStream(
   }
   if (IsVideoMediaType(components.video_type)) {
     StreamDeviceInfo video;
-    video.device.id = "video_device_id";
+    video.device.id = "video_device_id" + base::IntToString(session_id_);
     video.device.name = "usb video camera";
     video.device.type = components.video_type;
     video.session_id = session_id_;