Apply all blink changes between @202695 and tip of trunk

Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py

Index: Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
index ca1ca97f6925559dc7247b3a9c22b16ce8efe9c3..196ce569975819550603832160c1cb18170ff491 100644
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
@@ -325,6 +325,10 @@ class SingleTestRunner(object):
 
     _observatory_cleaner = re.compile(r"^Observatory.*\n", re.MULTILINE)
     _console_observatory_cleaner = re.compile(r"^CONSOLE INFO: Observatory.*\n", re.MULTILINE)
+    _line_number_cleaner = re.compile(r"\(dart:(\w+):\d+\)", re.MULTILINE)
+
+    def _line_number_substitution(self, match):
+        return "(dart:" + match.group(1) + ":xxxx)"
 
     def _get_normalized_output_text(self, output):
         """Returns the normalized text output, i.e. the output in which
@@ -336,6 +340,7 @@ class SingleTestRunner(object):
         normalized_lines = output.replace("\r\r\n", "\r\n").replace("\r\n", "\n")
         normalized_lines = re.sub(self._observatory_cleaner, r"", normalized_lines)
         normalized_lines = re.sub(self._console_observatory_cleaner, r"", normalized_lines)
+        normalized_lines = re.sub(self._line_number_cleaner, self._line_number_substitution, normalized_lines)
         return normalized_lines
 
     # FIXME: This function also creates the image diff. Maybe that work should