| Index: content/browser/renderer_host/media/media_stream_ui_controller.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_ui_controller.cc b/content/browser/renderer_host/media/media_stream_ui_controller.cc
|
| index 229b5d4821deb70fd275b218f5317a157260f6d8..cab9c54d64b2b86bb84567a43c4a0ae31d022d3b 100644
|
| --- a/content/browser/renderer_host/media/media_stream_ui_controller.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_ui_controller.cc
|
| @@ -71,8 +71,9 @@ class MediaStreamRequestForUI : public MediaStreamRequest {
|
| MediaStreamRequestForUI(int render_pid,
|
| int render_vid,
|
| const GURL& origin,
|
| - const StreamOptions& options)
|
| - : MediaStreamRequest(render_pid, render_vid, origin),
|
| + const StreamOptions& options,
|
| + MediaStreamRequestType request_type)
|
| + : MediaStreamRequest(render_pid, render_vid, origin, request_type),
|
| wait_for_audio(IsAudioMediaType(options.audio_type)),
|
| wait_for_video(IsVideoMediaType(options.video_type)),
|
| posted_task(false) {
|
| @@ -137,14 +138,14 @@ void MediaStreamUIController::MakeUIRequest(
|
| int render_process_id,
|
| int render_view_id,
|
| const StreamOptions& request_options,
|
| - const GURL& security_origin) {
|
| + const GURL& security_origin, MediaStreamRequestType request_type) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| // Create a new request.
|
| if (!requests_.insert(
|
| std::make_pair(label, new MediaStreamRequestForUI(
|
| render_process_id, render_view_id, security_origin,
|
| - request_options))).second) {
|
| + request_options, request_type))).second) {
|
| NOTREACHED();
|
| }
|
| }
|
|
|