Update pyauto tests to use content/test/data/plugin

chrome/test/functional/flash.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.
 
 import os
 import re
 import types
 
 import pyauto_functional
@@ skipping 25 matching lines @@
     """Get info about Flash processes, if any."""
     return [x for x in self.GetBrowserInfo()['child_processes']
             if x['type'] == self._flash_plugin_type and
             x['name'] == 'Shockwave Flash']
 
   def testCanLoadFlash(self):
     """Verify that we can play Flash.
 
     We merely check that the Flash process kicks in.
     """
-    flash_url = self.GetFileURLForDataPath('plugin', 'flash.swf')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'flash.swf')
     self.NavigateToURL(flash_url)
     self._AssertFlashProcessPresent()
 
   def testSingleFlashPluginProcess(self):
     """Verify there's only one Flash plugin process shared across all uses."""
-    flash_url = self.GetFileURLForDataPath('plugin', 'flash.swf')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'flash.swf')
     self.NavigateToURL(flash_url)
     for _ in range(2):
       self.AppendTab(pyauto.GURL(flash_url))
     # Open flash in new window.
     self.OpenNewBrowserWindow(True)
     self.NavigateToURL(flash_url, 1, 0)
     # Open flash in new incognito window.
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.NavigateToURL(flash_url, 1, 0)
     # Verify there's only 1 flash process.
     self.assertEqual(1, len(self._GetFlashProcessesInfo()))
 
   def testFlashLoadsAfterKill(self):
     """Verify that Flash process reloads after crashing (or being killed)."""
-    flash_url = self.GetFileURLForDataPath('plugin', 'flash.swf')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'flash.swf')
     self.NavigateToURL(flash_url)
     flash_process_id1 = self._GetFlashProcessesInfo()[0]['pid']
     self.Kill(flash_process_id1)
 
     def _GotFlashProcess(pid):
       flash_processes = self._GetFlashProcessesInfo()
       return len(flash_processes) == 1 and flash_processes[0]['pid'] == pid
 
     self.assertTrue(self.WaitUntil(
         lambda: not _GotFlashProcess(flash_process_id1)),
@@ skipping 11 matching lines @@
         for mime_type in plugin['mimeTypes']:
           if mime_type['mimeType'] == 'application/x-shockwave-flash':
             return True
       return False
     self.assertTrue(self.WaitUntil(_GotFlashPluginInfo))
     for plugin in self.GetPluginsInfo().Plugins():
       if re.search('Shockwave Flash', plugin['name']):
         self.assertTrue(plugin['enabled'])
         # Toggle plugin to disable flash.
         self.DisablePlugin(plugin['path'])
-    flash_url = self.GetFileURLForDataPath('plugin', 'flash.html')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'flash.html')
     self.NavigateToURL(flash_url)
     # Verify shockwave flash process not present.
     self._AssertFlashProcessNotPresent()
 
   def testFlashIncognitoMode(self):
     """Verify we can play flash on an incognito window."""
     # Verify no flash process is currently running
     self._AssertFlashProcessNotPresent()
-    flash_url = self.GetFileURLForDataPath('plugin', 'flash.swf')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'flash.swf')
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.NavigateToURL(flash_url, 1, 0)
     self._AssertFlashProcessPresent()
 
   def testFlashWithMultipleTabs(self):
     """Verify we can play flash in multiple tabs."""
-    flash_url = self.GetFileURLForDataPath('plugin', 'flash.swf')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'flash.swf')
     # Verify no flash process is currently running
     self._AssertFlashProcessNotPresent()
     self.NavigateToURL(flash_url)
     # Open 5 new tabs
     for _ in range(5):
       self.AppendTab(pyauto.GURL(flash_url))
     self._AssertFlashProcessPresent()
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()