NaCl: Move all browser tests into nacl_irt_test_env

chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py

 #!/usr/bin/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.
 
 """Do all the steps required to build and test against nacl."""
 
 
 import optparse
 import os.path
@@ skipping 199 matching lines @@
                             'Microsoft Visual Studio 8.0\\Common7\\Tools\\')
   else:
     # 32bit HOST
     env['VS90COMNTOOLS'] = ('c:\\Program Files\\Microsoft Visual Studio 9.0\\'
                             'Common7\\Tools\\')
     env['VS80COMNTOOLS'] = ('c:\\Program Files\\Microsoft Visual Studio 8.0\\'
                             'Common7\\Tools\\')
 
   # Run nacl/chrome integration tests.
   # Note that we have to add nacl_irt_test to --mode in order to get
-  # inbrowser_test_runner to run.
-  # TODO(mseaborn): Change it so that inbrowser_test_runner is not a
-  # special case.
+  # the "_irt" variant of "chrome_browser_tests" to run.
   cmd = scons + ['--verbose', '-k', 'platform=x86-%d' % bits,
       '--mode=opt-host,nacl,nacl_irt_test',
       'chrome_browser_path=%s' % chrome_filename,
   ]
   if not options.integration_bot and not options.morenacl_bot:
     cmd.append('disable_flaky_tests=1')
-  cmd.append('chrome_browser_tests')
+  cmd.append('chrome_browser_tests_irt')
 
   # Download the toolchain(s).
   if options.enable_pnacl:
     pnacl_toolchain = []
   else:
     pnacl_toolchain = ['--no-pnacl']
   RunCommand([python,
               os.path.join(nacl_dir, 'build', 'download_toolchains.py'),
               '--no-arm-trusted'] + pnacl_toolchain + ['TOOL_REVISIONS'],
              nacl_dir, os.environ)
@@ skipping 95 matching lines @@
     else:
       options.enable_pnacl = 0
 
   if args:
     parser.error('ERROR: invalid argument')
   BuildAndTest(options)
 
 
 if __name__ == '__main__':
   Main()