Move screenshot capture to Java-side.

build/android/pylib/instrumentation/instrumentation_test_instance_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Unit tests for instrumentation_test_instance."""
 
 # pylint: disable=protected-access
 
 import collections
@@ skipping 30 matching lines @@
           mock.MagicMock(), mock.MagicMock(), lambda s: None)
 
   _FlagAttributesArgs = collections.namedtuple(
       '_FlagAttributesArgs',
       [
         'command_line_flags',
         'device_flags_file',
         'strict_mode',
         'regenerate_goldens',
         'test_arguments',
+        'gs_results_bucket',
+        'screenshot_dir',
       ])
 
   def createFlagAttributesArgs(
       self, command_line_flags=None, device_flags_file=None,
-      strict_mode=None, regenerate_goldens=None, test_arguments=None):
+      strict_mode=None, regenerate_goldens=None, test_arguments=None,
+      gs_results_bucket=None, screenshot_dir=None):
     return self._FlagAttributesArgs(
         command_line_flags, device_flags_file, strict_mode,
-        regenerate_goldens, test_arguments)
+        regenerate_goldens, test_arguments, gs_results_bucket, screenshot_dir)
 
   def test_initializeFlagAttributes_commandLineFlags(self):
     o = self.createTestInstance()
     args = self.createFlagAttributesArgs(command_line_flags=['--foo', '--bar'])
     o._initializeFlagAttributes(args)
     self.assertEquals(o._flags, ['--enable-test-intents', '--foo', '--bar'])
 
   def test_initializeFlagAttributes_deviceFlagsFile(self):
     o = self.createTestInstance()
     with tempfile.NamedTemporaryFile() as flags_file:
@@ skipping 651 matching lines @@
       }),
     ]
     results = instrumentation_test_instance.GenerateTestResults(
         None, None, statuses, 0, 1000)
     self.assertEqual(1, len(results))
     self.assertEqual(base_test_result.ResultType.SKIP, results[0].GetType())
 
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)