Add PackageUnderTest as -e flag for am instrument command

Bug: 924194
Change-Id: I680852165b6586dba03bd803cdc6f3d6ccd7bf34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1585142
Commit-Queue: Yun Liu <yliuyliu@google.com>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Andrew Luo <aluo@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688649}

build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -79,6 +79,9 @@ EXTRA_TRACE_FILE = ('org.chromium.base.test.BaseJUnit4ClassRunner.TraceFile')
 _EXTRA_TEST_LIST = (
     'org.chromium.base.test.BaseChromiumAndroidJUnitRunner.TestList')
 
+_EXTRA_PACKAGE_UNDER_TEST = ('org.chromium.chrome.test.pagecontroller.rules.'
+                             'ChromeUiApplicationTestRule.PackageUnderTest')
+
 FEATURE_ANNOTATION = 'Feature'
 RENDER_TEST_FEATURE_ANNOTATION = 'RenderTest'
 
@@ -425,6 +428,11 @@ class LocalDeviceInstrumentationTestRun(
   def _RunTest(self, device, test):
     extras = {}
 
+    # Provide package name under test for apk_under_test.
+    if self._test_instance.apk_under_test:
+      package_name = self._test_instance.apk_under_test.GetPackageName()
+      extras[_EXTRA_PACKAGE_UNDER_TEST] = package_name
+
     flags_to_add = []
     test_timeout_scale = None
     if self._test_instance.coverage_directory:

chrome/android/javatests/src/org/chromium/chrome/test/smoke/ChromeBundleSmokeTest.java

@@ -28,7 +28,6 @@ import org.chromium.chrome.test.pagecontroller.utils.UiAutomatorUtils;
 @SmallTest
 @RunWith(BaseJUnit4ClassRunner.class)
 public class ChromeBundleSmokeTest {
-    private static final String PACKAGE_NAME_ARG = "PackageUnderTest";
     private static final String TARGET_ACTIVITY =
             "org.chromium.chrome.features.test_dummy.TestDummyActivity";
 
@@ -41,8 +40,8 @@ public class ChromeBundleSmokeTest {
 
     @Before
     public void setUp() {
-        // TODO (tiborg): Adjust this as needed according to https://crrev.com/c/1585142.
-        mPackageName = InstrumentationRegistry.getArguments().getString(PACKAGE_NAME_ARG);
+        mPackageName = InstrumentationRegistry.getArguments().getString(
+                ChromeUiApplicationTestRule.PACKAGE_NAME_ARG);
         Assert.assertNotNull("Must specify bundle under test", mPackageName);
         mChromeUiRule.launchIntoNewTabPageOnFirstRun();
     }

chrome/android/javatests/src/org/chromium/chrome/test/smoke/ChromeSmokeTest.java

@@ -18,6 +18,7 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.ScalableTimeout;
+import org.chromium.chrome.test.pagecontroller.rules.ChromeUiApplicationTestRule;
 import org.chromium.chrome.test.pagecontroller.utils.IUi2Locator;
 import org.chromium.chrome.test.pagecontroller.utils.Ui2Locators;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
@@ -28,7 +29,6 @@ import org.chromium.content_public.browser.test.util.CriteriaHelper;
 @SmallTest
 @RunWith(BaseJUnit4ClassRunner.class)
 public class ChromeSmokeTest {
-    private static final String PACKAGE_NAME_ARG = "PackageUnderTest";
     private static final String DATA_URL = "data:,Hello";
     private static final String ACTIVITY_NAME = "org.chromium.chrome.browser.ChromeTabbedActivity";
 
@@ -38,9 +38,8 @@ public class ChromeSmokeTest {
 
     @Before
     public void setUp() {
-        // TODO (aluo): Adjust this as needed according to https://crrev.com/c/1585142
         mPackageName = InstrumentationRegistry.getArguments().getString(
-                PACKAGE_NAME_ARG, "org.chromium.chrome");
+                ChromeUiApplicationTestRule.PACKAGE_NAME_ARG, "org.chromium.chrome");
     }
 
     @Test

chrome/android/javatests/src/org/chromium/chrome/test/smoke/OWNERS

+agrieve@chromium.com
+aluo@chromium.org
+jbudorick@chromium.com
+tiborg@chromium.org

chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/rules/ChromeUiApplicationTestRule.java

@@ -21,8 +21,8 @@ import org.chromium.chrome.test.pagecontroller.utils.UiLocationException;
  * Test rule that provides access to a Chrome application.
  */
 public class ChromeUiApplicationTestRule extends ExternalResource {
-    // TODO(aluo): Adjust according to https://crrev.com/c/1585142.
-    public static final String PACKAGE_NAME_ARG = "PackageUnderTest";
+    public static final String PACKAGE_NAME_ARG = "org.chromium.chrome.test.pagecontroller.rules."
+            + "ChromeUiApplicationTestRule.PackageUnderTest";
     private static final String TAG = "ChromeUiAppTR";
 
     private String mPackageName;