Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7

1 files changed, 8 insertions, 3 deletions

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index bcbd498..b715f7b 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -158,9 +158,8 @@ class ChromiumPort(base.Port):
             return self.path_from_chromium_base('webkit',
                 self._options.configuration, self._options.results_directory)
         except AssertionError:
-            return self.path_from_webkit_base('WebKit', 'chromium',
-                'xcodebuild', self._options.configuration,
-                self._options.results_directory)
+            return self._build_path(self._options.configuration,
+                                    self._options.results_directory)
 
     def setup_test_run(self):
         # Delete the disk cache if any to ensure a clean test run.
@@ -273,6 +272,12 @@ class ChromiumPort(base.Port):
             platform = self.name()
         return self.path_from_webkit_base('LayoutTests', 'platform', platform)
 
+    def _path_to_image_diff(self):
+        binary_name = 'image_diff'
+        if self._options.use_drt:
+            binary_name = 'ImageDiff'
+        return self._build_path(self._options.configuration, binary_name)
+
 
 class ChromiumDriver(base.Driver):
     """Abstract interface for test_shell."""