[Android] Switch to DeviceUtils versions of Reboot and Install.

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Utility script to install APKs from the command line quickly."""
 
 import optparse
 import os
 import sys
 
 from pylib import android_commands
 from pylib import constants
 from pylib.device import device_utils
-from pylib.utils import apk_helper
 
 
 def AddInstallAPKOption(option_parser):
   """Adds apk option used to install the APK to the OptionParser."""
   option_parser.add_option('--apk',
                            help=('DEPRECATED The name of the apk containing the'
                                  ' application (with the .apk extension).'))
   option_parser.add_option('--apk_package',
-                           help=('The package name used by the apk containing '
-                                 'the application.'))
+                           help=('DEPRECATED The package name used by the apk '
+                                 'containing the application.'))
   option_parser.add_option('--keep_data',
                            action='store_true',
                            default=False,
                            help=('Keep the package data when installing '
                                  'the application.'))
   option_parser.add_option('--debug', action='store_const', const='Debug',
                            dest='build_type',
                            default=os.environ.get('BUILDTYPE', 'Debug'),
                            help='If set, run test suites under out/Debug. '
                            'Default is env var BUILDTYPE or Debug')
@@ skipping 30 matching lines @@
   elif len(args) > 2:
     parser.error("Too many arguments.")
 
   constants.SetBuildType(options.build_type)
   ValidateInstallAPKOption(parser, options, args)
 
   devices = android_commands.GetAttachedDevices()
   if not devices:
     raise Exception('Error: no connected devices')
 
-  if not options.apk_package:
-    options.apk_package = apk_helper.GetPackageName(options.apk)
-
-  device_utils.DeviceUtils.parallel(devices).old_interface.ManagedInstall(
-      options.apk, options.keep_data, options.apk_package).pFinish(None)
+  device_utils.DeviceUtils.parallel(devices).Install(
+      options.apk, reinstall=options.keep_data)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))