Merge 191377 "Move webrtc behind flag(--enable-webrtc) for b..."

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 645 matching lines @@
 
   if (command_line.HasSwitch(switches::kDisableGeolocation))
     WebRuntimeFeatures::enableGeolocation(false);
 
 #if !defined(OS_ANDROID) || defined(GOOGLE_TV)
   if (command_line.HasSwitch(switches::kDisableMediaSource))
     WebRuntimeFeatures::enableMediaSource(false);
 #endif
 
 #if defined(OS_ANDROID)
-  if (command_line.HasSwitch(switches::kDisableWebRTC))
+  if (!command_line.HasSwitch(switches::kEnableWebRTC))
     WebRuntimeFeatures::enableMediaStream(false);
 #endif
 
 #if defined(OS_ANDROID)
-  if (command_line.HasSwitch(switches::kDisableWebRTC))
+  if (!command_line.HasSwitch(switches::kEnableWebRTC))
     WebRuntimeFeatures::enablePeerConnection(false);
 #endif
 
   if (command_line.HasSwitch(switches::kDisableFullScreen))
     WebRuntimeFeatures::enableFullScreenAPI(false);
 
   if (command_line.HasSwitch(switches::kDisableEncryptedMedia))
     WebRuntimeFeatures::enableEncryptedMedia(false);
 
 #if defined(OS_ANDROID)
@@ skipping 538 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(OS_ANDROID)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableWebRTC))
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableWebRTC))
     return NULL;
 #endif
 
 #if defined(ENABLE_WEBRTC)
   if (!media_stream_center_) {
     media_stream_center_ = GetContentClient()->renderer()
         ->OverrideCreateWebMediaStreamCenter(client);
     if (!media_stream_center_) {
       media_stream_center_ = new MediaStreamCenter(
           client, GetMediaStreamDependencyFactory());
@@ skipping 63 matching lines @@
 
 void RenderThreadImpl::SetFlingCurveParameters(
     const std::vector<float>& new_touchpad,
     const std::vector<float>& new_touchscreen) {
   webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
                                                     new_touchscreen);
 
 }
 
 }  // namespace content