GN: take over some exisiting bots

infra/bots/recipe_modules/flavor/api.py

 # Copyright 2016 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.
 
 
 # pylint: disable=W0201
 
 
 from recipe_engine import recipe_api
 
@@ skipping 20 matching lines @@
 def is_android(builder_cfg):
   """Determine whether the given builder is an Android builder."""
   return ('Android' in builder_cfg.get('extra_config', '') or
           builder_cfg.get('os') == 'Android')
 
 
 def is_cmake(builder_cfg):
   return 'CMake' in builder_cfg.get('extra_config', '')
 
 
-def is_gn(builder_cfg):
-  return 'GN' == builder_cfg.get('extra_config', '')
-
-
 def is_ios(builder_cfg):
   return ('iOS' in builder_cfg.get('extra_config', '') or
           builder_cfg.get('os') == 'iOS')
 
 
 def is_pdfium(builder_cfg):
   return 'PDFium' in builder_cfg.get('extra_config', '')
 
 
 def is_valgrind(builder_cfg):
   return 'Valgrind' in builder_cfg.get('extra_config', '')
 
 
 def is_xsan(builder_cfg):
   return ('ASAN' in builder_cfg.get('extra_config', '') or
           'MSAN' in builder_cfg.get('extra_config', '') or
           'TSAN' in builder_cfg.get('extra_config', ''))
 
 
 class SkiaFlavorApi(recipe_api.RecipeApi):
   def get_flavor(self, builder_cfg):
     """Return a flavor utils object specific to the given builder."""
+    gn = gn_flavor.GNFlavorUtils(self.m)
+    if gn.supported():
+      return gn
+
     if is_android(builder_cfg):
       return android_flavor.AndroidFlavorUtils(self.m)
     elif is_cmake(builder_cfg):
       return cmake_flavor.CMakeFlavorUtils(self.m)
-    elif is_gn(builder_cfg):
-      return gn_flavor.GNFlavorUtils(self.m)
     elif is_ios(builder_cfg):
       return ios_flavor.iOSFlavorUtils(self.m)
     elif is_pdfium(builder_cfg):
       return pdfium_flavor.PDFiumFlavorUtils(self.m)
     elif is_valgrind(builder_cfg):
       return valgrind_flavor.ValgrindFlavorUtils(self.m)
     elif is_xsan(builder_cfg):
       return xsan_flavor.XSanFlavorUtils(self.m)
     elif builder_cfg.get('configuration') == 'Coverage':
       return coverage_flavor.CoverageFlavorUtils(self.m)
@@ skipping 121 matching lines @@
         version,
         VERSION_FILE_SKP,
         self.m.vars.tmp_dir,
         self.m.vars.local_skp_dir,
         self.device_dirs.skp_dir,
         test_expected_version=self.m.properties.get(
             'test_downloaded_skp_version', TEST_EXPECTED_SKP_VERSION),
         test_actual_version=self.m.properties.get(
             'test_downloaded_skp_version', TEST_EXPECTED_SKP_VERSION))
     return version