[Android] Remove more references to and uses of AndroidCommands.

tools/profile_chrome/perf_controller.py

 # Copyright 2014 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.
 
 import logging
 import os
 import signal
 import subprocess
 import sys
 import tempfile
 
 from profile_chrome import controllers
 from profile_chrome import ui
 
-from pylib import android_commands
 from pylib import constants
 from pylib.perf import perf_control
+from pylib.utils import device_temp_file
 
 sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT,
                              'tools',
                              'telemetry'))
 try:
   # pylint: disable=F0401
   from telemetry.core.platform.profiler import android_profiling_helper
   from telemetry.util import support_binaries
 except ImportError:
   android_profiling_helper = None
@@ skipping 12 matching lines @@
     # Record raw samples to get CPU information.
     '--raw-samples',
     # Increase sampling frequency for better coverage.
     '--freq', '2000',
 ]
 
 
 class _PerfProfiler(object):
   def __init__(self, device, perf_binary, categories):
     self._device = device
-    self._output_file = android_commands.DeviceTempFile(
-        self._device.old_interface, prefix='perf_output')
+    self._output_file = device_temp_file.DeviceTempFile(
+        self._device.adb, prefix='perf_output')
     self._log_file = tempfile.TemporaryFile()
-
-    # TODO(jbudorick) Look at providing a way to unhandroll this once the
-    #                 adb rewrite has fully landed.
-    device_param = (['-s', str(self._device)] if str(self._device) else [])
-    cmd = ['adb'] + device_param + \
-          ['shell', perf_binary, 'record',
-           '--output', self._output_file.name] + _PERF_OPTIONS
+    self._device.RunShellCommand(

[Sami, 2015/05/12 18:37:10]

This command should still be run asynchronously by the Popen below.

[jbudorick, 2015/05/13 03:21:22]

Ah, that's the part I missed. Reverted.

Also, this is gross, though fixing it is (thankfully) noit required to ditch
android_commands.

[Sami, 2015/05/13 12:58:50]

Yeah this is pretty bad. Maybe there's a cleaner API we could add to DeviceUtils
(in another patch)?

[jbudorick, 2015/05/13 21:49:28]

Perhaps. Both telemetry and the video recorder both do this handrolled adb +
Popen shenanigans. That would certainly be in a subsequent patch.

+        [perf_binary, 'record', '--output', self._output_file.name] +
+            _PERF_OPTIONS,
+        check_return=True)
     if categories:
       cmd += ['--event', ','.join(categories)]
     self._perf_control = perf_control.PerfControl(self._device)
     self._perf_control.SetPerfProfilingMode()
     self._perf_process = subprocess.Popen(cmd,
                                           stdout=self._log_file,
                                           stderr=subprocess.STDOUT)
 
   def SignalAndWait(self):
     self._device.KillAll('perf', signum=signal.SIGINT)
@@ skipping 109 matching lines @@
         open(json_file_name, 'w') as json_file:
       cmd = [perfhost_path, 'script', '-s', perf_script_path, '-i',
              perf_profile, '--symfs', symfs_dir, '--kallsyms', kallsyms]
       if subprocess.call(cmd, stdout=json_file, stderr=dev_null):
         logging.warning('Perf data to JSON conversion failed. The result will '
                         'not contain any perf samples. You can still view the '
                         'perf data manually as shown above.')
         return None
 
     return json_file_name