summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 19:02:46 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 19:02:46 +0000
commit2036976d6f2989a98b5410f866000c5c3e836f1f (patch)
treefafb9fdd1ecd79a0fda73fa38bb6458bf885e1e1 /chrome
parent1bf7bc00e9c0cf2fc33d92157b73ee1e48df938e (diff)
downloadchromium_src-2036976d6f2989a98b5410f866000c5c3e836f1f.zip
chromium_src-2036976d6f2989a98b5410f866000c5c3e836f1f.tar.gz
chromium_src-2036976d6f2989a98b5410f866000c5c3e836f1f.tar.bz2
Update path to data file in perf test
R=dennisjeffrey@chromium.org BUG=139651 TEST= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10832065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/test/functional/perf.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/test/functional/perf.py b/chrome/test/functional/perf.py
index d3a23c7..c9564d9 100755
--- a/chrome/test/functional/perf.py
+++ b/chrome/test/functional/perf.py
@@ -689,9 +689,10 @@ class TabPerfTest(BasePerfTest):
def testNewTabFlash(self):
"""Measures time to open a new tab navigated to a flash page."""
self.assertTrue(
- os.path.exists(os.path.join(self.DataDir(), 'plugin', 'flash.swf')),
+ os.path.exists(os.path.join(self.ContentDataDir(), 'plugin',
+ 'flash.swf')),
msg='Missing required flash data file.')
- url = self.GetFileURLForDataPath('plugin', 'flash.swf')
+ url = self.GetFileURLForContentDataPath('plugin', 'flash.swf')
self._RunNewTabTest('NewTabFlashPage', lambda: self._AppendTab(url),
'open_tab')