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

chrome/browser/about_flags.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 "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 403 matching lines @@
     IDS_FLAGS_DISABLE_WEBGL_NAME,
     IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
     kOsDesktop,
 #if defined(OS_ANDROID)
     SINGLE_VALUE_TYPE("")
 #else
     SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
 #endif
   },
   {
-    "disable-webrtc",
-    IDS_FLAGS_DISABLE_WEBRTC_NAME,
-    IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
+    "enable-webrtc",
+    IDS_FLAGS_ENABLE_WEBRTC_NAME,
+    IDS_FLAGS_ENABLE_WEBRTC_DESCRIPTION,
     kOsAndroid,
 #if defined(OS_ANDROID)
-    SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
+    SINGLE_VALUE_TYPE(switches::kEnableWebRTC)
 #else
     SINGLE_VALUE_TYPE("")
 #endif
   },
 #if defined(OS_ANDROID)
   {
     "enable-webaudio",
     IDS_FLAGS_ENABLE_WEBAUDIO_NAME,
     IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION,
     kOsAndroid,
@@ skipping 1513 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags