Remove obsolete sandbox disabling logic from runtest.py.

scripts/slave/runtest.py

 #!/usr/bin/env 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.
 
 """A tool used to run a Chrome test executable and process the output.
 
 This script is used by the buildbot slaves. It must be run from the outer
 build directory, e.g. chrome-release/build/.
 
@@ skipping 67 matching lines @@
 # The directory that this script is in.
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 LOG_PROCESSOR_CLASSES = {
     'gtest': gtest_utils.GTestLogParser,
     'graphing': performance_log_processor.GraphingLogProcessor,
     'pagecycler': performance_log_processor.GraphingPageCyclerLogProcessor,
 }
 
 
-def _ShouldEnableSandbox(sandbox_path):
-  """Checks whether the current slave should use the sandbox.
-
-  This is based on should_enable_sandbox in src/testing/test_env.py.
-
-  Args:
-    sandbox_path: Path to sandbox file.
-
-  Returns:
-    True iff the slave is a Linux host with the sandbox file both present and
-    configured correctly.
-  """
-  if not (sys.platform.startswith('linux') and
-          os.path.exists(sandbox_path)):
-    return False
-  sandbox_stat = os.stat(sandbox_path)
-  if ((sandbox_stat.st_mode & stat.S_ISUID) and
-      (sandbox_stat.st_mode & stat.S_IRUSR) and
-      (sandbox_stat.st_mode & stat.S_IXUSR) and
-      (sandbox_stat.st_uid == 0)):
-    return True
-  return False
-
-
 def _GetTempCount():
   """Returns the number of files and directories inside the temporary dir."""
   return len(os.listdir(tempfile.gettempdir()))
 
 
 def _LaunchDBus():
   """Launches DBus to work around a bug in GLib.
 
   Works around a bug in GLib where it performs operations which aren't
   async-signal-safe (in particular, memory allocations) between fork and exec
@@ skipping 1208 matching lines @@
 
   # Unset http_proxy and HTTPS_PROXY environment variables.  When set, this
   # causes some tests to hang.  See http://crbug.com/139638 for more info.
   if 'http_proxy' in os.environ:
     del os.environ['http_proxy']
     print 'Deleted http_proxy environment variable.'
   if 'HTTPS_PROXY' in os.environ:
     del os.environ['HTTPS_PROXY']
     print 'Deleted HTTPS_PROXY environment variable.'
 
-  # Decide whether to enable the suid sandbox for Chrome.
-  if (_ShouldEnableSandbox(CHROME_SANDBOX_PATH) and
-      not options.enable_tsan and
-      not options.enable_lsan):
-    print 'Enabling sandbox.  Setting environment variable:'
-    print '  CHROME_DEVEL_SANDBOX="%s"' % CHROME_SANDBOX_PATH
-    extra_env['CHROME_DEVEL_SANDBOX'] = CHROME_SANDBOX_PATH
-  else:
-    print 'Disabling sandbox.  Setting environment variable:'
-    print '  CHROME_DEVEL_SANDBOX=""'
-    extra_env['CHROME_DEVEL_SANDBOX'] = ''
+  # Path to SUID sandbox binary. This must be installed on all bots.
+  extra_env['CHROME_DEVEL_SANDBOX'] = CHROME_SANDBOX_PATH
 
   # Nuke anything that appears to be stale chrome items in the temporary
   # directory from previous test runs (i.e.- from crashes or unittest leaks).
   slave_utils.RemoveChromeTemporaryFiles()
 
   extra_env['LD_LIBRARY_PATH'] = ''
 
   if options.enable_lsan:
     # Use the debug version of libstdc++ under LSan. If we don't, there will be
     # a lot of incomplete stack traces in the reports.
@@ skipping 718 matching lines @@
   finally:
     if did_launch_dbus:
       # It looks like the command line argument --exit-with-session
       # isn't working to clean up the spawned dbus-daemon. Kill it
       # manually.
       _ShutdownDBus()
 
 
 if '__main__' == __name__:
   sys.exit(main())