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

content/renderer/media/mock_media_stream_dispatcher.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/mock_media_stream_dispatcher.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "content/public/common/media_stream_request.h"
 #include "media/base/audio_parameters.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 98 matching lines @@
     bool matched_output) {
   StreamDeviceInfo audio;
   audio.device.id = test_same_id_ ? "test_id" : "audio_input_device_id";
   audio.device.id = audio.device.id + base::IntToString(session_id_);
   audio.device.name = "microphone";
   audio.device.type = MEDIA_DEVICE_AUDIO_CAPTURE;
   audio.device.video_facing = MEDIA_VIDEO_FACING_NONE;
   if (matched_output) {
     audio.device.matched_output_device_id =
         kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
+    audio.device.group_id =
+        kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
+  } else {
+    audio.device.group_id = audio.device.id + "groupid";
   }
   audio.session_id = session_id_;
   audio.device.input.sample_rate = media::AudioParameters::kAudioCDSampleRate;
   audio.device.input.channel_layout = media::CHANNEL_LAYOUT_STEREO;
   audio.device.input.frames_per_buffer = audio.device.input.sample_rate / 100;
   audio_input_array_.push_back(audio);
 }
 
 void MockMediaStreamDispatcher::AddAudioOutputDeviceToArray() {
   StreamDeviceInfo audio;
   audio.device.id = kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
+  audio.device.group_id =
+      kAudioOutputDeviceIdPrefix + base::IntToString(session_id_);
   audio.device.name = "speaker";
   audio.device.type = MEDIA_DEVICE_AUDIO_OUTPUT;
   audio.device.video_facing = MEDIA_VIDEO_FACING_NONE;
   audio.session_id = session_id_;
   audio_output_array_.push_back(audio);
 }
 
 void MockMediaStreamDispatcher::AddVideoDeviceToArray(bool facing_user) {
   StreamDeviceInfo video;
   video.device.id = test_same_id_ ? "test_id" : "video_device_id";
   video.device.id = video.device.id + base::IntToString(session_id_);
   video.device.name = "usb video camera";
   video.device.type = MEDIA_DEVICE_VIDEO_CAPTURE;
   video.device.video_facing = facing_user ? MEDIA_VIDEO_FACING_USER
                                           : MEDIA_VIDEO_FACING_ENVIRONMENT;
   video.session_id = session_id_;
   video_array_.push_back(video);
 }
 
 }  // namespace content