Use ui_unittests instead of gfx_unittests.

masters/master.tryserver.chromium/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 # These modules come from scripts, which must be in the PYTHONPATH.
@@ skipping 250 matching lines @@
 # insane. Should be fixed separately.
 linux_tests_full_name = [
   'base_unittests',
   'browser_tests',
   'cacheinvalidation_unittests',
   'check_deps',
   'check_licenses',
   'content_unittests',
   'crypto_unittests',
   'dbus_unittests',
-  'gfx_unittests',
   'googleurl_unittests',
   'gpu_unittests',
   'interactive_ui_tests',
   'ipc_tests',
   'jingle_unittests',
   'media_unittests',
   'nacl_integration',
   'net_unittests',
   'printing_unittests',
   'pyauto_functional_tests',
   'remoting_unittests',
   'safe_browsing_tests',
   'sql_unittests',
   'sync_integration_tests',
   'sync_unit_tests',
   'test_shell_tests',
+  'ui_unittests',
   'unit_tests',
   'webkit_lint',
   'webkit_unit_tests',
 ]
 
 b_linux = CreateBuilder(platform='linux',
                         target='Debug',
                         options=['--compiler=goma'],
                         tests=linux_tests,
                         builder_name='linux',
@@ skipping 14 matching lines @@
   #'browser_tests',
   'cacheinvalidation',
   #'compositor',
   'crypto',
   'googleurl',
   #'interactive_ui',
   'jingle',
   'media',
   'printing',
   'remoting',
+  'ui_unittests',
   'views',
   #'unit',
   'unit_ipc',
   'unit_sync',
   'unit_unit',
   'unit_sql',
-  'unit_gfx',
   'unit_content',
 ]
 
 linux_aura_options = [
   'aura_builder',
   'base_unittests',
+  'browser_tests',
   'cacheinvalidation_unittests',
+  'content_unittests',
   'crypto_unittests',
   'googleurl_unittests',
+  'interactive_ui_tests',
+  'ipc_tests',
   'jingle_unittests',
   'media_unittests',
   'printing_unittests',
   'remoting_unittests',
-  'ipc_tests',
+  'sql_unittests',
   'sync_unit_tests',
-  'sql_unittests',
-  'gfx_unittests',
-  'content_unittests',
-  'browser_tests',
-  'interactive_ui_tests',
+  'ui_unittests',
 ]
 
 b_linux_aura = CreateBuilder(platform='linux',
                              target='Release',
                              options=['--compiler=goma'] + linux_aura_options,
                              tests=linux_aura_tests,
                              builder_name='linux_aura',
                              sharded_tests=linux_sharded,
                              slavebuilddir='linux_aura',
                              extra_gyp_defines='use_aura=1')
@@ skipping 192 matching lines @@
         'aura',
         'aura_shell',
         'base',
         'browser_tests',
         'cacheinvalidation',
         'check_deps',
         'check_deps2git',
         'compositor',
         'crypto',
         'dbus',
-        'gfx',
         #'googleurl',  # issue 49580
         'gpu',
         'interactive_ui',
         'unit_ipc',
         'jingle',
         'media',
         'net',
         'printing',
+        'ui_unittests',
         'unit_sql',
         'unit',
         'views',
       ],
       options=[
         '--compiler=goma',
         'aura_builder',
         'base_unittests',
         'browser_tests',
         'cacheinvalidation_unittests',
         'compositor_unittests',
         'content_unittests',
         'crypto_unittests',
         'dbus_unittests',
-        'gfx_unittests',
         'gpu_unittests',
         'googleurl_unittests',
         'interactive_ui_tests',
         'ipc_tests',
         'jingle_unittests',
         'media_unittests',
         'net_unittests',
         'printing_unittests',
         'remoting_unittests',
         #'safe_browsing_tests',
         'sql_unittests',
         'sync_unit_tests',
+        'ui_unittests',
         'unit_tests',
       ],
       factory_properties={
         'gclient_env': {
           'GYP_DEFINES': ('chromeos=1 fastbuild=1'
                           ' ffmpeg_branding=ChromeOS'
                           ' dcheck_always_on=1'
                           ' component=shared_library'
                           ' proprietary_codecs=1')}})
 }
