[Android] Convert to DeviceUtils versions of IsOnline, HasRoot, and EnableRoot.

build/android/gyp/util/build_device.py

 # 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.
 
 """ A simple device interface for build steps.
 
 """
 
 import logging
 import os
 import re
 import sys
 
 from util import build_utils
 
 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..', '..')
 sys.path.append(BUILD_ANDROID_DIR)
 
 from pylib import android_commands
+from pylib.device import device_errors
 from pylib.device import device_utils
 
 GetAttachedDevices = android_commands.GetAttachedDevices
 
 
 class BuildDevice(object):
   def __init__(self, configuration):
     self.id = configuration['id']
     self.description = configuration['description']
     self.install_metadata = configuration['install_metadata']
@@ skipping 20 matching lines @@
     #   org.chromium.chrome.shell-1.apk
     apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?.apk$' % apk_package, s)
     matches = filter(apk_matcher, self.install_metadata)
     return matches[0] if matches else None
 
 
 def GetConfigurationForDevice(device_id):
   device = device_utils.DeviceUtils(device_id)
   configuration = None
   has_root = False
-  is_online = device.old_interface.IsOnline()
+  is_online = device.IsOnline()
   if is_online:
     cmd = 'ls -l /data/app; getprop ro.build.description'
     cmd_output = device.old_interface.RunShellCommand(cmd)
     has_root = not 'Permission denied' in cmd_output[0]
     if not has_root:
-      # Disable warning log messages from EnableAdbRoot()
-      logging.getLogger().disabled = True
-      has_root = device.old_interface.EnableAdbRoot()
-      logging.getLogger().disabled = False
+      # Disable warning log messages from EnableRoot()
+      class LoggingDisabled(object):

[Primiano Tucci (use gerrit), 2014/05/15 12:39:09]

Is there a specific reason for having all this boilerplate (i.e. the "with"
LoggingDisabled object) instead of just?

logging.getLogger().disabled = True
try:
  device.EnableRoot()
  has_root = True
except device_errors.CommandFailedError:
  has_root = False
finally:
  logging.getLogger().disabled = False

[jbudorick, 2014/05/15 14:10:20]

No, not really. The context manager would make more sense if the logger were
disabled in more than one place, but that obviously isn't the case.

[Primiano Tucci (use gerrit), 2014/05/15 15:21:34]

I don't want to interfere with anybody's work (also I'm not an OWNER there), but
it would be nice for everybody who reads this code (e.g. sheriffs) if we could
avoid introducing unnecessary complexity / abusing of python magic constructs
when not really necessary and just keep things simple.

+        def __enter__(self):
+          logging.getLogger().disabled = True
+        def __exit__(self, _a, _b, _c):
+          logging.getLogger().disabled = False
+
+      with LoggingDisabled():
+        try:
+          device.EnableRoot()
+          has_root = True
+        except device_errors.CommandFailedError:
+          has_root = False
       cmd_output = device.old_interface.RunShellCommand(cmd)
 
     configuration = {
         'id': device_id,
         'description': cmd_output[-1],
         'install_metadata': cmd_output[:-1],
       }
   return configuration, is_online, has_root
 
 
@@ skipping 10 matching lines @@
   assert len(configurations) == 1
   return BuildDevice(configurations[0])
 
 
 def GetBuildDeviceFromPath(path):
   configurations = ReadConfigurations(path)
   if len(configurations) > 0:
     return GetBuildDevice(ReadConfigurations(path))
   return None