Move screenshot capture to Java-side.

build/android/pylib/instrumentation/instrumentation_test_instance.py

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index 2324fca1194d3efc8ad608b40abd5fc68e5ce898..abd42a72bf51f5e3f4ad105e608a1bcd1583e012 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -54,6 +54,7 @@ _CMDLINE_NAME_SEGMENT_RE = re.compile(
     r' with(?:out)? \{[^\}]*\}')
 _PICKLE_FORMAT_VERSION = 11
 
+FAILURE_SCREENSHOT_FILE = 'screenshots/test_failure.png'
 
 class MissingSizeAnnotationError(test_exception.TestException):
   def __init__(self, class_name):
@@ -653,6 +654,8 @@ class InstrumentationTestInstance(test_instance.TestInstance):
       self._flags.append('--strict-mode=' + args.strict_mode)
     if args.regenerate_goldens:
       self._flags.append('--regenerate-goldens')
+    if args.gs_results_bucket or args.screenshot_dir:
+      self._flags.append('--screenshot-file=%s' % FAILURE_SCREENSHOT_FILE)

[jbudorick, 2017/05/08 17:08:39]

1) I'm concerned that we may not want to hard-code the screenshot file (maybe a
DeviceTempFile?) and thus local_device_instrumentation_test_run may be a better
place to handle this than the test instance.
2) Add a comment here explaining the relationship between gs_results_bucket and
--screenshot-file

[mikecase (-- gone --), 2017/05/08 18:35:31]

Done, (1) moved it to same place that coverage-files are handled. (2) made
screenshot file a DeviceTempFile. (3) Now FULL-path of screenshot is passed so
not path construction is done on either side (removing all changes to
UrlUtils.java)

 
     if args.test_arguments:
       # --test-arguments is deprecated for gtests and is in the process of