reland http://codereview.chromium.org/10379003/

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 509 matching lines @@
 
   WebRuntimeFeatures::enableGeolocation(
       !command_line.HasSwitch(switches::kDisableGeolocation));
 
   WebKit::WebRuntimeFeatures::enableMediaSource(
       command_line.HasSwitch(switches::kEnableMediaSource));
 
   WebRuntimeFeatures::enableMediaPlayer(
       media::IsMediaLibraryInitialized());
 
-  WebKit::WebRuntimeFeatures::enableMediaStream(
-      command_line.HasSwitch(switches::kEnableMediaStream));
+  WebKit::WebRuntimeFeatures::enableMediaStream(true);
 
   WebKit::WebRuntimeFeatures::enablePeerConnection(
       command_line.HasSwitch(switches::kEnablePeerConnection));
 
   WebKit::WebRuntimeFeatures::enableFullScreenAPI(
       !command_line.HasSwitch(switches::kDisableFullScreen));
 
   WebKit::WebRuntimeFeatures::enablePointerLock(
       command_line.HasSwitch(switches::kEnablePointerLock));
 
@@ skipping 373 matching lines @@
 
   // Connect to the GPU process if a channel name was received.
   gpu_channel_->Connect(channel_handle);
 
   return GetGpuChannel();
 }
 
 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
   return media_stream_center_;
 }
 
 GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
   if (!gpu_channel_.get())
     return NULL;
 
@@ skipping 28 matching lines @@
 
 scoped_refptr<base::MessageLoopProxy>
 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
     file_thread_->Start();
   }
   return file_thread_->message_loop_proxy();
 }