| Index: content/renderer/render_thread_impl.cc
|
| ===================================================================
|
| --- content/renderer/render_thread_impl.cc (revision 136661)
|
| +++ content/renderer/render_thread_impl.cc (working copy)
|
| @@ -527,8 +527,7 @@
|
| WebRuntimeFeatures::enableMediaPlayer(
|
| media::IsMediaLibraryInitialized());
|
|
|
| - WebKit::WebRuntimeFeatures::enableMediaStream(
|
| - command_line.HasSwitch(switches::kEnableMediaStream));
|
| + WebKit::WebRuntimeFeatures::enableMediaStream(true);
|
|
|
| WebKit::WebRuntimeFeatures::enablePeerConnection(
|
| command_line.HasSwitch(switches::kEnablePeerConnection));
|
| @@ -921,10 +920,6 @@
|
| WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter(
|
| WebKit::WebMediaStreamCenterClient* client) {
|
| #if defined(ENABLE_WEBRTC)
|
| - if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableMediaStream)) {
|
| - return NULL;
|
| - }
|
| if (!media_stream_center_)
|
| media_stream_center_ = new content::MediaStreamCenter(client);
|
| #endif
|
|
|