[Android] Fix remote device test run TestPackage() methods.

BUG=428729

Review URL: https://codereview.chromium.org/801283005

Cr-Commit-Position: refs/heads/master@{#308382}

build/android/pylib/remote/device/remote_device_gtest_run.py

@@ -27,8 +27,9 @@ class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun):
   DEFAULT_RUNNER_PACKAGE = (
       'org.chromium.native_test.ChromiumNativeTestInstrumentationTestRunner')
 
+  #override
   def TestPackage(self):
-    pass
+    return self._test_instance.suite
 
   #override
   def _TriggerSetUp(self):

build/android/pylib/remote/device/remote_device_test_run.py

@@ -41,9 +41,6 @@ class RemoteDeviceTestRun(test_run.TestRun):
     self._test_id = ''
     self._results = ''
 
-  def TestPackage(self):
-    pass
-
   #override
   def RunTests(self):
     """Run the test."""

build/android/pylib/remote/device/remote_device_uirobot_run.py

@@ -34,8 +34,9 @@ class RemoteDeviceUirobotRun(remote_device_test_run.RemoteDeviceTestRun):
     """
     super(RemoteDeviceUirobotRun, self).__init__(env, test_instance)
 
+  #override
   def TestPackage(self):
-    pass
+    return self._test_instance.package_name
 
   #override
   def _TriggerSetUp(self):

build/android/pylib/uirobot/uirobot_test_instance.py

@@ -6,6 +6,7 @@ import os
 
 from pylib import constants
 from pylib.base import test_instance
+from pylib.utils import apk_helper
 
 class UirobotTestInstance(test_instance.TestInstance):
 
@@ -19,6 +20,7 @@ class UirobotTestInstance(test_instance.TestInstance):
     self._apk_under_test = os.path.join(
         constants.GetOutDirectory(), args.apk_under_test)
     self._minutes = args.minutes
+    self._package_name = apk_helper.GetPackageName(self._apk_under_test)
 
   #override
   def TestType(self):
@@ -40,12 +42,12 @@ class UirobotTestInstance(test_instance.TestInstance):
     """Returns the app to run the test on."""
     return self._apk_under_test
 
-  @property
-  def suite(self):
-    """Returns the test suite, none for uirobot."""
-    return None
-
   @property
   def minutes(self):
     """Returns the number of minutes to run the uirobot for."""
     return self._minutes
+
+  @property
+  def package_name(self):
+    """Returns the name of the package in the APK."""
+    return self._package_name