Update from https://crrev.com/327068

build/android/pylib/gtest/test_runner.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.
 
 import logging
 import os
 import re
 
 from pylib import pexpect
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.device import device_errors
 from pylib.local import local_test_server_spawner
 from pylib.perf import perf_control
 
 # Test case statuses.
 RE_RUN = re.compile('\\[ RUN      \\] ?(.*)\r\n')
 RE_FAIL = re.compile('\\[  FAILED  \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
 RE_OK = re.compile('\\[       OK \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
 
 # Test run statuses.
 RE_PASSED = re.compile('\\[  PASSED  \\] ?(.*)\r\n')
 RE_RUNNER_FAIL = re.compile('\\[ RUNNER_FAILED \\] ?(.*)\r\n')
 # Signal handlers are installed before starting tests
 # to output the CRASHED marker when a crash happens.
 RE_CRASH = re.compile('\\[ CRASHED      \\](.*)\r\n')
 
+# Bots that don't output anything for 20 minutes get timed out, so that's our
+# hard cap.
+_INFRA_STDOUT_TIMEOUT = 20 * 60
+
 
 def _TestSuiteRequiresMockTestServer(suite_name):
   """Returns True if the test suite requires mock test server."""
   tests_require_net_test_server = ['unit_tests', 'net_unittests',
+                                   'components_browsertests',
                                    'content_unittests',
                                    'content_browsertests']
   return (suite_name in
           tests_require_net_test_server)
 
 def _TestSuiteRequiresHighPerfMode(suite_name):
   """Returns True if the test suite requires high performance mode."""
   return 'perftests' in suite_name
 
 class TestRunner(base_test_runner.BaseTestRunner):
   def __init__(self, test_options, device, test_package):
     """Single test suite attached to a single device.
 
     Args:
       test_options: A GTestOptions object.
       device: Device to run the tests.
       test_package: An instance of TestPackage class.
     """
 
-    super(TestRunner, self).__init__(device, test_options.tool,
-                                     test_options.cleanup_test_files)
+    super(TestRunner, self).__init__(device, test_options.tool)
 
     self.test_package = test_package
     self.test_package.tool = self.tool
     self._test_arguments = test_options.test_arguments
 
     timeout = test_options.timeout
     if timeout == 0:
       timeout = 60
     # On a VM (e.g. chromium buildbots), this timeout is way too small.
     if os.environ.get('BUILDBOT_SLAVENAME'):
       timeout = timeout * 2
 
-    self._timeout = timeout * self.tool.GetTimeoutScale()
+    self._timeout = min(timeout * self.tool.GetTimeoutScale(),
+                        _INFRA_STDOUT_TIMEOUT)
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller = perf_control.PerfControl(self.device)
 
     if _TestSuiteRequiresMockTestServer(self.test_package.suite_name):
       self._servers = [
           local_test_server_spawner.LocalTestServerSpawner(
               ports.AllocateTestServerPort(), self.device, self.tool)]
     else:
       self._servers = []
 
@@ skipping 110 matching lines @@
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     for s in self._servers:
       s.TearDown()
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller.SetDefaultPerfMode()
     self.test_package.ClearApplicationState(self.device)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()