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

build/android/pylib/gtest/test_package_apk.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 TestPackageApk to help run APK-based native tests."""
 # pylint: disable=W0212
 
 import logging
 import os
 import shlex
@@ skipping 67 matching lines @@
         wait_for_completion=False,
         action='android.intent.action.MAIN',
         force_stop=True)
 
   #override
   def ClearApplicationState(self, device):
     device.old_interface.ClearApplicationState(self._package_info.package)
     # Content shell creates a profile on the sdscard which accumulates cache
     # files over time.
     if self.suite_name == 'content_browsertests':
-      device.old_interface.RunShellCommand(
-          'rm -r %s/content_shell' % device.old_interface.GetExternalStorage(),
-          timeout_time=60 * 2)
+      try:
+        device.old_interface.RunShellCommand(
+            'rm -r %s/content_shell' % device.GetExternalStoragePath(),
+            timeout_time=60 * 2)
+      except device_errors.CommandFailedError:
+        # TODO(jbudorick) Handle this exception appropriately once the
+        #                 conversions are done.
+        pass
 
   #override
   def CreateCommandLineFileOnDevice(self, device, test_filter, test_arguments):
     self._CreateCommandLineFileOnDevice(
         device, '--gtest_filter=%s %s' % (test_filter, test_arguments))
 
   #override
   def GetAllTests(self, device):
     self._CreateCommandLineFileOnDevice(device, '--gtest_list_tests')
     try:
@@ skipping 20 matching lines @@
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
     return self._WatchFifo(device, timeout=10, logfile=logfile)
 
   #override
   def Install(self, device):
     self.tool.CopyFiles()
     device.old_interface.ManagedInstall(
         self.suite_path, False, package_name=self._package_info.package)