Add 2 tests for history.

chrome/test/functional/history.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 os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 
@@ skipping 123 matching lines @@
     self.AppendTab(pyauto.GURL(urls[1]), 0)  # window 0, tab 1
     self.AppendTab(pyauto.GURL(urls[2]), 1)  # window 1
     self.AppendTab(pyauto.GURL(urls[3]), 1)  # window 1
 
     history = self.GetHistoryInfo().History()
     self.assertEqual(num_urls, len(history))
     # The history should be ordered most recent first.
     for i in range(num_urls):
       self.assertEqual(urls[-1 - i], history[i]['url'])
 
+  def testDownloadNoHistory(self):
+    """Downloaded URLs should not show up in history."""
+    assert not self.GetHistoryInfo().History(), 'Expecting clean history.'
+    file_url = self.GetFileURLForPath(os.path.join(self.DataDir(), 'downloads',
+                                                   'a_zip_file.zip'))
+    downloaded_file = os.path.join(self.GetDownloadDirectory().value(),
+                                   'a_zip_file.zip')
+    os.path.exists(downloaded_file) and os.remove(downloaded_file)
+    self.DownloadAndWaitForStart(file_url)
+    self.WaitForAllDownloadsToComplete()
+    os.path.exists(downloaded_file) and os.remove(downloaded_file)
+    # We shouldn't have any history
+    history = self.GetHistoryInfo().History()
+    self.assertEqual(0, len(history))
+
+  def testRedirectHistory(self):
+    """HTTP meta-refresh redirects should have separate history entries."""
+    assert not self.GetHistoryInfo().History(), 'Expecting clean history.'
+    test_dir = os.path.join(os.path.abspath(self.DataDir()), 'history')
+    file_url = self.GetFileURLForPath(os.path.join(test_dir, 'redirector.html'))
+    landing_url = self.GetFileURLForPath(os.path.join(test_dir, 'landing.html'))
+    tab = self.GetBrowserWindow(0).GetTab(0)
+    tab.NavigateToURLBlockUntilNavigationsComplete(pyauto.GURL(file_url), 2)
+    self.assertEqual(landing_url, self.GetActiveTabURL().spec())
+    # We should have two history items
+    history = self.GetHistoryInfo().History()
+    self.assertEqual(2, len(history))
+    self.assertEqual(landing_url, history[0]['url'])
+
 
 if __name__ == '__main__':
   pyauto_functional.Main()