Reduce timeout for Android tests from 90m to 60m.

build/android/pylib/perf/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 perf tests.
 
 Our buildbot infrastructure requires each slave to run steps serially.
 This is sub-optimal for android, where these steps can run independently on
 multiple connected devices.
 
@@ skipping 267 matching lines @@
 
     logging.info('Charge level: %s%%',
         str(self._device_battery.GetBatteryInfo().get('level')))
     if self._options.min_battery_level:
       self._device_battery.ChargeDeviceToLevel(
           self._options.min_battery_level)
 
     logging.info('%s : %s', test_name, cmd)
     start_time = time.time()
 
-    timeout = self._tests['steps'][test_name].get('timeout', 5400)
+    timeout = self._tests['steps'][test_name].get('timeout', 3600)
     if self._options.no_timeout:
       timeout = None
     logging.info('Timeout for %s test: %s', test_name, timeout)
     full_cmd = cmd
     if self._options.dry_run:
       full_cmd = 'echo %s' % cmd
 
     logfile = sys.stdout
     if self._options.single_step:
       # Just print a heart-beat so that the outer buildbot scripts won't timeout
@@ skipping 67 matching lines @@
     Returns:
       A tuple of (TestRunResults, retry).
     """
     _, result_type = self._LaunchPerfTest(test_name)
     results = base_test_result.TestRunResults()
     results.AddResult(base_test_result.BaseTestResult(test_name, result_type))
     retry = None
     if not results.DidRunPass():
       retry = test_name
     return results, retry