Android: fix test runners for non-rooted devices.

build/android/pylib/test_package_apk.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 os
 import re
 import sys
 
 import cmd_helper
@@ skipping 11 matching lines @@
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     timeout: Timeout for each test.
     rebaseline: Whether or not to run tests in isolation and update the filter.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
     dump_debug_info: A debug_info object.
   """
 
-  APK_DATA_DIR = '/data/user/0/org.chromium.native_test/files/'
+  # The stdout.txt path is determined by:
+  # testing/android/java/src/org/chromium/native_test/
+  #     ChromeNativeTestActivity.java
+  APK_STDOUT_FILE = '/sdcard/native_tests/stdout.txt'
 
   def __init__(self, adb, device, test_suite, timeout, rebaseline,
                performance_test, cleanup_test_files, tool,
                dump_debug_info):
     TestPackage.__init__(self, adb, device, test_suite, timeout,
                          rebaseline, performance_test, cleanup_test_files,
                          tool, dump_debug_info)
 
   def _CreateTestRunnerScript(self, options):
     command_line_file = tempfile.NamedTemporaryFile()
@@ skipping 19 matching lines @@
           'am start -n '
           'org.chromium.native_test/'
           'org.chromium.native_test.ChromeNativeTestActivity')
       # Wait for native test to complete.
       self.adb.WaitForLogMatch(re.compile('<<nativeRunTests'), None)
     finally:
       self.tool.CleanUpEnvironment()
     # Copy stdout.txt and read contents.
     stdout_file = tempfile.NamedTemporaryFile()
     ret = []
-    self.adb.Adb().Pull(TestPackageApk.APK_DATA_DIR + 'stdout.txt',
-                        stdout_file.name)
+    self.adb.Adb().Pull(TestPackageApk.APK_STDOUT_FILE, stdout_file.name)
     # We need to strip the trailing newline.
     content = [line.rstrip() for line in open(stdout_file.name)]
     ret = self._ParseGTestListTests(content)
     return ret
 
   def CreateTestRunnerScript(self, gtest_filter, test_arguments):
      self._CreateTestRunnerScript('--gtest_filter=%s %s' % (gtest_filter,
                                                             test_arguments))
 
   def RunTestsAndListResults(self):
@@ skipping 16 matching lines @@
                                timeout_time=60*5)
     logging.info('Installing new apk')
     self.adb.Adb().SendCommand('install -r ' + self.test_suite_full,
                                timeout_time=60*5)
     logging.info('Install has completed.')
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     # APK test suite names end with '-debug.apk'
     return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]