Work around download system breakpage by using WaitUntil on pyauto side.

chrome/test/functional/downloads.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 filecmp
 import logging
 import os
 import shutil
 import sys
@@ skipping 182 matching lines @@
     # Create a 1 GB file on the fly
     file_path = self._MakeFile(2**30)
     try:
       file_url = self.GetFileURLForPath(file_path)
       downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                     os.path.basename(file_path))
       os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
       self.DownloadAndWaitForStart(file_url)
       # Waiting for big file to download might exceed automation timeout.
       # Temporarily increase the automation timeout.
-      self._CallFunctionWithNewTimeout(4 * 60 * 1000,  # 4 min.
-                                       self.WaitForAllDownloadsToComplete)
+
+      # Temp workaround for crbug.com/54131
+      # self._CallFunctionWithNewTimeout(4 * 60 * 1000,  # 4 min.
+      #                                  self.WaitForAllDownloadsToComplete)
+      self.WaitForAllDownloadsToComplete(timeout=4*60*1000)
+      # -- End workaround
       # 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)
     finally:  # Cleanup. Remove all big files.
       os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
       os.path.exists(file_path) and os.remove(file_path)
 
@@ skipping 193 matching lines @@
     self.PerformActionOnDownload(self._GetDownloadId(),
                                  'save_dangerous_download')
     # Wait for the theme to be set automatically.
     self.assertTrue(self.WaitUntilDownloadedThemeSet('camo theme'))
     self.assertTrue(self.WaitUntil(lambda path: not os.path.exists(path),
                                    args=[downloaded_pkg]))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()