Clean up remaining DumpRenderTree references and flags.

Tools/Scripts/webkitpy/layout_tests/port/driver.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 61 matching lines @@
         self.measurements = measurements
         self.timeout = timeout
         self.error = error  # stderr output
         self.pid = pid
 
     def has_stderr(self):
         return bool(self.error)
 
 
 class Driver(object):
-    """object for running test(s) using DumpRenderTree/WebKitTestRunner."""
+    """object for running test(s) using content_shell or other driver."""
 
     def __init__(self, port, worker_number, pixel_tests, no_timeout=False):
         """Initialize a Driver to subsequently run tests.
 
-        Typically this routine will spawn DumpRenderTree in a config
+        Typically this routine will spawn content_shell in a config
         ready for subsequent input.
 
         port - reference back to the port object.
         worker_number - identifier for a particular worker/driver instance
         """
         self._port = port
         self._worker_number = worker_number
         self._no_timeout = no_timeout
 
         self._driver_tempdir = None
@@ skipping 153 matching lines @@
 
     def start(self, pixel_tests, per_test_args):
         new_cmd_line = self.cmd_line(pixel_tests, per_test_args)
         if not self._server_process or new_cmd_line != self._current_cmd_line:
             self._start(pixel_tests, per_test_args)
             self._run_post_start_tasks()
 
     def _setup_environ_for_driver(self, environment):
         environment['DYLD_LIBRARY_PATH'] = self._port._build_path()
         environment['DYLD_FRAMEWORK_PATH'] = self._port._build_path()
-        # FIXME: We're assuming that WebKitTestRunner checks this DumpRenderTree-named environment variable.
-        environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
         environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
         if 'WEBKITOUTPUTDIR' in os.environ:
             environment['WEBKITOUTPUTDIR'] = os.environ['WEBKITOUTPUTDIR']
         if self._profiler:
             environment = self._profiler.adjusted_environment(environment)
         return environment
 
     def _start(self, pixel_tests, per_test_args):
         self.stop()
         self._driver_tempdir = self._port._filesystem.mkdtemp(prefix='%s-' % self._port.driver_name())
@@ skipping 27 matching lines @@
             self._port._filesystem.rmtree(str(self._driver_tempdir))
             self._driver_tempdir = None
 
         self._current_cmd_line = None
 
     def cmd_line(self, pixel_tests, per_test_args):
         cmd = self._command_wrapper(self._port.get_option('wrapper'))
         cmd.append(self._port._path_to_driver())
         if self._no_timeout:
             cmd.append('--no-timeout')
-        # FIXME: We need to pass --timeout=SECONDS to WebKitTestRunner for WebKit2.
-
         cmd.extend(self._port.get_option('additional_drt_flag', []))
         cmd.extend(self._port.additional_drt_flag())
-
         cmd.extend(per_test_args)
-
         cmd.append('-')
         return cmd
 
     def _check_for_driver_crash(self, error_line):
         if error_line == "#CRASHED\n":
             # This is used on Windows to report that the process has crashed
             # See http://trac.webkit.org/changeset/65537.
             self._crashed_process_name = self._server_process.name()
             self._crashed_pid = self._server_process.pid()
         elif (error_line.startswith("#CRASHED - ")
@@ skipping 140 matching lines @@
         self.content = str()  # FIXME: Should be bytearray() once we require Python 2.6.
         self.decoded_content = None
         self.malloc = None
         self.js_heap = None
 
     def decode_content(self):
         if self.encoding == 'base64' and self.content is not None:
             self.decoded_content = base64.b64decode(self.content)
         else:
             self.decoded_content = self.content