summaryrefslogtreecommitdiffstats
path: root/chrome/test/functional
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 01:48:38 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 01:48:38 +0000
commit73dd1c89a16dcc0235964a74910a7d762dad8b5d (patch)
treef5fb7ba9854de99844ad16f8e1a4c979de97ad52 /chrome/test/functional
parentca56190fe41f3f7d8839cb084e35295349a3d5b3 (diff)
downloadchromium_src-73dd1c89a16dcc0235964a74910a7d762dad8b5d.zip
chromium_src-73dd1c89a16dcc0235964a74910a7d762dad8b5d.tar.gz
chromium_src-73dd1c89a16dcc0235964a74910a7d762dad8b5d.tar.bz2
Changed dangerous downloading to use .jar files.
BUG=104741 Review URL: http://codereview.chromium.org/8598026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional')
-rw-r--r--chrome/test/functional/downloads.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/functional/downloads.py b/chrome/test/functional/downloads.py
index 6ae0bcf..47bb3d6 100644
--- a/chrome/test/functional/downloads.py
+++ b/chrome/test/functional/downloads.py
@@ -64,9 +64,7 @@ class DownloadsTest(pyauto.PyUITest):
def _GetDangerousDownload(self):
"""Returns the file path for a dangerous download for this OS."""
sub_path = os.path.join(self.DataDir(), 'downloads', 'dangerous')
- if self.IsMac():
- return os.path.join(sub_path, 'invalid-dummy.dmg')
- return os.path.join(sub_path, 'dangerous.exe')
+ return os.path.join(sub_path, 'dangerous.jar')
def _EqualFileContents(self, file1, file2):
"""Determine if 2 given files have the same contents."""