Fix for flakiness in pyauto automation hook WaitForDownloadsToComplete.

chrome/test/functional/prefs.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.
 
 import logging
 import os
 import shutil
 import sys
 
@@ skipping 83 matching lines @@
     """Verify download dir pref."""
     test_dir = os.path.join(self.DataDir(), 'downloads')
     file_url = self.GetFileURLForPath(os.path.join(test_dir, 'a_zip_file.zip'))
     download_dir = self.GetDownloadDirectory().value()
     new_dl_dir = os.path.join(download_dir, 'My+Downloads Folder')
     downloaded_pkg = os.path.join(new_dl_dir, 'a_zip_file.zip')
     os.path.exists(new_dl_dir) and shutil.rmtree(new_dl_dir)
     os.makedirs(new_dl_dir)
     # Set pref to download in new_dl_dir
     self.SetPrefs(pyauto.kDownloadDefaultDirectory, new_dl_dir)
+    pre_download_ids = [x['id'] for x in self.GetDownloadsInfo().Downloads()]
     self.DownloadAndWaitForStart(file_url)
-    self.WaitForAllDownloadsToComplete()
+    self.WaitForAllDownloadsToComplete(pre_download_ids)
     self.assertTrue(os.path.exists(downloaded_pkg))
     shutil.rmtree(new_dl_dir, ignore_errors=True)  # cleanup
 
   def testToolbarButtonsPref(self):
     """Verify toolbar buttons prefs."""
     # Assert defaults first
     self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
     self.SetPrefs(pyauto.kShowHomeButton, True)
     self.RestartBrowser(clear_profile=False)
     self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kShowHomeButton))
@@ skipping 71 matching lines @@
     self.assertEqual(title1, self.GetActiveTabTitle())
     self.SetPrefs('webkit.webprefs.javascript_enabled', False)
     title = 'This is html title'
     self.NavigateToURL(url)
     self.assertEqual(title, self.GetActiveTabTitle())
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()