Modifying some downloads hooks to act per-window (so that incognito windows c...

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 370 matching lines @@
     return ret_dict
 
   def GetBookmarkModel(self):
     """Return the bookmark model as a BookmarkModel object.
 
     This is a snapshot of the bookmark model; it is not a proxy and
     does not get updated as the bookmark model changes.
     """
     return bookmark_model.BookmarkModel(self._GetBookmarksAsJSON())
 
-  def GetDownloadsInfo(self):
+  def GetDownloadsInfo(self, windex=0):
     """Return info about downloads.
 
     This includes all the downloads recognized by the history system.
 
     Returns:
       an instance of downloads_info.DownloadInfo
     """
     return download_info.DownloadInfo(
-        self._SendJSONRequest(0, json.dumps({'command': 'GetDownloadsInfo'})))
+        self._SendJSONRequest(
+            windex, json.dumps({'command': 'GetDownloadsInfo'})))
 
   def GetOmniboxInfo(self, windex=0):
     """Return info about Omnibox.
 
     This represents a snapshot of the omnibox.  If you expect changes
     you need to call this method again to get a fresh snapshot.
     Note that this DOES NOT shift focus to the omnibox; you've to ensure that
     the omnibox is in focus or else you won't get any interesting info.
 
     It's OK to call this even when the omnibox popup is not showing.  In this
@@ skipping 239 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, windex=0):
     """Wait for all downloads to complete.
 
     Note: This method does not work for dangerous downloads. Use
     WaitForGivenDownloadsToComplete (below) instead.
     """
-    self._GetResultFromJSONRequest({'command': 'WaitForAllDownloadsToComplete'})
+    cmd_dict = {'command': 'WaitForAllDownloadsToComplete'}
+    self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
   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 44 matching lines @@
         u'url':  u'file://url/to/file.txt'
       }
     """
     cmd_dict = {  # Prepare command for the json interface
       'command': 'PerformActionOnDownload',
       'id': id,
       'action': action
     }
     return self._GetResultFromJSONRequest(cmd_dict, windex=window_index)
 
-  def DownloadAndWaitForStart(self, file_url):
+  def DownloadAndWaitForStart(self, file_url, windex=0):
     """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.
+    try:
+      num_downloads = len(self.GetDownloadsInfo(windex).Downloads())
+    except JSONInterfaceError:
+      num_downloads = 0
+
+    self.NavigateToURL(file_url, windex)  # 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))
+        lambda: len(self.GetDownloadsInfo(windex).Downloads()) >
+                num_downloads))
 
   def SetWindowDimensions(
       self, x=None, y=None, width=None, height=None, windex=0):
     """Set window dimensions.
 
     All args are optional and current values will be preserved.
     Arbitrarily large values will be handled gracefully by the browser.
 
     Args:
       x: window origin x
@@ skipping 1601 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()