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

content/public/common/content_switches.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/public/common/content_switches.h"
 
 namespace switches {
 
 // By default, file:// URIs cannot read other file:// URIs. This is an
 // override for developers who need the old behavior for testing.
@@ skipping 194 matching lines @@
 // Specifies the request key for the continuous speech recognition webservice.
 const char kSpeechRecognitionWebserviceKey[] = "speech-service-key";
 
 // Enables web speech synthesis api.
 const char kEnableSpeechSynthesis[]            = "enable-speech-synthesis";
 
 #if defined(OS_ANDROID)
 // Enable web audio API.
 const char kEnableWebAudio[]                = "enable-webaudio";
 
-// WebRTC is enabled by default on Android.
-const char kDisableWebRTC[]                 = "disable-webrtc";
+// WebRTC is disabled by default on Android.
+const char kEnableWebRTC[]                  = "enable-webrtc";
 #else
 // Disable web audio API.
 const char kDisableWebAudio[]               = "disable-webaudio";
 #endif
 
 // Enables Web MIDI API.
 const char kEnableWebMIDI[]                 = "enable-web-midi";
 
 // Don't enforce the same-origin policy. (Used by people testing their sites.)
 const char kDisableWebSecurity[]            = "disable-web-security";
@@ skipping 571 matching lines @@
 // Enables or disables history navigation in response to horizontal overscroll.
 // Set the value to '1' to enable the feature, and set to '0' to disable.
 // Defaults to enabled.
 const char kOverscrollHistoryNavigation[] =
     "overscroll-history-navigation";
 
 // Enables 'image/webp' accept header for image requests.
 const char kEnableWebPInAcceptHeader[] = "enable-webp-in-accept-header";
 
 }  // namespace switches