(Reland) Insert logcat as part of test result for android instrumentation tests.

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 424 matching lines @@
 
     self._timeout_scale = None
     self._initializeTestControlAttributes(args)
 
     self._coverage_directory = None
     self._initializeTestCoverageAttributes(args)
 
     self._store_tombstones = False
     self._initializeTombstonesAttributes(args)
 
+    self._should_save_logcat = None
+    self._initializeLogAttributes(args)
+
   def _initializeApkAttributes(self, args, error_func):
     if args.apk_under_test:
       apk_under_test_path = args.apk_under_test
       if not args.apk_under_test.endswith('.apk'):
         apk_under_test_path = os.path.join(
             constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
             '%s.apk' % args.apk_under_test)
 
       # TODO(jbudorick): Move the realpath up to the argument parser once
       # APK-by-name is no longer supported.
@@ skipping 132 matching lines @@
   def _initializeTestControlAttributes(self, args):
     self._screenshot_dir = args.screenshot_dir
     self._timeout_scale = args.timeout_scale or 1
 
   def _initializeTestCoverageAttributes(self, args):
     self._coverage_directory = args.coverage_dir
 
   def _initializeTombstonesAttributes(self, args):
     self._store_tombstones = args.store_tombstones
 
+  def _initializeLogAttributes(self, args):
+    self._should_save_logcat = bool(args.json_results_file)
+
   @property
   def additional_apks(self):
     return self._additional_apks
 
   @property
   def apk_under_test(self):
     return self._apk_under_test
 
   @property
   def apk_under_test_incremental_install_script(self):
@@ skipping 13 matching lines @@
 
   @property
   def driver_name(self):
     return self._driver_name
 
   @property
   def flags(self):
     return self._flags
 
   @property
+  def should_save_logcat(self):
+    return self._should_save_logcat
+
+  @property
   def package_info(self):
     return self._package_info
 
   @property
   def screenshot_dir(self):
     return self._screenshot_dir
 
   @property
   def store_tombstones(self):
     return self._store_tombstones
@@ skipping 103 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