Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb

1 files changed, 7 insertions, 3 deletions

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
index dcc64a3..4b96b3a 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
@@ -140,18 +140,22 @@ class TestTypeBase(object):
             self._port.relative_test_filename(filename))
         return os.path.splitext(output_filename)[0] + modifier
 
-    def compare_output(self, port, filename, output, test_args, configuration):
+    def compare_output(self, port, filename, test_args, actual_test_output,
+                        expected_test_output):
         """Method that compares the output from the test with the
         expected value.
 
         This is an abstract method to be implemented by all sub classes.
 
         Args:
+          port: object implementing port-specific information and methods
           filename: absolute filename to test file
-          output: a string containing the output of the test
           test_args: a TestArguments object holding optional additional
               arguments
-          configuration: Debug or Release
+          actual_test_output: a TestOutput object which represents actual test
+              output
+          expected_test_output: a TestOutput object which represents a expected
+              test output
 
         Return:
           a list of TestFailure objects, empty if the test passes