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

chrome/test/pyautolib/pyauto.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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
@@ skipping 471 matching lines @@
              right key. It's useful to dump the preferences first to determine
              what type is expected for a particular preference path.
     """
     cmd_dict = {
       'command': 'SetPrefs',
       'path': path,
       'value': value,
     }
     self._GetResultFromJSONRequest(cmd_dict)
 
-  def WaitForAllDownloadsToComplete(self):
+  def WaitForAllDownloadsToComplete(self, timeout=-1):
     """Wait for all downloads to complete.
 
+    Args:
+      timeout: The timeout to use - default is WaitUntil's default timeout.
+
     Note: This method does not work for dangerous downloads. Use
     WaitForGivenDownloadsToComplete (below) instead.
     """
-    self._GetResultFromJSONRequest({'command': 'WaitForAllDownloadsToComplete'})
+    # Downloads implementation is largely broken. Try to get around by using
+    # WaitUntil instead of using notifications. crbug.com/54131
+    # self._GetResultFromJSONRequest(
+    #    {'command': 'WaitForAllDownloadsToComplete'})
+    return self.WaitUntil(
+        lambda: len(self.GetDownloadsInfo().DownloadsInProgress()) == 0,
+        timeout=timeout)
 
   def WaitForDownloadToComplete(self, download_path, timeout=-1):
     """Wait for the given downloads to complete.
 
     This method works for dangerous downloads as well as regular downloads.
 
     Args:
       download_path: The path to the final download. This is only necessary for
                      the workaround described in the comments below and should
                      be removed when downloads are re-implemented.
@@ skipping 1165 matching lines @@
     if self._options.verbose:
       verbosity = 2
     result = PyAutoTextTestRuner(verbosity=verbosity).run(pyauto_suite)
     del loaded_tests  # Need to destroy test cases before the suite
     del pyauto_suite
     sys.exit(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   Main()