Revert of WebRTC: Enable OpenH264 for WebRTC standalone bots.

scripts/slave/recipe_modules/webrtc/chromium_config.py

Index: scripts/slave/recipe_modules/webrtc/chromium_config.py
diff --git a/scripts/slave/recipe_modules/webrtc/chromium_config.py b/scripts/slave/recipe_modules/webrtc/chromium_config.py
index 09610c203d1d2886915fc5104dc1547395d21cc9..14aad8f2c174f1a1c4487fdd60eb543d6625a1ec 100644
--- a/scripts/slave/recipe_modules/webrtc/chromium_config.py
+++ b/scripts/slave/recipe_modules/webrtc/chromium_config.py
@@ -12,7 +12,7 @@
 SUPPORTED_TARGET_ARCHS = ('intel', 'arm')
 
 
-@CONFIG_CTX(includes=['chromium', 'dcheck', 'openh264'])
+@CONFIG_CTX(includes=['chromium', 'dcheck'])
 def webrtc_standalone(c):
   _compiler_defaults(c)
 
@@ -25,11 +25,11 @@
 def webrtc_gcc(c):
   _compiler_defaults(c)
 
-@CONFIG_CTX(includes=['chromium_clang', 'dcheck', 'openh264'])
+@CONFIG_CTX(includes=['chromium_clang', 'dcheck'])
 def webrtc_clang(c):
   _compiler_defaults(c)
 
-@CONFIG_CTX(includes=['chromium', 'dcheck', 'static_library', 'openh264'])
+@CONFIG_CTX(includes=['chromium', 'dcheck', 'static_library'])
 def webrtc_ios(c):
   if c.HOST_PLATFORM != 'mac':
     raise BadConf('Only "mac" host platform is supported for iOS (got: "%s")' %
@@ -50,18 +50,11 @@
 @CONFIG_CTX(includes=['gn'])
 def webrtc_gn(c):
   c.compile_py.default_targets = ['all']
-  c.gn_args = [
-    'ffmpeg_branding="Chrome"',
-    'use_openh264=true',
-    'use_third_party_h264=true',
-  ]
 
-@CONFIG_CTX(includes=['webrtc_gn'])
+@CONFIG_CTX(includes=['gn'])
 def webrtc_libfuzzer(c):
-  c.gn_args.extend([
-    'use_libfuzzer=true',
-    'is_asan=true',
-  ])
+  c.gn_args = ['use_libfuzzer=true',
+               'is_asan=true']
 
 def _compiler_defaults(c):
   c.compile_py.default_targets = ['All']