Run ui_unittests instead of gfx_unittests on the waterfall

scripts/master/factory/chromium_factory.py

 # 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.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
 import re
@@ skipping 304 matching lines @@
     if R('base'):
       f.AddBasicGTestTestStep('base_unittests', fp)
     if R('cacheinvalidation'):
       f.AddBasicGTestTestStep('cacheinvalidation_unittests', fp)
     if R('courgette'):
       f.AddBasicGTestTestStep('courgette_unittests', fp)
     if R('crypto'):
       f.AddBasicGTestTestStep('crypto_unittests', fp)
     if R('dbus'):
       f.AddBasicGTestTestStep('dbus_unittests', fp)
-    # Remove 'gfx' once it is no longer referenced by the masters.
-    if R('gfx'):
-      f.AddBasicGTestTestStep('gfx_unittests', fp)
     if R('googleurl'):
       f.AddBasicGTestTestStep('googleurl_unittests', fp)
     if R('gpu'):
       f.AddBasicGTestTestStep(
           'gpu_unittests', fp, arg_list=['--gmock_verbose=error'])
     if R('jingle'):
       f.AddBasicGTestTestStep('jingle_unittests', fp)
     if R('content'):
       f.AddBasicGTestTestStep('content_unittests', fp)
     if R('media'):
@@ skipping 34 matching lines @@
       f.AddChromeUnitTests(fp)
     # A snapshot of the "ChromeUnitTests" available for individual selection
     if R('unit_ipc'):
       f.AddBasicGTestTestStep('ipc_tests', fp)
     if R('unit_sync'):
       f.AddBasicGTestTestStep('sync_unit_tests', fp)
     if R('unit_unit'):
       f.AddBasicGTestTestStep('unit_tests', fp)
     if R('unit_sql'):
       f.AddBasicGTestTestStep('sql_unittests', fp)
-    # Remove 'unit_gfx' once it is no longer referenced by the masters.
-    if R('unit_gfx'):
-      f.AddBasicGTestTestStep('gfx_unittests', fp)
     if R('browser_tests'):
       f.AddBrowserTests(fp)
     if R('content_browsertests'):
       f.AddBasicGTestTestStep('content_browsertests', fp)
 
     # Big, UI tests:
     if R('nacl_integration'):
       f.AddNaClIntegrationTestStep(fp)
     if R('nacl_integration_memcheck'):
       f.AddNaClIntegrationTestStep(fp, None, 'memcheck-browser-tests')
@@ skipping 656 matching lines @@
                                                build_dir=web_build_dir)
       chromium_cmd_obj.AddChromebotServer(factory_properties)
       chromium_cmd_obj.AddReliabilityTests(client_os)
     elif slave_type == 'ChromebotClient':
       chromium_cmd_obj.AddGetBuildForChromebot(client_os,
                                                extract=True,
                                                build_url=build_url)
       chromium_cmd_obj.AddChromebotClient(factory_properties)
 
     return factory