Added the --screenshot option.

build/android/pylib/local/device/local_device_instrumentation_test_run.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 logging
+import os
 import re
 import time
 
 from devil.android import device_errors
 from devil.android import flag_changer
 from devil.utils import reraiser_thread
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.local.device import local_device_test_run
 
@@ skipping 240 matching lines @@
         if r.GetName() == test_name:
           r.SetName(test_display_name)
     if DidPackageCrashOnDevice(self._test_instance.test_package, device):
       for r in results:
         if r.GetType() == base_test_result.ResultType.UNKNOWN:
           r.SetType(base_test_result.ResultType.CRASH)
 
     if any(r.GetType() not in (base_test_result.ResultType.PASS,
                                base_test_result.ResultType.SKIP)
            for r in results):
+      if self._test_instance.screenshot_dir:
+        file_name = '%s-%s.png' % (test_display_name,

[jbudorick, 2016/05/19 18:25:25]

nit: drop this onto its own line + four space indent

+          time.strftime('%Y%m%dT%H%M%S', time.localtime()))
+        saved_dir = device.TakeScreenshot(
+          os.path.join(self._test_instance.screenshot_dir, file_name))

[jbudorick, 2016/05/19 18:25:24]

nit: four space indent

+        logging.info('Saved screenshot for %s to %s.',

[jbudorick, 2016/05/19 18:25:25]

nit: drop this onto its own line

+          test_display_name, saved_dir)

[jbudorick, 2016/05/19 18:25:25]

nit: four space indent

       logging.info('detected failure in %s. raw output:', test_display_name)
       for l in output:
         logging.info('  %s', l)
       if (not self._env.skip_clear_data
           and self._test_instance.package_info):
         permissions = (
             self._test_instance.apk_under_test.GetPermissions()
             if self._test_instance.apk_under_test
             else None)
         device.ClearApplicationState(self._test_instance.package_info.package,
@@ skipping 25 matching lines @@
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout