Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

1 files changed, 11 insertions, 13 deletions

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
index 5360ab3..17862a2 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
@@ -69,18 +69,18 @@ class ChromiumMacPort(chromium.ChromiumPort):
         return result
 
     def default_child_processes(self):
-        # FIXME: we need to run single-threaded for now. See
-        # https://bugs.webkit.org/show_bug.cgi?id=38553. Unfortunately this
-        # routine is called right before the logger is configured, so if we
-        # try to _log.warning(), it gets thrown away.
-        import sys
-        sys.stderr.write("Defaulting to one child - see https://bugs.webkit.org/show_bug.cgi?id=38553\n")
-        return 1
+        if self.get_option('worker_model') == 'old-threads':
+            # FIXME: we need to run single-threaded for now. See
+            # https://bugs.webkit.org/show_bug.cgi?id=38553. Unfortunately this
+            # routine is called right before the logger is configured, so if we
+            # try to _log.warning(), it gets thrown away.
+            import sys
+            sys.stderr.write("Defaulting to one child - see https://bugs.webkit.org/show_bug.cgi?id=38553\n")
+            return 1
+
+        return chromium.ChromiumPort.default_child_processes(self)
 
     def driver_name(self):
-        """name for this port's equivalent of DumpRenderTree."""
-        if self.get_option('use_test_shell'):
-            return "TestShell"
         return "DumpRenderTree"
 
     def test_platform_name(self):
@@ -110,7 +110,7 @@ class ChromiumMacPort(chromium.ChromiumPort):
                                          *comps)
 
         path = self.path_from_chromium_base('xcodebuild', *comps)
-        if self._filesystem.exists(path) or self.get_option('use_test_shell'):
+        if self._filesystem.exists(path):
             return path
         return self.path_from_webkit_base(
             'Source', 'WebKit', 'chromium', 'xcodebuild', *comps)
@@ -154,8 +154,6 @@ class ChromiumMacPort(chromium.ChromiumPort):
 
     def _path_to_helper(self):
         binary_name = 'LayoutTestHelper'
-        if self.get_option('use_test_shell'):
-            binary_name = 'layout_test_helper'
         return self._build_path(self.get_option('configuration'), binary_name)
 
     def _path_to_wdiff(self):