Organize adb install cmds and reboot on failure

build/android/pylib/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.
 
 
 import os
 import re
 import sys
 
 import cmd_helper
@@ skipping 79 matching lines @@
        'am start -n '
         'org.chromium.native_test/'
         'org.chromium.native_test.ChromeNativeTestActivity')
     finally:
       self.tool.CleanUpEnvironment()
     return self._WatchTestOutput(self.adb.GetMonitoredLogCat())
 
   def StripAndCopyExecutable(self):
     # Always uninstall the previous one (by activity name); we don't
     # know what was embedded in it.
-    logging.info('Uninstalling any activity with the test name')
-    self.adb.Adb().SendCommand('uninstall org.chromium.native_test',
-                               timeout_time=60*5)
-    logging.info('Installing new apk')
-    self.adb.Adb().SendCommand('install -r ' + self.test_suite_full,
-                               timeout_time=60*5)
-    logging.info('Install has completed.')
+    self.adb.ManagedInstall(self.test_suite_full, False,
+                            package_name='org.chromium.native_test')
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     # APK test suite names end with '-debug.apk'
     return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]