Revert of Add groupid for media devices. Group audio devices.

content/browser/renderer_host/media/media_stream_manager.cc

Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 288ff2379cfef6c33e3e27f9ae373dbe840501d6..0d549c72f8aec382eb1ace40b0d9b79e4d00dece 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -767,8 +767,6 @@
     for (const auto& entry : device_enumeration.devices) {
       StreamDeviceInfo device_info(MEDIA_DEVICE_AUDIO_OUTPUT, entry.device_name,
                                    entry.unique_id);
-      device_info.device.group_id =

[Guido Urdaneta, 2016/09/02 09:16:36]

The problem with the failed test is that you are calling GetGroupIDOutput on the
IO thread here.

You should do it on audio_manager_->GetTaskRunner(), as in
https://cs.chromium.org/chromium/src/content/browser/renderer_host/media/medi...

Sorry for not catching that during the regular review :)

-          audio_manager_->GetGroupIDOutput(device_info.device.id);
       device_infos.push_back(device_info);
     }
   }
@@ -1042,9 +1040,6 @@
       request->video_type() == MEDIA_DEVICE_VIDEO_CAPTURE) {
     device->id = GetHMACForMediaDeviceID(request->salt,
                                          request->security_origin, device->id);
-    if (!device->group_id.empty())
-      device->group_id = GetHMACForMediaDeviceID(
-          request->salt, request->security_origin, device->group_id);
   }
 }