@@ skipping 15 matching lines @@
 b_valgrind_linux = {
   'name': 'linux_valgrind',
   'factory': m_chromium_linux.ChromiumFactory(
       target='Release',
       options=[
         '--compiler=goma',
         'DumpRenderTree',
         'base_unittests',
         'content_unittests',
         'crypto_unittests',
-        'gfx_unittests',
         'googleurl_unittests',
         'ipc_tests',
         'media_unittests',
         'net_unittests',
         'printing_unittests',
         'remoting_unittests',
         'safe_browsing_tests',
         'sql_unittests',
         'sync_unit_tests',
         'test_shell_tests',
+        'ui_unittests',
         'unit_tests',
       ],
       tests=[
         'valgrind_base',
         'valgrind_content',
         'valgrind_crypto',
         'valgrind_googleurl',
         'valgrind_ipc',
         'valgrind_media',
         'valgrind_net',
@@ skipping 40 matching lines @@
 
 b_chromium_chromiumos_valgrind = {
   'name': 'linux_chromeos_valgrind',
   'factory': m_chromium_chromiumos.ChromiumOSFactory(
       target='Release',
       options=[
         '--compiler=goma',
         'base_unittests',
         'content_unittests',
         'crypto_unittests',
-        'gfx_unittests',
         'googleurl_unittests',
         'ipc_tests',
         'media_unittests',
         'net_unittests',
         'printing_unittests',
         'remoting_unittests',
         'safe_browsing_tests',
         'sql_unittests',
         'sync_unit_tests',
+        'ui_unittests',
         'unit_tests',
       ],
       tests=[
         'valgrind_base',
         'valgrind_content',
         'valgrind_crypto',
         'valgrind_googleurl',
         'valgrind_ipc',
         'valgrind_media',
         'valgrind_net',
@@ skipping 17 matching lines @@
   'name': 'linux_tsan',
   # Reuse the directory.
   'slavebuilddir': 'linux_valgrind',
   'factory': m_chromium_linux.ChromiumFactory(
       target='Release',
       options=[
         '--compiler=goma',
         'base_unittests',
         'content_unittests',
         'crypto_unittests',
-        'gfx_unittests',
         'googleurl_unittests',
         'ipc_tests',
         'media_unittests',
         'net_unittests',
         'printing_unittests',
         'remoting_unittests',
         'sql_unittests',
         'sync_unit_tests',
+        'ui_unittests',
         'unit_tests',
       ],
       tests=[
         'tsan_base',
         'tsan_content',
         'tsan_crypto',
         'tsan_googleurl',
         'tsan_ipc',
         'tsan_media',
         'tsan_net',
@@ skipping 177 matching lines @@
     extra_gyp_defines='clang=1 clang_use_chrome_plugins=1',
     builder_name='linux_clang_no_goma',
     slavebuilddir='linux_clang')
 
 b_mac_no_goma = CreateBuilder(
     platform='mac',
     target='Debug',
     tests=[
       'base',
       'crypto',
-      'gfx',
+      'ui_unittests',
       'unit',
     ],
     builder_name='mac_no_goma',
     slavebuilddir='mac')
 
 b_linux_chromeos_clang = {
   'name': 'linux_chromeos_clang',
   'factory': m_chromium_chromiumos.ChromiumOSFactory(
       target='Debug',
       options=['--build-tool=make', '--compiler=clang', 'aura_builder' ],
@@ skipping 48 matching lines @@
   'name': 'linux_asan',
   'factory': m_chromium_linux.ChromiumASANFactory(
       slave_type='BuilderTester',
       options=[
         '--compiler=goma-clang',
         'base_unittests',
         'browser_tests',
         'cacheinvalidation_unittests',
         'content_unittests',
         'crypto_unittests',
-        'gfx_unittests',
         'googleurl_unittests',
         'gpu_unittests',
         'ipc_tests',
         'jingle_unittests',
         'media_unittests',
         'net_unittests',
         'printing_unittests',
         'remoting_unittests',
         'safe_browsing_tests',
         'sql_unittests',
         'sync_unit_tests',
+        'ui_unittests',
         'unit_tests',
       ],
       tests=[
         'base',
         'browser_tests',
         'cacheinvalidation',
         'crypto',
         #'googleurl',  # issue 49580
         'gpu',
         'jingle',
@@ skipping 16 matching lines @@
       options=[
         '--compiler=goma-clang',
         'aura_builder',
         'aura_shell_unittests',
         'base_unittests',
         'browser_tests',
         'cacheinvalidation_unittests',
         'compositor_unittests',
         'content_unittests',
         'crypto_unittests',
-        'gfx_unittests',
         'googleurl_unittests',
         'gpu_unittests',
         'ipc_tests',
         'jingle_unittests',
         'media_unittests',
         'net_unittests',
         'printing_unittests',
         'remoting_unittests',
         'safe_browsing_tests',
         'sql_unittests',
         'sync_unit_tests',
+        'ui_unittests',
         'unit_tests',
       ],
       tests=[
         'aura',
         'aura_shell',
         'base',
         'browser_tests',
         'cacheinvalidation',
         'compositor',
         'content',
         'crypto',
-        'gfx',
         #'googleurl',  # issue 49580
         'gpu',
         'jingle',
         'media',
         'net',
         'printing',
         'remoting',
         'safe_browsing',
+        'ui_unittests',
         'unit_sql',
         'unit',
       ],
       factory_properties={
         'asan': True,  # Used by runtest.py.
         'gclient_env': {
           'GYP_DEFINES': 'asan=1 linux_use_tcmalloc=0 '
                          'chromeos=1 component=static_library '}
       }),
 }
@@ skipping 25 matching lines @@
                'printing_unittests',
                'media_unittests',
                'courgette_unittests',
                'remoting_unittests',
                'sql_unittests',
                'sync_unit_tests',
                'ipc_tests',
                'base_unittests',
                'crypto_unittests',
                'net_unittests',
-               'gfx_unittests',
+               'ui_unittests',
                'unit_tests',
                'test_shell_tests',
                'DumpRenderTree',
              ],
       tests=['heapcheck_googleurl',
              'heapcheck_printing',
              'heapcheck_media',
              'heapcheck_content',
              'heapcheck_courgette',
              'heapcheck_remoting',
              'heapcheck_sql',
              'heapcheck_sync',
              'heapcheck_ipc',
              'heapcheck_base',
              'heapcheck_crypto',
              'heapcheck_net',
-             'heapcheck_gfx',
+             'heapcheck_ui_unittests',
              'heapcheck_unit',
              'heapcheck_test_shell',
            ],
       factory_properties={
         'gclient_env': {'GYP_DEFINES': ('linux_use_tcmalloc=1 '
                                         'linux_use_heapchecker=1 '
                                         'linux_keep_shadow_stacks=1 '
                                         'werror= ')
         }
       }
   ),
 }
 
 b_linux_redux = {
   'name': 'linux_redux',
   'factory': m_chromium_linux.ChromiumFactory(
       slave_type='BuilderTester',
       options=[
         '--compiler=goma',
         'base_unittests',
         'cacheinvalidation_unittests',
         'content_unittests',
         'crypto_unittests',
-        'gfx_unittests',
         'googleurl_unittests',
         'ipc_tests',
         'jingle_unittests',
         'media_unittests',
         'net_unittests',
         'printing_unittests',
         'remoting_unittests',
         'sql_unittests',
         'sync_unit_tests',
+        'ui_unittests',
         'unit_tests',
       ],
       tests=[
         'base',
         'cacheinvalidation',
         'crypto',
         'jingle',
         'net',
         'unit',
       ],
@@ skipping 275 matching lines @@
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
 
 # vi: set ts=4 sts=2 sw=2 et: