content/renderer/media/mock_media_stream_dispatcher.cc - Issue 2296393004: Revert of Add groupid for media devices. Group audio devices.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/mock_media_stream_dispatcher.cc

Issue 2296393004: Revert of Add groupid for media devices. Group audio devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/public/common/media_stream_request.h ('k') | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_media_stream_dispatcher.cc

diff --git a/content/renderer/media/mock_media_stream_dispatcher.cc b/content/renderer/media/mock_media_stream_dispatcher.cc

index e66985142b330e2877bf0483524495a0a0f599a0..86947d0b7d2a4ea8fd9d6b9dd92eb4b393e5340d 100644

--- a/content/renderer/media/mock_media_stream_dispatcher.cc

+++ b/content/renderer/media/mock_media_stream_dispatcher.cc

@@ -116,10 +116,6 @@

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;

@@ -131,8 +127,6 @@

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;