| Index: content/renderer/render_view_impl.cc
|
| ===================================================================
|
| --- content/renderer/render_view_impl.cc (revision 161359)
|
| +++ content/renderer/render_view_impl.cc (working copy)
|
| @@ -2647,6 +2647,7 @@
|
| audio_source_provider, message_loop_factory, media_stream_impl_,
|
| render_media_log);
|
| if (!media_player) {
|
| +#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) &&
|
| @@ -2655,6 +2656,7 @@
|
| return new webkit_media::WebMediaPlayerMS(
|
| frame, client, AsWeakPtr(), media_stream_impl_, render_media_log);
|
| }
|
| +#endif
|
|
|
| media_player = new webkit_media::WebMediaPlayerImpl(
|
| frame, client, AsWeakPtr(), collection, audio_source_provider,
|
|
|