Remove Chrome Frame tests everywhere.

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 re
 
@@ skipping 755 matching lines @@
     if R('content_gl_tests'):
       f.AddContentGLTests(fp)
     if R('gles2_conform_test'):
       f.AddGLES2ConformTest(fp)
     if R('gles2_conform_test_br'):
       f.AddBuildrunnerGTest('gles2_conform_test', fp,
                             test_tool_arg_list=['--no-xvfb'])
     if R('gpu_content_tests'):
       f.AddGpuContentTests(fp)
 
-    # ChromeFrame tests:
-    if R('chrome_frame_perftests'):
-      f.AddChromeFramePerfTests(fp)
-    if R('chrome_frame'):
-      # Add all major CF tests.
-      f.AddGTestTestStep('chrome_frame_net_tests', fp)
-      f.AddGTestTestStep('chrome_frame_unittests', fp)
-      f.AddGTestTestStep('chrome_frame_tests', fp)
-    elif R('chrome_frame_br'):
-      f.AddBuildrunnerGTest('chrome_frame_net_tests', fp)
-      f.AddBuildrunnerGTest('chrome_frame_unittests', fp)
-      f.AddBuildrunnerGTest('chrome_frame_tests', fp)
-    else:
-      if R('chrome_frame_net_tests'):
-        f.AddGTestTestStep('chrome_frame_net_tests', fp)
-      if R('chrome_frame_net_tests_br'):
-        f.AddBuildrunnerGTest('chrome_frame_net_tests', fp)
-      if R('chrome_frame_unittests'):
-        f.AddGTestTestStep('chrome_frame_unittests', fp)
-      if R('chrome_frame_unittests_br'):
-        f.AddBuildrunnerGTest('chrome_frame_unittests', fp)
-      if R('chrome_frame_tests'):
-        f.AddGTestTestStep('chrome_frame_tests', fp)
-      if R('chrome_frame_tests_br'):
-        f.AddBuildrunnerGTest('chrome_frame_tests', fp)
-
     def S(test, prefix, add_functor, br_functor=None):
       """Find any tests with a specific prefix and add them to the build.
 
       S() looks for prefix attached to a test, strips the prefix, and performs a
       prefix-specific add function via add_functor. If the test is also a
       buildrunner test (ends in _br), it uses a buildrunner functor. Thus,
       instead of ash_unittests, valgrind_ash_unittests is ash_unittests added
       with a special function (one that wraps it with a valgrind driver.
       """
       if test.startswith(prefix):
@@ skipping 581 matching lines @@
                             mode=None, slave_type='BuilderTester', options=None,
                             compile_timeout=1200, build_url=None, project=None,
                             factory_properties=None):
     # Make sure the solution is not already there.
     if 'cros_deps' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)