Move screenshot capture to Java-side.

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import json
 import logging
 import os
 import pickle
@@ skipping 36 matching lines @@
 _EXTRA_TIMEOUT_SCALE = (
     'org.chromium.test.driver.OnDeviceInstrumentationDriver.TimeoutScale')
 
 _PARAMETERIZED_TEST_ANNOTATION = 'ParameterizedTest'
 _PARAMETERIZED_TEST_SET_ANNOTATION = 'ParameterizedTest$Set'
 _NATIVE_CRASH_RE = re.compile('(process|native) crash', re.IGNORECASE)
 _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):
     super(MissingSizeAnnotationError, self).__init__(class_name +
         ': Test method is missing required size annotation. Add one of: ' +
         ', '.join('@' + a for a in _VALID_ANNOTATIONS))
 
 
 class TestListPickleException(test_exception.TestException):
   pass
@@ skipping 579 matching lines @@
     if args.command_line_flags:
       self._flags.extend(args.command_line_flags)
     if args.device_flags_file:
       with open(args.device_flags_file) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)
         self._flags.extend(flag for flag in stripped_lines if flag)
     if args.strict_mode and args.strict_mode != 'off':
       self._flags.append('--strict-mode=' + args.strict_mode)
     if args.regenerate_goldens:
       self._flags.append('--regenerate-goldens')
+    if args.gs_results_bucket:

[mikecase (-- gone --), 2017/05/05 18:19:30]

I think I actually have to change this to "args.gs_results_bucket or
args.screenshot_dir" in case people want local screenshots

[mikecase (-- gone --), 2017/05/05 18:44:16]

Fixed! And tested running with --screenshot-dir locally and it works very
nicely.

+      self._flags.append('--screenshot-file=%s' % FAILURE_SCREENSHOT_FILE)
 
     if args.test_arguments:
       # --test-arguments is deprecated for gtests and is in the process of
       # being removed.
       raise Exception(
           '--test-arguments is not supported for instrumentation '
           'tests. Pass command-line flags directly instead.')
 
   def _initializeDriverAttributes(self):
     self._driver_apk = os.path.join(
@@ skipping 222 matching lines @@
 
   @staticmethod
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     pass