GTTF: Remove wait_for_terminate_timeout_ms in favor of action_max_timeout_ms

tools/heapcheck/chrome_tests.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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 various chrome tests through heapcheck_test.py.
 
 Most of this code is copied from ../valgrind/chrome_tests.py.
 TODO(glider): put common functions to a standalone module.
@@ skipping 286 matching lines @@
   def TestUIUnit(self):
     return self.SimpleTest("chrome", "ui_unittests")
 
   def TestGfx(self):
     return self.SimpleTest("chrome", "gfx_unittests")
 
   def TestUI(self):
     return self.SimpleTest("chrome", "ui_tests",
                            cmd_args=[
                             "--ui-test-action-timeout=80000",
-                            "--ui-test-action-max-timeout=180000",
-                            "--ui-test-terminate-timeout=60000"])
+                            "--ui-test-action-max-timeout=180000"])
 
   def TestLayoutChunk(self, chunk_num, chunk_size):
     '''Runs tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size).
 
     Wrap around to beginning of list at end. If chunk_size is zero, run all
     tests in the list once. If a text file is given as argument, it is used as
     the list of tests.
     '''
     # Build the ginormous commandline in 'cmd'.
     # It's going to be roughly
@@ skipping 134 matching lines @@
   return 0
 
 
 if __name__ == "__main__":
   if sys.platform == 'linux2':
     ret = _main(sys.argv)
   else:
     logging.error("Heap checking works only on Linux at the moment.")
     ret = 1
   sys.exit(ret)