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

build/android/pylib/valgrind_tools.py

 # 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.
 
 """
 Classes in this file define additional actions that need to be taken to run a
 test under some kind of runtime error detection tool.
 
 The interface is intended to be used as follows.
 
@@ skipping 10 matching lines @@
 Call tool.CleanUpEnvironment().
 """
 # pylint: disable=R0201
 
 import glob
 import os.path
 import subprocess
 import sys
 
 from pylib.constants import DIR_SOURCE_ROOT
+from pylib.device import device_errors
 
 
 def SetChromeTimeoutScale(device, scale):
   """Sets the timeout scale in /data/local/tmp/chrome_timeout_scale to scale."""
   path = '/data/local/tmp/chrome_timeout_scale'
   if not scale or scale == 1.0:
     # Delete if scale is None/0.0/1.0 since the default timeout scale is 1.0
     device.old_interface.RunShellCommand('rm %s' % path)
   else:
     device.old_interface.SetProtectedFileContents(path, '%f' % scale)
@@ skipping 84 matching lines @@
 
   def GetUtilWrapper(self):
     """Returns the wrapper for utilities, such as forwarder.
 
     AddressSanitizer wrapper must be added to all instrumented binaries,
     including forwarder and the like. This can be removed if such binaries
     were built without instrumentation. """
     return self.GetTestWrapper()
 
   def SetupEnvironment(self):
-    self._device.old_interface.EnableAdbRoot()
+    try:
+      self._device.EnableRoot()
+    except device_errors.CommandFailedError:
+      # Try to set the timeout scale anyway.
+      pass

[craigdh, 2014/05/14 20:33:08]

I really dislike this. Why are exceptions so often being suppressed for
EnableRoot? If it's conditional let's check the condition and only call enable
root if it should succeed.

[jbudorick, 2014/05/14 21:02:01]

My default stance for this series of interface switches was to not change
behavior at all. I'm not necessarily opposed to doing so on an individual basis,
but it does make the landing a bit more risky.

I don't think we have a way in either the old or the new api of checking whether
or not enable root "should" succeed, although I basically did it in adb shell in
device_utils_test.py.

[craigdh, 2014/05/14 21:21:11]

At the very very very least log the exception so it'll show up if (when) someone
goes debugging. And add TODOs to all of them.

     SetChromeTimeoutScale(self._device, self.GetTimeoutScale())
 
   def CleanUpEnvironment(self):
     SetChromeTimeoutScale(self._device, None)
 
   def GetTimeoutScale(self):
     # Very slow startup.
     return 20.0
 
 
@@ skipping 115 matching lines @@
   if not tool_name:
     return BaseTool()
 
   ctor = TOOL_REGISTRY.get(tool_name)
   if ctor:
     return ctor(device)
   else:
     print 'Unknown tool %s, available tools: %s' % (
         tool_name, ', '.join(sorted(TOOL_REGISTRY.keys())))
     sys.exit(1)