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

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Issue 60193002: Revert 232766 "Refactor MediaStreamManager to never output real ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1700/src/
Patch Set: 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
===================================================================
--- content/browser/renderer_host/media/media_stream_dispatcher_host.cc (revision 232998)
+++ content/browser/renderer_host/media/media_stream_dispatcher_host.cc (working copy)
@@ -133,8 +133,12 @@
const std::string& label = media_stream_manager_->GenerateStream(
this, render_process_id_, render_view_id, page_request_id,
components, security_origin);
- CHECK(!label.empty());
- StoreRequest(render_view_id, page_request_id, label);
+ if (label.empty()) {
+ Send(new MediaStreamMsg_StreamGenerationFailed(render_view_id,
+ page_request_id));
+ } else {
+ StoreRequest(render_view_id, page_request_id, label);
+ }
}
void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,

Powered by Google App Engine
This is Rietveld 408576698