[Android] Change object types from AndroidCommands to DeviceUtils in build/android/.

build/android/update_verification.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Runs semi-automated update testing on a non-rooted device."""
 import logging
 import optparse
 import os
 import shutil
 import sys
 import time
 
 from pylib import android_commands
+from pylib.device import device_utils
 
-
-def _SaveAppData(adb, package_name, from_apk=None, data_dir=None):
+def _SaveAppData(device, package_name, from_apk=None, data_dir=None):
   def _BackupAppData(data_dir=None):
-    adb.Adb().SendCommand('backup %s' % package_name)
+    device.old_interface.Adb().SendCommand('backup %s' % package_name)
     backup_file = os.path.join(os.getcwd(), 'backup.ab')
     assert os.path.exists(backup_file), 'Backup failed.'
     if data_dir:
       if not os.path.isdir(data_dir):
         os.makedirs(data_dir)
       shutil.move(backup_file, data_dir)
       backup_file = os.path.join(data_dir, 'backup.ab')
     print 'Application data saved to %s' % backup_file
 
   if from_apk:
     logging.info('Installing %s...', from_apk)
-    output = adb.Install(from_apk, reinstall=True)
+    output = device.old_interface.Install(from_apk, reinstall=True)
     if 'Success' not in output:
       raise Exception('Unable to install %s. output: %s' % (from_apk, output))
 
   raw_input('Set the application state. Once ready, press enter and '
             'select "Backup my data" on the device.')
   _BackupAppData(data_dir)
 
 
-def _VerifyAppUpdate(adb, to_apk, app_data, from_apk=None):
+def _VerifyAppUpdate(device, to_apk, app_data, from_apk=None):
   def _RestoreAppData():
     assert os.path.exists(app_data), 'Backup file does not exist!'
-    adb.Adb().SendCommand('restore %s' % app_data)
+    device.old_interface.Adb().SendCommand('restore %s' % app_data)
     # It seems restore command is not synchronous.
     time.sleep(15)
 
   if from_apk:
     logging.info('Installing %s...', from_apk)
-    output = adb.Install(from_apk, reinstall=True)
+    output = device.old_interface.Install(from_apk, reinstall=True)
     if 'Success' not in output:
       raise Exception('Unable to install %s. output: %s' % (from_apk, output))
 
   logging.info('Restoring the application data...')
   raw_input('Press enter and select "Restore my data" on the device.')
   _RestoreAppData()
 
   logging.info('Verifying that %s cannot be installed side-by-side...',
                to_apk)
-  output = adb.Install(to_apk)
+  output = device.old_interface.Install(to_apk)
   if 'INSTALL_FAILED_ALREADY_EXISTS' not in output:
     if 'Success' in output:
       raise Exception('Package name has changed! output: %s' % output)
     else:
       raise Exception(output)
 
   logging.info('Verifying that %s can be overinstalled...', to_apk)
-  output = adb.Install(to_apk, reinstall=True)
+  output = device.old_interface.Install(to_apk, reinstall=True)
   if 'Success' not in output:
     raise Exception('Unable to install %s.\n output: %s' % (to_apk, output))
   logging.info('Successfully updated to the new apk. Please verify that the '
                'the application data is preserved.')
 
 
 def main():
   logger = logging.getLogger()
   logger.setLevel(logging.DEBUG)
   desc = (
@@ skipping 22 matching lines @@
   parser.add_option('--to-apk', help='APK to update to.')
   parser.add_option('--app-data',
                     help=('Path to the application data to be restored or the '
                           'directory where the data should be saved.'))
   (options, args) = parser.parse_args()
 
   if args:
     parser.print_help(sys.stderr)
     parser.error('Unknown arguments: %s.' % args)
 
-  if len(android_commands.GetAttachedDevices()) != 1:
+  devices = android_commands.GetAttachedDevices()
+  if len(devices) != 1:
     parser.error('Exactly 1 device must be attached.')
-  adb = android_commands.AndroidCommands()
+  device = device_utils.DeviceUtils(devices[0])
 
   if options.from_apk:
     assert os.path.isfile(options.from_apk)
 
   if options.save:
     if not options.package_name:
       parser.print_help(sys.stderr)
       parser.error('Missing --package-name.')
-    _SaveAppData(adb, options.package_name, from_apk=options.from_apk,
+    _SaveAppData(device, options.package_name, from_apk=options.from_apk,
                  data_dir=options.app_data)
   else:
     if not options.to_apk or not options.app_data:
       parser.print_help(sys.stderr)
       parser.error('Missing --to-apk or --app-data.')
     assert os.path.isfile(options.to_apk)
     assert os.path.isfile(options.app_data)
-    _VerifyAppUpdate(adb, options.to_apk, options.app_data,
+    _VerifyAppUpdate(device, options.to_apk, options.app_data,
                      from_apk=options.from_apk)
 
 
 if __name__ == '__main__':
   main()