Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1082)

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: Changes since the revert. 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
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,

Powered by Google App Engine
This is Rietveld 408576698