Motown: Remove ffmpeg_branding arg to fix fnl build.

mojo/tools/mopy/gn_unittest.py

 # Copyright 2014 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.
 
 import itertools
 import sys
 import unittest
 
 import mopy.gn as gn
 
@@ skipping 36 matching lines @@
       "target_os": [None, "android"],
       "target_cpu": ["x86", "x64", "arm", "arm64"],
       "is_debug": [False, True],
       "is_official_build": [False, True],
       "is_clang": [False, True],
       "is_asan": [False, True],
       "use_goma": [False],
       "mojo_use_nacl": [False, True],
       "mojo_use_go": [False],
       "dcheck_always_on": [False, True],
-      "ffmpeg_branding": ["ChromeOS"],
     }
 
     for args in _iterate_over_config(configs_to_test):
-      if args.get("target_os") == "android" and args["ffmpeg_branding"]:
-        continue
       config = gn.ConfigForGNArgs(args)
       new_args = gn.GNArgsForConfig(config)
       self.assertDictEqual(args, new_args)
 
 
 def _iterate_over_config(config):
   def product_to_dict(p):
     return dict(filter(lambda x: x[1] is not None, zip(config.keys(), p)))
   return itertools.imap(product_to_dict, itertools.product(*config.values()))
 
 
 if __name__ == "__main__":
   unittest.main()