[Android] Convert to DeviceUtils versions of WaitUntilFullyBooted and GetExternalStoragePath.

build/android/pylib/gtest/test_package_exe.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.
 
 """Defines TestPackageExecutable to help run stand-alone executables."""
 
 import logging
 import os
 import sys
 import tempfile
 
 from pylib import cmd_helper
 from pylib import constants
 from pylib import pexpect
+from pylib.device import device_errors
 from pylib.gtest.test_package import TestPackage
 
 
 class TestPackageExecutable(TestPackage):
   """A helper class for running stand-alone executables."""
 
   _TEST_RUNNER_RET_VAL_FILE = 'gtest_retval'
 
   def __init__(self, suite_name):
     """
@@ skipping 30 matching lines @@
   def _AddNativeCoverageExports(device):
     # export GCOV_PREFIX set the path for native coverage results
     # export GCOV_PREFIX_STRIP indicates how many initial directory
     #                          names to strip off the hardwired absolute paths.
     #                          This value is calculated in buildbot.sh and
     #                          depends on where the tree is built.
     # Ex: /usr/local/google/code/chrome will become
     #     /code/chrome if GCOV_PREFIX_STRIP=3
     try:
       depth = os.environ['NATIVE_COVERAGE_DEPTH_STRIP']
+      export_string = ('export GCOV_PREFIX="%s/gcov"\n' %
+                       device.GetExternalStoragePath())
+      export_string += 'export GCOV_PREFIX_STRIP=%s\n' % depth
+      return export_string
     except KeyError:
       logging.info('NATIVE_COVERAGE_DEPTH_STRIP is not defined: '
                    'No native coverage.')
       return ''
-    export_string = ('export GCOV_PREFIX="%s/gcov"\n' %
-                     device.old_interface.GetExternalStorage())
-    export_string += 'export GCOV_PREFIX_STRIP=%s\n' % depth
-    return export_string
+    except device_errors.CommandFailedError:
+      logging.info('No external storage found: No native coverage.')
+      return ''
 
   #override
   def ClearApplicationState(self, device):
     device.old_interface.KillAllBlocking(self.suite_name, 30)
 
   #override
   def CreateCommandLineFileOnDevice(self, device, test_filter, test_arguments):
     tool_wrapper = self.tool.GetTestWrapper()
     sh_script_file = tempfile.NamedTemporaryFile()
     # We need to capture the exit status from the script since adb shell won't
@@ skipping 47 matching lines @@
       source_mtime = os.stat(self.suite_path).st_mtime
       if target_mtime < source_mtime:
         raise Exception(
             'stripped binary (%s, timestamp %d) older than '
             'source binary (%s, timestamp %d), build target %s' %
             (target_name, target_mtime, self.suite_path, source_mtime,
              self.suite_name + '_stripped'))
 
     test_binary = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name
     device.old_interface.PushIfNeeded(target_name, test_binary)