Support image / audio references in testharness.js tests.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
index 0defc93a6d4b45592bd2b383a1bfbd414b8ee363..30050537237a80f6def93b2a9436b5103e1abae2 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
@@ -285,19 +285,19 @@ class SingleTestRunner(object):
             failures.extend(testharness_failures)
         else:
             failures.extend(self._compare_text(expected_driver_output.text, driver_output.text))
-            failures.extend(self._compare_audio(expected_driver_output.audio, driver_output.audio))
-            if self._should_run_pixel_test:
-                failures.extend(self._compare_image(expected_driver_output, driver_output))
+        failures.extend(self._compare_audio(expected_driver_output.audio, driver_output.audio))
+        if self._should_run_pixel_test:
+            failures.extend(self._compare_image(expected_driver_output, driver_output))
         has_repaint_overlay = (repaint_overlay.result_contains_repaint_rects(expected_driver_output.text) or
                                repaint_overlay.result_contains_repaint_rects(driver_output.text))
         return TestResult(self._test_name, failures, driver_output.test_time, driver_output.has_stderr(),
                           pid=driver_output.pid, has_repaint_overlay=has_repaint_overlay)
 
     def _compare_testharness_test(self, driver_output, expected_driver_output):
-        if expected_driver_output.image or expected_driver_output.audio or expected_driver_output.text:
+        if expected_driver_output.text:
             return False, []
 
-        if driver_output.image or driver_output.audio or self._is_render_tree(driver_output.text):
+        if self._is_render_tree(driver_output.text):
             return False, []
 
         text = driver_output.text or ''