[Android] Switch gtests to platform mode. (RELAND)

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 logging
 import os
 import sys
 import time
 
 from devil.android import apk_helper
 from devil.android import device_errors
 from devil.android.sdk import intent
 from pylib import constants
 from pylib import pexpect
 from pylib.gtest import gtest_test_instance
-from pylib.gtest import local_device_gtest_run
 from pylib.gtest.test_package import TestPackage
+from pylib.local.device import local_device_gtest_run
 
 
 class TestPackageApk(TestPackage):
   """A helper class for running APK-based native tests."""
 
   def __init__(self, suite_name):
     """
     Args:
       suite_name: Name of the test suite (e.g. base_unittests).
     """
     TestPackage.__init__(self, suite_name)
     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': None}
+      self._extras = {
+        'org.chromium.native_test.NativeTestActivity.RunInSubThread': None
+      }
     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/
@@ skipping 106 matching lines @@
   #override
   def PullAppFiles(self, device, files, directory):
     local_device_gtest_run.PullAppFilesImpl(
         device, self._package_info.package, files, directory)
 
   #override
   def SetPermissions(self, device):
     permissions = apk_helper.ApkHelper(self.suite_path).GetPermissions()
     device.GrantPermissions(
         apk_helper.GetPackageName(self.suite_path), permissions)