GTTF: Remove wait_for_terminate_timeout_ms in favor of action_max_timeout_ms

tools/valgrind/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.
 
 # chrome_tests.py
 
 ''' Runs various chrome tests through valgrind_test.py.'''
 
 import glob
@@ skipping 255 matching lines @@
   def TestUIUnit(self):
     return self.SimpleTest("chrome", "ui_unittests")
 
   def TestGfx(self):
     return self.SimpleTest("chrome", "gfx_unittests")
 
   # Valgrind timeouts are in seconds.
   UI_VALGRIND_ARGS = ["--timeout=7200", "--trace_children", "--indirect"]
   # UI test timeouts are in milliseconds.
   UI_TEST_ARGS = ["--ui-test-action-timeout=120000",
-                  "--ui-test-action-max-timeout=280000",
-                  "--ui-test-terminate-timeout=120000"]
+                  "--ui-test-action-max-timeout=280000"]
   def TestUI(self):
     return self.SimpleTest("chrome", "ui_tests",
                            valgrind_test_args=self.UI_VALGRIND_ARGS,
                            cmd_args=self.UI_TEST_ARGS)
 
   def TestAutomatedUI(self):
     return self.SimpleTest("chrome", "automated_ui_tests",
                            valgrind_test_args=self.UI_VALGRIND_ARGS,
                            cmd_args=self.UI_TEST_ARGS)
 
@@ skipping 200 matching lines @@
   for t in options.test:
     tests = ChromeTests(options, args, t)
     ret = tests.Run()
     if ret: return ret
   return 0
 
 
 if __name__ == "__main__":
   ret = _main(sys.argv)
   sys.exit(ret)