Enable webrtc by default on Android.

BUG=190313
Review URL: https://codereview.chromium.org/12719006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188095 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 17 insertions, 17 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index ce0b3e5..4728eb7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6529,11 +6529,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION" desc="Description for the flag to disable WebGL.">
         Enabling this option prevents web applications from accessing the WebGL API.
       </message>
-      <message name="IDS_FLAGS_ENABLE_WEBRTC_NAME" desc="Name of the 'Enable WebRTC' lab.">
-        Enable WebRTC
+      <message name="IDS_FLAGS_DISABLE_WEBRTC_NAME" desc="Name of the 'Disable WebRTC' lab.">
+        Disable WebRTC
       </message>
-      <message name="IDS_FLAGS_ENABLE_WEBRTC_DESCRIPTION" desc="Description for the flag to enable WebRTC.">
-        Enabling this option allows web applications to access the WebRTC API.
+      <message name="IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION" desc="Description for the flag to disable WebRTC.">
+        Enabling this option prevents web applications from accessing the WebRTC API.
       </message>
       <message name="IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_NAME" desc="Name of the 'Fixed position creates stacking context' lab.">
         Fixed position elements create stacking contexts.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 7579d91..b8a68f1 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -412,12 +412,12 @@ const Experiment kExperiments[] = {
 #endif
   },
   {
-    "enable-webrtc",
-    IDS_FLAGS_ENABLE_WEBRTC_NAME,
-    IDS_FLAGS_ENABLE_WEBRTC_DESCRIPTION,
+    "disable-webrtc",
+    IDS_FLAGS_DISABLE_WEBRTC_NAME,
+    IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
     kOsAndroid,
 #if defined(OS_ANDROID)
-    SINGLE_VALUE_TYPE(switches::kEnableWebRTC)
+    SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
 #else
     SINGLE_VALUE_TYPE("")
 #endif
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 62f6687..1c3ed2e 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -784,7 +784,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kDisableSpeechInput,
 #if defined(OS_ANDROID)
     switches::kEnableWebAudio,
-    switches::kEnableWebRTC,
+    switches::kDisableWebRTC,
 #else
     switches::kDisableWebAudio,
 #endif
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 0e41815..5ed8a73 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -215,8 +215,8 @@ const char kSpeechRecognitionWebserviceKey[] = "speech-service-key";
 // Enable web audio API.
 const char kEnableWebAudio[]                = "enable-webaudio";
 
-// WebRTC is disabled by default on Android.
-const char kEnableWebRTC[]                  = "enable-webrtc";
+// WebRTC is enabled by default on Android.
+const char kDisableWebRTC[]                 = "disable-webrtc";
 #else
 // Disable web audio API.
 const char kDisableWebAudio[]               = "disable-webaudio";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index e13a3bf..2875e61 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -81,7 +81,7 @@ CONTENT_EXPORT extern const char kDisableSpeechInput[];
 extern const char kSpeechRecognitionWebserviceKey[];
 #if defined(OS_ANDROID)
 CONTENT_EXPORT extern const char kEnableWebAudio[];
-CONTENT_EXPORT extern const char kEnableWebRTC[];
+CONTENT_EXPORT extern const char kDisableWebRTC[];
 #else
 CONTENT_EXPORT extern const char kDisableWebAudio[];
 #endif
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 8879aa0..0271718 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -695,9 +695,9 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
 
 #if defined(OS_ANDROID)
   WebKit::WebRuntimeFeatures::enableMediaStream(
-      command_line.HasSwitch(switches::kEnableWebRTC));
+      !command_line.HasSwitch(switches::kDisableWebRTC));
   WebKit::WebRuntimeFeatures::enablePeerConnection(
-      command_line.HasSwitch(switches::kEnableWebRTC));
+      !command_line.HasSwitch(switches::kDisableWebRTC));
 #else
   WebKit::WebRuntimeFeatures::enableMediaStream(true);
   WebKit::WebRuntimeFeatures::enablePeerConnection(true);
@@ -1190,8 +1190,8 @@ GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync(
 WebKit::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter(
     WebKit::WebMediaStreamCenterClient* client) {
 #if defined(OS_ANDROID)
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableWebRTC))
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableWebRTC))
     return NULL;
 #endif
 
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8e107b2..c7a0da0 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -4061,7 +4061,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
     return;
 
 #if defined(OS_ANDROID)
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebRTC))
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebRTC))
     return;
 #endif