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

build/android/pylib/content_settings.py

Index: build/android/pylib/content_settings.py
diff --git a/build/android/pylib/content_settings.py b/build/android/pylib/content_settings.py
index 26ec549f58d1f19d1a6ac9dc60edc665d9a59a5e..6f0c7758da15f02184914fe017fdf124f62ec4f6 100644
--- a/build/android/pylib/content_settings.py
+++ b/build/android/pylib/content_settings.py
@@ -10,17 +10,19 @@ class ContentSettings(dict):
   System properties are key/value pairs as exposed by adb shell content.
   """
 
-  def __init__(self, table, adb):
+  def __init__(self, table, device):
     super(ContentSettings, self).__init__()
+    sdk_version_string = device.old_interface.system_properties[
+        'ro.build.version.sdk']
     try:
-      sdk_version = int(adb.system_properties['ro.build.version.sdk'])
+      sdk_version = int(sdk_version_string)
       assert sdk_version >= 16, (
           'ContentSettings supported only on SDK 16 and later')
     except ValueError:
-      assert False, ('Unknown SDK version %s' %
-          adb.system_properties['ro.build.version.sdk'])
+      assert False, ('Unknown SDK version %s' % sdk_version_string)
     self._table = table
-    self._adb = adb
+    # TODO check if this is used.

[craigdh, 2014/04/09 15:55:02]

TODO should have a name. But why not do it now?

+    self._device = device
 
   @staticmethod
   def _GetTypeBinding(value):
@@ -39,7 +41,7 @@ class ContentSettings(dict):
   def iteritems(self):
     # Example row:
     # 'Row: 0 _id=13, name=logging_id2, value=-1fccbaa546705b05'
-    for row in self._adb.RunShellCommandWithSU(
+    for row in self._device.old_interface.RunShellCommandWithSU(
         'content query --uri content://%s' % self._table):
       fields = row.split(', ')
       key = None
@@ -54,19 +56,19 @@ class ContentSettings(dict):
       yield key, value
 
   def __getitem__(self, key):
-    return self._adb.RunShellCommandWithSU(
+    return self._device.old_interface.RunShellCommandWithSU(
         'content query --uri content://%s --where "name=\'%s\'" '
         '--projection value' % (self._table, key)).strip()
 
   def __setitem__(self, key, value):
     if key in self:
-      self._adb.RunShellCommandWithSU(
+      self._device.old_interface.RunShellCommandWithSU(
           'content update --uri content://%s '
           '--bind value:%s:%s --where "name=\'%s\'"' % (
               self._table,
               self._GetTypeBinding(value), value, key))
     else:
-      self._adb.RunShellCommandWithSU(
+      self._device.old_interface.RunShellCommandWithSU(
           'content insert --uri content://%s '
           '--bind name:%s:%s --bind value:%s:%s' % (
               self._table,
@@ -74,7 +76,7 @@ class ContentSettings(dict):
               self._GetTypeBinding(value), value))
 
   def __delitem__(self, key):
-    self._adb.RunShellCommandWithSU(
+    self._device.old_interface.RunShellCommandWithSU(
         'content delete --uri content://%s '
         '--bind name:%s:%s' % (
             self._table,