[Android] Reland of Remove android_commands and android_testrunner.

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 itertools
 import logging
 import os
 import posixpath
 import shlex
 import sys
 import tempfile
 import time
 
-from pylib import android_commands
 from pylib import constants
 from pylib import pexpect
 from pylib.device import device_errors
 from pylib.device import intent
 from pylib.gtest import gtest_test_instance
 from pylib.gtest import local_device_gtest_run
 from pylib.gtest.test_package import TestPackage
 
 
 class TestPackageApk(TestPackage):
@@ skipping 36 matching lines @@
 
   def _WatchFifo(self, device, timeout, logfile=None):
     for i in range(100):
       if device.FileExists(self._GetFifo()):
         logging.info('Fifo created. Slept for %f secs' % (i * 0.5))
         break
       time.sleep(0.5)
     else:
       raise device_errors.DeviceUnreachableError(
           'Unable to find fifo on device %s ' % self._GetFifo())
-    args = shlex.split(device.old_interface.Adb()._target_arg)
-    args += ['shell', 'cat', self._GetFifo()]
+    args = ['-s', device.adb.GetDeviceSerial(), 'shell', 'cat', self._GetFifo()]
     return pexpect.spawn('adb', args, timeout=timeout, logfile=logfile)
 
   def _StartActivity(self, device, force_stop=True):
     device.StartActivity(
         intent.Intent(package=self._package_info.package,
                       activity=self._package_info.activity,
                       action='android.intent.action.MAIN',
                       extras=self._extras),
         # No wait since the runner waits for FIFO creation anyway.
         blocking=False,
@@ skipping 50 matching lines @@
   def SpawnTestProcess(self, device):
     try:
       self.tool.SetupEnvironment()
       self._ClearFifo(device)
       # Doesn't need to stop an Activity because ClearApplicationState() is
       # always called before this call and so it is already stopped at this
       # point.
       self._StartActivity(device, force_stop=False)
     finally:
       self.tool.CleanUpEnvironment()
-    logfile = android_commands.NewLineNormalizer(sys.stdout)
+    logfile = self._NewLineNormalizer(sys.stdout)
     return self._WatchFifo(device, timeout=10, logfile=logfile)
 
+  class _NewLineNormalizer(object):
+    def __init__(self, output):
+      self._output = output
+
+    def write(self, data):
+      data = data.replace('\r\r\n', '\n')
+      self._output.write(data)
+
+    def flush(self):
+      self._output.flush()
+
   #override
   def Install(self, device):
     self.tool.CopyFiles(device)
     device.Install(self.suite_path)
 
   #override
   def PullAppFiles(self, device, files, directory):
     local_device_gtest_run.PullAppFilesImpl(
         device, self._package_info.package, files, directory)