Android: Change test timeout to 30 minutes instead of 15.

build/android/pylib/local/device/local_device_gtest_run.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 itertools
 import os
 import posixpath
 
 from devil.android import device_errors
 from devil.android import device_temp_file
@@ skipping 13 matching lines @@
 _EXTRA_SHARD_NANO_TIMEOUT = (
     'org.chromium.native_test.NativeTestInstrumentationTestRunner'
         '.ShardNanoTimeout')
 _EXTRA_TEST_LIST = (
     'org.chromium.native_test.NativeTestInstrumentationTestRunner'
         '.TestList')
 
 _MAX_SHARD_SIZE = 256
 _SECONDS_TO_NANOS = int(1e9)
 
+# The amount of time a test executable may run before it gets killed.
+_TEST_TIMEOUT_SECONDS = 30*60
+
 # TODO(jbudorick): Move this up to the test instance if the net test server is
 # handled outside of the APK for the remote_device environment.
 _SUITE_REQUIRES_TEST_SERVER_SPAWNER = [
   'components_browsertests', 'content_unittests', 'content_browsertests',
   'net_unittests', 'unit_tests'
 ]
 
 # TODO(jbudorick): Move this inside _ApkDelegate once TestPackageApk is gone.
 def PullAppFilesImpl(device, package, files, directory):
   device_dir = device.GetApplicationDataDirectory(package)
@@ skipping 180 matching lines @@
       tests = self._test_instance.FilterTests(tests)
       return tests
 
     test_lists = self._env.parallel_devices.pMap(list_tests).pGet(None)
     tests = list(sorted(set().union(*[set(tl) for tl in test_lists if tl])))
     return tests
 
   #override
   def _RunTest(self, device, test):
     # Run the test.
-    timeout = 900 * self.GetTool(device).GetTimeoutScale()
+    timeout = _TEST_TIMEOUT_SECONDS * self.GetTool(device).GetTimeoutScale()
     output = self._delegate.Run(
         test, device, timeout=timeout, retries=0)
     for s in self._servers[str(device)]:
       s.Reset()
     if self._test_instance.app_files:
       self._delegate.PullAppFiles(device, self._test_instance.app_files,
                                   self._test_instance.app_file_dir)
     self._delegate.Clear(device)
 
     # Parse the output.
     # TODO(jbudorick): Transition test scripts away from parsing stdout.
     results = self._test_instance.ParseGTestOutput(output)
     return results
 
   #override
   def TearDown(self):
     @local_device_test_run.handle_shard_failures
     def individual_device_tear_down(dev):
       for s in self._servers.get(str(dev), []):
         s.TearDown()
 
     self._env.parallel_devices.pMap(individual_device_tear_down)
-