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

build/android/pylib/monkey/test_runner.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.
 
 """Runs a monkey test on a single device."""
 
 import logging
 import random
 
 from pylib import constants
@@ skipping 22 matching lines @@
     cmd = ['monkey',
            '-p %s' % self._package,
            ' '.join(['-c %s' % c for c in self._options.category]),
            '--throttle %d' % self._options.throttle,
            '-s %d' % (self._options.seed or random.randint(1, 100)),
            '-v ' * self._options.verbose_count,
            '--monitor-native-crashes',
            '--kill-process-after-error',
            self._options.extra_args,
            '%d' % self._options.event_count]
-    return self.adb.RunShellCommand(' '.join(cmd), timeout_time=timeout_ms)
+    return self.device.old_interface.RunShellCommand(
+        ' '.join(cmd), timeout_time=timeout_ms)
 
   def RunTest(self, test_name):
     """Run a Monkey test on the device.
 
     Args:
       test_name: String to use for logging the test result.
 
     Returns:
       A tuple of (TestRunResults, retry).
     """
-    self.adb.StartActivity(self._package,
-                           self._activity,
-                           wait_for_completion=True,
-                           action='android.intent.action.MAIN',
-                           force_stop=True)
+    self.device.old_interface.StartActivity(
+        self._package, self._activity, wait_for_completion=True,
+        action='android.intent.action.MAIN', force_stop=True)
 
     # Chrome crashes are not always caught by Monkey test runner.
     # Verify Chrome has the same PID before and after the test.
-    before_pids = self.adb.ExtractPid(self._package)
+    before_pids = self.device.old_interface.ExtractPid(self._package)
 
     # Run the test.
     output = ''
     if before_pids:
       output = '\n'.join(self._LaunchMonkeyTest())
-      after_pids = self.adb.ExtractPid(self._package)
+      after_pids = self.device.old_interface.ExtractPid(self._package)
 
     crashed = True
     if not before_pids:
       logging.error('Failed to start the process.')
     elif not after_pids:
       logging.error('Process %s has died.', before_pids[0])
     elif before_pids[0] != after_pids[0]:
       logging.error('Detected process restart %s -> %s',
                     before_pids[0], after_pids[0])
     else:
       crashed = False
 
     results = base_test_result.TestRunResults()
     success_pattern = 'Events injected: %d' % self._options.event_count
     if success_pattern in output and not crashed:
       result = base_test_result.BaseTestResult(
           test_name, base_test_result.ResultType.PASS, log=output)
     else:
       result = base_test_result.BaseTestResult(
           test_name, base_test_result.ResultType.FAIL, log=output)
       if 'chrome' in self._options.package:
         logging.warning('Starting MinidumpUploadService...')
         try:
-          self.adb.StartCrashUploadService(self._package)
+          self.device.old_interface.StartCrashUploadService(self._package)
         except AssertionError as e:
           logging.error('Failed to start MinidumpUploadService: %s', e)
     results.AddResult(result)
     return results, False