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

chrome/test/functional/infobars.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 logging
 import os
 import re
 
 import pyauto_functional  # Must be imported before pyauto
@@ skipping 33 matching lines @@
 
   def _GetTabInfo(self, windex=0, tab_index=0):
     """Helper to return info for the given tab in the given window.
 
     Defaults to first tab in first window.
     """
     return self.GetBrowserInfo()['windows'][windex]['tabs'][tab_index]
 
   def testPluginCrashInfobar(self):
     """Verify the "plugin crashed" infobar."""
-    flash_url = self.GetFileURLForDataPath('plugin', 'flash.swf')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'flash.swf')
     # Trigger flash plugin
     self.NavigateToURL(flash_url)
     child_processes = self.GetBrowserInfo()['child_processes']
     flash = [x for x in child_processes if
              x['type'] == self._flash_plugin_type and
              x['name'] == 'Shockwave Flash'][0]
     self.assertTrue(flash)
     logging.info('Killing flash plugin. pid %d' % flash['pid'])
     self.Kill(flash['pid'])
     self.assertTrue(self.WaitForInfobarCount(1))
@@ skipping 86 matching lines @@
     flash_crash_infobar_count = 0
     for infobar in infobars:
       if (('text' in infobar) and
           infobar['text'].startswith('Shockwave Flash has crashed')):
         flash_crash_infobar_count += 1
     return flash_crash_infobar_count
 
   def testPluginCrashForMultiTabs(self):
     """Verify plugin crash infobar shows up only on the tabs using plugin."""
     non_flash_url = self.GetFileURLForDataPath('english_page.html')
-    flash_url = self.GetFileURLForDataPath('plugin', 'FlashSpin.swf')
+    flash_url = self.GetFileURLForContentDataPath('plugin', 'FlashSpin.swf')
     # False = Non flash url, True = Flash url
     # We have set of these values to compare a flash page and a non-flash page
     urls_type = [False, True, False, True, False]
     for _ in range(2):
       self.AppendTab(pyauto.GURL(flash_url))
       self.AppendTab(pyauto.GURL(non_flash_url))
     # Killing flash process
     child_processes = self.GetBrowserInfo()['child_processes']
     flash = [x for x in child_processes if
              x['type'] == self._flash_plugin_type and
@@ skipping 184 matching lines @@
   def testNoOneClickInfobarInIncognito(self):
     """Verify that one-click infobar does not show up in incognito mode."""
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self._LogIntoGoogleAccount(windex=1)
     test_utils.AssertInfobarTypeDoesNotAppear(
         self, self.OC_INFOBAR_TYPE, windex=1)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()