Support Kerberos on Android

build/android/pylib/gtest/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.
 
 """Defines TestPackageApk to help run APK-based native tests."""
 # pylint: disable=W0212
 
 import itertools
 import logging
 import os
@@ skipping 25 matching lines @@
     self.suite_path = os.path.join(
         constants.GetOutDirectory(), '%s_apk' % suite_name,
         '%s-debug.apk' % suite_name)
     if suite_name == 'content_browsertests':
       self._package_info = constants.PACKAGE_INFO['content_browsertests']
     elif suite_name == 'components_browsertests':
       self._package_info = constants.PACKAGE_INFO['components_browsertests']
     else:
       self._package_info = constants.PACKAGE_INFO['gtest']
 
+    if suite_name == 'net_unittests':
+      self._extras = {'RunInSubThread': ''}

[Fabrice (no longer in Chrome), 2015/07/31 13:20:29]

This has been making the Android/asan bot fail since it landed.
Please, take a look at crbug.com/515881

+    else:
+      self._extras = []
+
   def _CreateCommandLineFileOnDevice(self, device, options):
     device.WriteFile(self._package_info.cmdline_file,
                      self.suite_name + ' ' + options)
 
   def _GetFifo(self):
     # The test.fifo path is determined by:
     # testing/android/native_test/java/src/org/chromium/native_test/
     #     NativeTestActivity.java and
     # testing/android/native_test_launcher.cc
     return '/data/data/' + self._package_info.package + '/files/test.fifo'
@@ skipping 11 matching lines @@
       raise device_errors.DeviceUnreachableError(
           'Unable to find fifo on device %s ' % self._GetFifo())
     args = shlex.split(device.old_interface.Adb()._target_arg)
     args += ['shell', 'cat', self._GetFifo()]
     return pexpect.spawn('adb', args, timeout=timeout, logfile=logfile)
 
   def _StartActivity(self, device, force_stop=True):
     device.StartActivity(
         intent.Intent(package=self._package_info.package,
                       activity=self._package_info.activity,
-                      action='android.intent.action.MAIN'),
+                      action='android.intent.action.MAIN',
+                      extras=self._extras),
         # No wait since the runner waits for FIFO creation anyway.
         blocking=False,
         force_stop=force_stop)
 
   #override
   def ClearApplicationState(self, device):
     device.ClearApplicationState(self._package_info.package)
     # Content shell creates a profile on the sdscard which accumulates cache
     # files over time.
     if self.suite_name == 'content_browsertests':
@@ skipping 54 matching lines @@
 
   #override
   def Install(self, device):
     self.tool.CopyFiles(device)
     device.Install(self.suite_path)
 
   #override
   def PullAppFiles(self, device, files, directory):
     local_device_gtest_run.PullAppFilesImpl(
         device, self._package_info.package, files, directory)