content/browser/renderer_host/media/media_stream_dispatcher_host.cc - Issue 88283002: Reland review 34393006: Refactor MediaStreamManager to not output real device id.

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/browser/renderer_host/media/media_stream_dispatcher_host.cc

Issue 88283002: Reland review 34393006: Refactor MediaStreamManager to not output real device id. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make sure devices are not enumerated unless there is a valid security origin. Created 7 years, 1 month 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

« no previous file with comments | « content/browser/renderer_host/media/device_request_message_filter_unittest.cc ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | content/browser/renderer_host/media/media_stream_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc

diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc

index 3d73e96b4303862597f68f7739ba9d23ddc30b36..c07d0130b4b3ae400e81f3dee5aba344df4003c3 100644

--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc

+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc

@@ -137,12 +137,8 @@ void MediaStreamDispatcherHost::OnGenerateStream(

const std::string& label = media_stream_manager_->GenerateStream(

this, render_process_id_, render_view_id, page_request_id,

components, security_origin);

- if (label.empty()) {

- Send(new MediaStreamMsg_StreamGenerationFailed(render_view_id,

- page_request_id));

- } else {

- StoreRequest(render_view_id, page_request_id, label);

- }

+ CHECK(!label.empty());

+ StoreRequest(render_view_id, page_request_id, label);

}

void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,