Revert of WebRTC: Enable OpenH264 for WebRTC standalone bots.

scripts/slave/recipe_modules/webrtc/chromium_config.py

 # Copyright 2013 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.
 
 from recipe_engine.config import BadConf
 from recipe_engine.config_types import Path
 
 import DEPS
 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX
 
 
 SUPPORTED_TARGET_ARCHS = ('intel', 'arm')
 
 
-@CONFIG_CTX(includes=['chromium', 'dcheck', 'openh264'])
+@CONFIG_CTX(includes=['chromium', 'dcheck'])
 def webrtc_standalone(c):
   _compiler_defaults(c)
 
   c.runtests.memory_tests_runner = Path('[CHECKOUT]', 'tools',
                                         'valgrind-webrtc', 'webrtc_tests',
                                         platform_ext={'win': '.bat',
                                                       'mac': '.sh',
                                                       'linux': '.sh'})
 @CONFIG_CTX(includes=['ninja', 'gcc', 'goma'])
 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")' %
                   c.HOST_PLATFORM)  # pragma: no cover
   if c.TARGET_PLATFORM != 'ios':
     raise BadConf('Only "ios" target platform is supported (got: "%s")' %
                   c.TARGET_PLATFORM)  # pragma: no cover
   if c.TARGET_ARCH == 'arm':
     c.build_config_fs = c.BUILD_CONFIG + '-iphoneos'
   if c.TARGET_ARCH == 'intel':
     c.build_config_fs = c.BUILD_CONFIG + '-iphonesimulator'
 
   gyp_defs = c.gyp_env.GYP_DEFINES
   gyp_defs['chromium_ios_signing'] = 0
   gyp_defs['OS'] = c.TARGET_PLATFORM
   _compiler_defaults(c)
 
 @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']