Update path to data file in perf test

chrome/test/functional/perf.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Basic pyauto performance tests.
 
 For tests that need to be run for multiple iterations (e.g., so that average
 and standard deviation values can be reported), the default number of iterations
 run for each of these tests is specified by |_DEFAULT_NUM_ITERATIONS|.
@@ skipping 671 matching lines @@
         os.path.exists(os.path.join(self.DataDir(), 'pyauto_private', 'pdf',
                                     'TechCrunch.pdf')),
         msg='Missing required PDF data file.')
     url = self.GetFileURLForDataPath('pyauto_private', 'pdf', 'TechCrunch.pdf')
     self._RunNewTabTest('NewTabPdfPage', lambda: self._AppendTab(url),
                         'open_tab')
 
   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')

[dennis_jeffrey, 2012/07/30 18:55:20]

not for this CL, but would it be worthwhile changing the function names
"DataDir" and "GetFileURLForDataPath" to "BrowserDataDir" and
"GetFileURLForBrowserDataPath", respectively?

     self._RunNewTabTest('NewTabFlashPage', lambda: self._AppendTab(url),
                         'open_tab')
 
   def test20Tabs(self):
     """Measures time to open 20 tabs."""
     self._RunNewTabTest('20TabsNewTabPage',
                         lambda: self._AppendTab('chrome://newtab'),
                         'open_20_tabs', num_tabs=20)
 
 
@@ skipping 1906 matching lines @@
     """Identifies the port number to which the server is currently bound.
 
     Returns:
       The numeric port number to which the server is currently bound.
     """
     return self._server.server_address[1]
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()