Clean up NaCl's SCons build.

ppapi/native_client/chrome_main.scons

 #! -*- python -*-
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 import os
 import shutil
 import sys
 
@@ skipping 34 matching lines @@
         'tests/nacl_browser/manifest_file/nacl.scons',
         'tests/nacl_browser/nameservice/nacl.scons',
         'tests/nacl_browser/postmessage_redir/nacl.scons',
     ])
 
 ppapi_scons_files['irt_variant_test_scons_files'] = ExtendFileList(
     ppapi_scons_files.get('irt_variant_test_scons_files', []), [
         # Disabled by Brad Chen 4 Sep to try to green Chromium
         # nacl_integration tests
         #'tests/nacl_browser/fault_injection/nacl.scons',
-        'tests/nacl.scons',
         'tests/nacl_browser/pnacl_client_translator/nacl.scons',
     ])
 
 ppapi_scons_files['untrusted_scons_files'] = ExtendFileList(
     ppapi_scons_files.get('untrusted_scons_files', []), [
         'src/untrusted/irt_stub/nacl.scons',
         'src/untrusted/nacl_ppapi_util/nacl.scons',
         'src/untrusted/pnacl_irt_shim/nacl.scons',
         'src/untrusted/pnacl_support_extension/nacl.scons',
     ])
@@ skipping 11 matching lines @@
 def GetHeadlessPrefix(env):
   if env.Bit('browser_headless') and env.Bit('host_linux'):
     return ['xvfb-run', '--auto-servernum']
   else:
     # Mac and Windows do not seem to have an equivalent.
     return []
 
 pre_base_env.AddMethod(GetHeadlessPrefix)
 
 
-pre_base_env['CHROME_DOWNLOAD_DIR'] = \
-    pre_base_env.Dir(ARGUMENTS.get('chrome_binaries_dir', '#chromebinaries'))
-
-def ChromeBinaryArch(env):
-  arch = env['BUILD_FULLARCH']
-  # Currently there are no 64-bit Chrome binaries for Windows or Mac OS X.
-  if (env.Bit('host_windows') or env.Bit('host_mac')) and arch == 'x86-64':
-    arch = 'x86-32'
-  return arch
-
-pre_base_env.AddMethod(ChromeBinaryArch)
+# A fake file to depend on if a path to Chrome is not specified.
+no_browser = pre_base_env.File('chrome_browser_path_not_specified')
 
 
-def DownloadedChromeBinary(env):
-  if env.Bit('host_linux'):
-    os_name = 'linux'
-    binary = 'chrome'
-  elif env.Bit('host_windows'):
-    os_name = 'windows'
-    binary = 'chrome.exe'
-  elif env.Bit('host_mac'):
-    os_name = 'mac'
-    binary = 'Chromium.app/Contents/MacOS/Chromium'
-  else:
-    raise Exception('Unsupported OS')
+# SCons attempts to run a test that depends on "no_browser", detect this at
+# runtime and cause a build error.
+def NoBrowserError(target, source, env):
+  print target, source, env
+  print ("***\nYou need to specificy chrome_browser_path=... on the " +
+         "command line to run these tests.\n***\n")
+  return 1
 
-  arch = env.ChromeBinaryArch()
-  return env.File(os.path.join('${CHROME_DOWNLOAD_DIR}',
-                               '%s_%s' % (os_name, arch), binary))
+pre_base_env.Append(BUILDERS = {
+    'NoBrowserError': Builder(action=NoBrowserError)
+})
 
-pre_base_env.AddMethod(DownloadedChromeBinary)
+pre_base_env.NoBrowserError([no_browser], [])
 
 
 def ChromeBinary(env):
   if 'chrome_browser_path' in ARGUMENTS:
     return env.File(env.SConstructAbsPath(ARGUMENTS['chrome_browser_path']))
   else:
-    return env.DownloadedChromeBinary()
+    return no_browser
 
 pre_base_env.AddMethod(ChromeBinary)
 
 
 def GetPPAPIPluginPath(env, allow_64bit_redirect=True):
   if 'force_ppapi_plugin' in ARGUMENTS:
     return env.SConstructAbsPath(ARGUMENTS['force_ppapi_plugin'])
   if env.Bit('mac'):
     fn = env.File('${STAGING_DIR}/ppNaClPlugin')
   else:
@@ skipping 387 matching lines @@
 
   if python_tester_script is None:
     python_tester_script = env.File('${SCONSTRUCT_DIR}/tools/browser_tester'
                              '/browser_tester.py')
   command = env.GetHeadlessPrefix() + [
       '${PYTHON}', python_tester_script,
       '--browser_path', env.ChromeBinary(),
       '--url', url,
       # Fail if there is no response for X seconds.
       '--timeout', str(timeout)]
-  if not env.Bit('disable_dynamic_plugin_loading'):
-    command.extend(['--ppapi_plugin', env['TRUSTED_ENV'].GetPPAPIPluginPath()])
-    command.extend(['--sel_ldr', env.GetSelLdr()])
-    bootstrap, _ = env.GetBootstrap()
-    if bootstrap is not None:
-      command.extend(['--sel_ldr_bootstrap', bootstrap])
-  if (not env.Bit('disable_dynamic_plugin_loading') or
-      env.Bit('override_chrome_irt')):
-    command.extend(['--irt_library', env.GetIrtNexe(chrome_irt=True)])
   for dep_file in files:
     command.extend(['--file', dep_file])
   for extension in extensions:
     command.extend(['--extension', extension])
   if env.Bit('bitcode'):
     # TODO(jvoung): remove this --extension once we have --pnacl-dir working.
     command.extend(['--extension', env.GetPnaclExtensionNode().abspath])
     # Enable the installed version of pnacl, and point to a custom install
     # directory for testing purposes.
     browser_flags.append('--enable-pnacl')
@@ skipping 103 matching lines @@
 
 pre_base_env.AddMethod(PPAPIGraphics3DIsBroken)
 
 
 def AddChromeFilesFromGroup(env, file_group):
   env['BUILD_SCONSCRIPTS'] = ExtendFileList(
       env.get('BUILD_SCONSCRIPTS', []),
       ppapi_scons_files[file_group])
 
 pre_base_env.AddMethod(AddChromeFilesFromGroup)