[Android] Get package_info by using apk_under_test package.

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 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 collections
 import copy
 import logging
 import os
 import pickle
 import re
@@ skipping 258 matching lines @@
 
     if not os.path.exists(self._test_apk.path):
       error_func('Unable to find test APK: %s' % self._test_apk.path)
     if not os.path.exists(self._test_jar):
       error_func('Unable to find test JAR: %s' % self._test_jar)
 
     self._test_package = self._test_apk.GetPackageName()
     self._test_runner = self._test_apk.GetInstrumentationName()
 
     self._package_info = None
+    package_under_test = self._apk_under_test.GetPackageName()
     for package_info in constants.PACKAGE_INFO.itervalues():
-      if self._test_package == package_info.test_package:
+      if package_under_test == package_info.package:

[rnephew (Reviews Here), 2016/04/15 20:35:36]

In this context:
  package_under_test  ==  chrome
  self._test_package == chome_test_whatever_apk
correct?
If so, does switching this from the test apk to the chrome apk make sense?

[mikecase (-- gone --), 2016/04/15 20:55:36]

Yeah, so for example. In the case of like ChromeTest apk.
package_info.package is the Chrome package
package_info.test_package is the ChromeTest package

Currently, we are determining which package_info to use by keying on the
"package_info.test_package" entry. I have no idea why we are currently doing it
this way. But I am removing the "package_info.test_package" entry all-together
and just keying on the "package_info.package" entry instead.

This makes is far more convenient when multiple test_apks have the same
apk_under_test.

         self._package_info = package_info
     if not self._package_info:
       logging.warning('Unable to find package info for %s', self._test_package)
 
     for apk in args.additional_apks:
       if not os.path.exists(apk):
         error_func('Unable to find additional APK: %s' % apk)
     self._additional_apks = (
         [apk_helper.ToHelper(x) for x in args.additional_apks])
 
@@ skipping 344 matching lines @@
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()