Fix flaky testZipInIncognito

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 commands
 import filecmp
 import logging
 import os
 import shutil
@@ skipping 120 matching lines @@
     file_path = os.path.join(test_dir, 'a_zip_file.zip')
     file_url = self.GetFileURLForPath(file_path)
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   'a_zip_file.zip')
     self._ClearLocalDownloadState(downloaded_pkg)
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
 
     # Trigger download and wait in new incognito window.
     self.DownloadAndWaitForStart(file_url, 1)
     self.WaitForAllDownloadsToComplete(1)
+    # Remove next line when WaitForAllDownloadsToComplete can reliably wait
+    # for downloads in incognito window. crbug.com/69738
+    self.WaitForDownloadToComplete(downloaded_pkg)
     incognito_downloads = self.GetDownloadsInfo(1).Downloads()
 
     # Verify that download info exists in the correct profile.
     self.assertEqual(len(incognito_downloads), 1)
     self.assertTrue(self._EqualFileContents(file_path, downloaded_pkg),
         msg='%s (size %d) and %s (size %d) do not match' % (
             file_path, os.path.getsize(file_path),
             downloaded_pkg, os.path.getsize(downloaded_pkg)))
     self.assertTrue(self.IsDownloadShelfVisible(1))
 
@@ skipping 439 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()