Added the --screenshot option.

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 logging
 import os
 import pickle
 import re
@@ skipping 369 matching lines @@
         'OnDeviceInstrumentationDriver.apk')
     if os.path.exists(self._driver_apk):
       driver_apk = apk_helper.ApkHelper(self._driver_apk)
       self._driver_package = driver_apk.GetPackageName()
       self._driver_name = driver_apk.GetInstrumentationName()
     else:
       self._driver_apk = None
 
   def _initializeTestControlAttributes(self, args):
     self._timeout_scale = args.timeout_scale or 1
+    self._screenshot_failures = args.screenshot_failures

[jbudorick, 2016/05/17 00:01:16]

nit: alphabetize

[BigBossZhiling, 2016/05/18 17:46:11]

Done.

 
   @property
   def additional_apks(self):
     return self._additional_apks
 
   @property
   def apk_under_test(self):
     return self._apk_under_test
 
   @property
@@ skipping 45 matching lines @@
     return self._test_package
 
   @property
   def test_runner(self):
     return self._test_runner
 
   @property
   def timeout_scale(self):
     return self._timeout_scale
 
+  @property
+  def screenshot_failures(self):

[jbudorick, 2016/05/17 00:01:16]

nit: alphabetize

[BigBossZhiling, 2016/05/18 17:46:11]

Done.

+    return self._screenshot_failures
+
   #override
   def TestType(self):
     return 'instrumentation'
 
   #override
   def SetUp(self):
     if self._isolate_delegate:
       self._isolate_delegate.Remap(
           self._isolate_abs_path, self._isolated_abs_path)
       self._isolate_delegate.MoveOutputDeps()
@@ skipping 191 matching lines @@
   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):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()