Add 2 tests for history.

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 hashlib
 import logging
 import os
 import shutil
 import sys
@@ skipping 11 matching lines @@
   def _ComputeMD5sum(self, filename):
     """Determine md5 checksum for the contents of |filename|."""
     md5 = hashlib.md5()
     md5.update(open(filename, 'rb').read())
     return md5.hexdigest()
 
   def testNoDownloadWaitingNeeded(self):
     """Make sure "wait for downloads" returns quickly if we have none."""
     self.WaitForAllDownloadsToComplete()
 
-  def _DownloadAndWaitForStart(self, file_url):
-    """Trigger download for the given url and wait for downloads to start.
-
-    It waits for download by looking at the download info from Chrome, so
-    anything which isn't registered by the history service won't be noticed.
-    This is not thread-safe, but it's fine to call this method to start
-    downloading multiple files in parallel. That is after starting a
-    download, it's fine to start another one even if the first one hasn't
-    completed.
-    """
-    num_downloads = len(self.GetDownloadsInfo().Downloads())
-    self.NavigateToURL(file_url)  # Trigger download.
-    # It might take a while for the download to kick in, hold on until then.
-    self.assertTrue(self.WaitUntil(
-        lambda: len(self.GetDownloadsInfo().Downloads()) == num_downloads + 1))
-
   def testZip(self):
     """Download a zip and verify that it downloaded correctly.
        Also verify that the download shelf showed up.
     """
     test_dir = os.path.join(os.path.abspath(self.DataDir()), 'downloads')
     checksum_file = os.path.join(test_dir, 'a_zip_file.md5sum')
     file_url = 'file://%s' % os.path.join(test_dir, 'a_zip_file.zip')
     golden_md5sum = urllib.urlopen(checksum_file).read()
     downloaded_pkg = os.path.join(self.GetDownloadDirectory().value(),
                                   'a_zip_file.zip')
     os.path.exists(downloaded_pkg) and os.remove(downloaded_pkg)
 
-    self._DownloadAndWaitForStart(file_url)
+    self.DownloadAndWaitForStart(file_url)
 
     # Wait for the download to finish.
     self.WaitForAllDownloadsToComplete()
 
     # Verify that the download shelf is visible
     self.assertTrue(self.IsDownloadShelfVisible())
 
     # Verify that the file was correctly downloaded
     self.assertTrue(os.path.exists(downloaded_pkg))
     # print 'Download size is %d' % os.path.getsize(downloaded_pkg)
@@ skipping 17 matching lines @@
     num_times = 5
     assert num_times > 1, 'needs to be > 1 to work'
     renamed_files = []
     for i in range(num_times):
       expected_filename = os.path.join(download_dir, 'a_zip_file.zip')
       if i > 0:  # Files after first download are renamed.
         expected_filename = os.path.join(download_dir,
                                          'a_zip_file (%d).zip' % i)
         renamed_files.append(expected_filename)
       os.path.exists(expected_filename) and os.remove(expected_filename)
-      self._DownloadAndWaitForStart(file_url)
+      self.DownloadAndWaitForStart(file_url)
 
     self.WaitForAllDownloadsToComplete()
 
     # Verify that all files exist and have the right name
     for filename in renamed_files:
       self.assertTrue(os.path.exists(filename))
       os.path.exists(filename) and os.remove(filename)
 
   def _EvalDataFrom(self, filename):
     """Return eval of python code from given file.
@@ skipping 26 matching lines @@
 
     # Temp dir for hosting crazy filenames.
     temp_dir = tempfile.mkdtemp(prefix='download')
     try:
       for filename in crazy_filenames:
         file_path = os.path.join(temp_dir, filename)
         _CreateFile(file_path)
         file_url = self.GetFileURLForPath(file_path)
         downloaded_file = os.path.join(download_dir, filename)
         os.path.exists(downloaded_file) and os.remove(downloaded_file)
-        self._DownloadAndWaitForStart(file_url)
+        self.DownloadAndWaitForStart(file_url)
       self.WaitForAllDownloadsToComplete()
 
       # Verify downloads.
       downloads = self.GetDownloadsInfo().Downloads()
       self.assertEqual(len(downloads), len(crazy_filenames))
 
       for filename in crazy_filenames:
         downloaded_file = os.path.join(download_dir, filename)
         self.assertTrue(os.path.exists(downloaded_file))
         self.assertEqual(   # Verify checksum.
             self._ComputeMD5sum(downloaded_file),
             self._ComputeMD5sum(os.path.join(temp_dir, filename)))
         os.path.exists(downloaded_file) and os.remove(downloaded_file)
     finally:
       shutil.rmtree(temp_dir)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()