NaCl: have browser_tester set-up the sandbox environment

ppapi/native_client/tools/browser_tester/browser_tester.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.
 
 import glob
 import optparse
 import os.path
 import socket
 import sys
 import thread
 import time
 import urllib
 
 # Allow the import of third party modules
 script_dir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.join(script_dir, '../../../../third_party/'))
 sys.path.append(os.path.join(script_dir, '../../../../tools/valgrind/'))
+sys.path.append(os.path.join(script_dir, '../../../../testing/'))
 
 import browsertester.browserlauncher
 import browsertester.rpclistener
 import browsertester.server
 
 import memcheck_analyze
 import tsan_analyze
 
+import test_env
+
 def BuildArgParser():
   usage = 'usage: %prog [options]'
   parser = optparse.OptionParser(usage)
 
   parser.add_option('-p', '--port', dest='port', action='store', type='int',
                     default='0', help='The TCP port the server will bind to. '
                     'The default is to pick an unused port number.')
   parser.add_option('--browser_path', dest='browser_path', action='store',
                     type='string', default=None,
                     help='Use the browser located here.')
@@ skipping 153 matching lines @@
   # Set the default here so we're assured hard_timeout will be defined.
   # Tests, such as run_inbrowser_trusted_crash_in_startup_test, may not use the
   # RunFromCommand line entry point - and otherwise get stuck in an infinite
   # loop when something goes wrong and the hard timeout is not set.
   # http://code.google.com/p/chromium/issues/detail?id=105406
   if options.hard_timeout is None:
     options.hard_timeout = options.timeout * 4
 
   options.files.append(os.path.join(script_dir, 'browserdata', 'nacltest.js'))
 
+  # Setup the environment with the setuid sandbox path.
+  test_env.enable_sandbox_if_required(os.environ)
+
   # Create server
   host = GetHostName()
   try:
     server = browsertester.server.Create(host, options.port)
   except Exception:
     sys.stdout.write('Could not bind %r, falling back to localhost.\n' % host)
     server = browsertester.server.Create('localhost', options.port)
 
   # If port 0 has been requested, an arbitrary port will be bound so we need to
   # query it.  Older version of Python do not set server_address correctly when
@@ skipping 148 matching lines @@
   # Validate the URL
   url = options.url
   if url is None:
     parser.error('Must specify a URL')
 
   return Run(url, options)
 
 
 if __name__ == '__main__':
   sys.exit(RunFromCommandLine())