Manual partial update from from https://crrev.com/337502

build/android/pylib/gtest/test_runner.py

 # Copyright (c) 2012 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 tempfile
 
 from pylib import pexpect
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.device import device_errors
 from pylib.gtest import gtest_test_instance
 from pylib.local import local_test_server_spawner
 from pylib.perf import perf_control
 
@@ skipping 55 matching lines @@
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller = perf_control.PerfControl(self.device)
 
     if _TestSuiteRequiresMockTestServer(self.test_package.suite_name):
       self._servers = [
           local_test_server_spawner.LocalTestServerSpawner(
               ports.AllocateTestServerPort(), self.device, self.tool)]
     else:
       self._servers = []
 
+    if test_options.app_data_files:
+      self._app_data_files = test_options.app_data_files
+      if test_options.app_data_file_dir:
+        self._app_data_file_dir = test_options.app_data_file_dir
+      else:
+        self._app_data_file_dir = tempfile.mkdtemp()
+        logging.critical('Saving app files to %s', self._app_data_file_dir)
+    else:
+      self._app_data_files = None
+      self._app_data_file_dir = None
+
   #override
   def InstallTestPackage(self):
     self.test_package.Install(self.device)
 
   def _ParseTestOutput(self, p):
     """Process the test output.
 
     Args:
       p: An instance of pexpect spawn class.
 
@@ skipping 67 matching lines @@
     test_results = base_test_result.TestRunResults()
     if not test:
       return test_results, None
 
     try:
       self.test_package.ClearApplicationState(self.device)
       self.test_package.CreateCommandLineFileOnDevice(
           self.device, test, self._test_arguments)
       test_results = self._ParseTestOutput(
           self.test_package.SpawnTestProcess(self.device))
+      if self._app_data_files:
+        self.test_package.PullAppFiles(self.device, self._app_data_files,
+                                       self._app_data_file_dir)
     finally:
       for s in self._servers:
         s.Reset()
     # Calculate unknown test results.
     all_tests = set(test.split(':'))
     all_tests_ran = set([t.GetName() for t in test_results.GetAll()])
     unknown_tests = all_tests - all_tests_ran
     test_results.AddResults(
         [base_test_result.BaseTestResult(t, base_test_result.ResultType.UNKNOWN)
          for t in unknown_tests])
@@ skipping 13 matching lines @@
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     for s in self._servers:
       s.TearDown()
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller.SetDefaultPerfMode()
     self.test_package.ClearApplicationState(self.device)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()