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

build/android/pylib/device_settings.py

 # Copyright 2014 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 logging
 
 from pylib import content_settings
 
 
-def ConfigureContentSettingsDict(adb, desired_settings):
+def ConfigureContentSettingsDict(device, desired_settings):
   """Configures device content setings from a dictionary.
 
   Many settings are documented at:
     http://developer.android.com/reference/android/provider/Settings.Global.html
     http://developer.android.com/reference/android/provider/Settings.Secure.html
     http://developer.android.com/reference/android/provider/Settings.System.html
 
   Many others are undocumented.
 
   Args:
-    adb: An AndroidCommands instance for the device to configure.
+    device: A DeviceUtils instance for the device to configure.
     desired_settings: A dict of {table: {key: value}} for all
         settings to configure.
   """
   try:
-    sdk_version = int(adb.system_properties['ro.build.version.sdk'])
+    sdk_version = int(device.old_interface.system_properties[
+        'ro.build.version.sdk'])
   except ValueError:
     logging.error('Skipping content settings configuration, unknown sdk %s',
-                  adb.system_properties['ro.build.version.sdk'])
+                  device.old_interface.system_properties[
+                      'ro.build.version.sdk'])
     return
 
   if sdk_version < 16:
     logging.error('Skipping content settings configuration due to outdated sdk')
     return
 
   for table, key_value in sorted(desired_settings.iteritems()):
-    settings = content_settings.ContentSettings(table, adb)
+    settings = content_settings.ContentSettings(table, device)
     for key, value in key_value.iteritems():
       settings[key] = value
     logging.info('\n%s %s', table, (80 - len(table)) * '-')
     for key, value in sorted(settings.iteritems()):
       logging.info('\t%s: %s', key, value)
 
 
 DETERMINISTIC_DEVICE_SETTINGS = {
   'com.google.settings/partner': {
     'use_location_for_services': 1,
@@ skipping 37 matching lines @@
     'user_rotation': 0,
   },
 }
 
 
 NETWORK_DISABLED_SETTINGS = {
   'settings/global': {
     'airplane_mode_on': 1,
   },
 }