| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 7983f7ad597a03fbe6197a2b95a28899a18d5064..d59586247957f32df071f524a3dc2bb880c37e80 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2699,10 +2699,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
|
|
|
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| #if defined(ENABLE_WEBRTC)
|
| - // TODO(wjia): when all patches related to WebMediaPlayerMS have been
|
| - // landed, remove the switch. Refer to crbug.com/142988.
|
| - if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) &&
|
| - MediaStreamImpl::CheckMediaStream(url)) {
|
| + if (MediaStreamImpl::CheckMediaStream(url)) {
|
| EnsureMediaStreamImpl();
|
| return new webkit_media::WebMediaPlayerMS(
|
| frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog());
|
| @@ -2785,7 +2782,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
|
| }
|
|
|
| webkit_media::WebMediaPlayerParams params(
|
| - sink, gpu_factories, media_stream_impl_, new RenderMediaLog());
|
| + sink, gpu_factories, new RenderMediaLog());
|
| WebMediaPlayer* media_player =
|
| GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
|
| this, frame, client, AsWeakPtr(), params);
|
|
|