Remove references to sconsbuild.

build/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 to run a chrome test executable, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 792 matching lines @@
       print >> sys.stderr, e
       # Don't fail.
 
   return result
 
 
 def main_linux(options, args):
   if len(args) < 1:
     raise chromium_utils.MissingArgument('Usage: %s' % USAGE)
 
-  sconsbuild_exists = os.path.exists(
-      os.path.join(os.path.dirname(options.build_dir), 'sconsbuild'))
   out_exists = os.path.exists(
       os.path.join(os.path.dirname(options.build_dir), 'out'))
   build_dir, _ = build_directory.ConvertBuildDirToLegacy(
-      options.build_dir, use_out=(out_exists and not sconsbuild_exists))
+      options.build_dir, use_out=out_exists)
   build_dir = os.path.normpath(os.path.abspath(build_dir))
   if options.slave_name:
     slave_name = options.slave_name
   else:
     slave_name = slave_utils.SlaveBuildName(build_dir)
   bin_dir = os.path.join(build_dir, options.target)
 
   # Figure out what we want for a special frame buffer directory.
   special_xvfb_dir = None
   if options.special_xvfb == 'auto':
@@ skipping 577 matching lines @@
         '%d new files were left in %s: Fix the tests to clean up themselves.'
         ) % ((new_temp_files - temp_files), tempfile.gettempdir())
     # TODO(maruel): Make it an error soon. Not yet since I want to iron out all
     # the remaining cases before.
     #result = 1
   return result
 
 
 if '__main__' == __name__:
   sys.exit(main())