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 368 matching lines @@
         constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
         '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._screenshot_dir = args.screenshot_dir
     self._timeout_scale = args.timeout_scale or 1
 
   @property
   def additional_apks(self):
     return self._additional_apks
 
   @property
   def apk_under_test(self):
     return self._apk_under_test
 
@@ skipping 15 matching lines @@
 
   @property
   def driver_name(self):
     return self._driver_name
 
   @property
   def package_info(self):
     return self._package_info
 
   @property
+  def screenshot_dir(self):
+    return self._screenshot_dir
+
+  @property
   def suite(self):
     return self._suite
 
   @property
   def test_apk(self):
     return self._test_apk
 
   @property
   def test_apk_incremental_install_script(self):
     return self._test_apk_incremental_install_script
@@ skipping 222 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()