Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/functional/downloads.py

 #!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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.
 
 import commands
 import filecmp
 import logging
 import os
 import shutil
 import sys
 import tempfile
@@ skipping 195 matching lines @@
     """
     # Create a 1 GB file on the fly
     file_path = self._MakeFile(2**30)
     self._DeleteAfterShutdown(file_path)
     file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   os.path.basename(file_path))
     self._ClearLocalDownloadState(downloaded_pkg)
     self.DownloadAndWaitForStart(file_url)
     self._DeleteAfterShutdown(downloaded_pkg)
-    # Waiting for big file to download might exceed automation timeout.
-    # Temporarily increase the automation timeout.
-    test_utils.CallFunctionWithNewTimeout(self, 4 * 60 * 1000,  # 4 min.
-                                          self.WaitForAllDownloadsToComplete)
+    self.WaitForAllDownloadsToComplete(timeout=self.large_test_timeout_ms());
     # Verify that the file was correctly downloaded
     self.assertTrue(os.path.exists(downloaded_pkg),
                     'Downloaded file %s missing.' % downloaded_pkg)
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg),
                     'Downloaded file %s does not match original' %
                       downloaded_pkg)
 
   def testFileRenaming(self):
     """Test file renaming when downloading a already-existing filename."""
     test_dir = os.path.join(os.path.abspath(self.DataDir()), 'downloads')
@@ skipping 120 matching lines @@
       logging.info('The download completed before pause. Stopping test.')
       return
 
     self.assertTrue(pause_dict['is_paused'])
     self.assertTrue(pause_dict['state'] == 'IN_PROGRESS')
 
     # Resume the download and assert it is not paused.
     resume_dict = self.PerformActionOnDownload(self._GetDownloadId(),
                                                'toggle_pause')
     self.assertFalse(resume_dict['is_paused'])
-
-    # Waiting for big file to download might exceed automation timeout.
-    # Temporarily increase the automation timeout.
-    test_utils.CallFunctionWithNewTimeout(self, 2 * 60 * 1000,  # 2 min.
-                                          self.WaitForAllDownloadsToComplete)
+    self.WaitForAllDownloadsToComplete(timeout=self.large_test_timeout_ms());
 
     # Verify that the file was correctly downloaded after pause and resume.
     self.assertTrue(os.path.exists(downloaded_pkg),
                     'Downloaded file %s missing.' % downloaded_pkg)
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg),
                     'Downloaded file %s does not match original' %
                     downloaded_pkg)
 
   def testCancelDownload(self):
     """Verify that we can cancel a download."""
@@ skipping 201 matching lines @@
     # Verify download in incognito window.
     # bug 69738 WaitForAllDownloadsToComplete is flaky for this test case.
     # Using extra WaitUntil until this is resolved.
     self.assertTrue(self.WaitUntil(
         lambda: os.path.exists(downloaded_pkg_incog)))
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg_incog))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()