Fix failing the plugin test: plugins.PluginsTest.testDisableEnableAllPlugins

functional/plugins.py

 #!/usr/bin/python
 # Copyright (c) 2011 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 29 matching lines @@
 
     Returns:
       a list of 2-tuple, corresponding to the html file used for test and the
       name of the plugin
     """
     plugins = [('flash-clicktoplay.html', 'Shockwave Flash'),
                ('java_new.html', 'Java'),]    # common to all platforms
     if self.IsWin() or self.IsMac():
       plugins = plugins + [
          ('silverlight_new.html', 'Silverlight'),
-         ('quicktime.html', 'Quicktime'),
+         ('quicktime.html', 'QuickTime'),
          ('wmp_new.html', 'Windows Media'),
          ('real.html', 'RealPlayer'),
       ]
 
     out = []
     # Emit warnings for plugins that are not installed on the machine and
     # therefore cannot be tested.
     plugins_info = self.GetPluginsInfo()
     for fname, name in plugins:
       for a_plugin in plugins_info.Plugins():
@@ skipping 32 matching lines @@
           self.EnablePlugin(plugin['path'])
 
   def _IsEnabled(self, plugin_name):
     """Checks if plugin is enabled."""
     for plugin in self.GetPluginsInfo().Plugins():
       if re.search(plugin_name, plugin['name']):
          return plugin['enabled']
 
   def _PluginNeedsAuthorization(self, plugin_name):
     # These plug-ins seek permission to run
-    return plugin_name in ['Java', 'Quicktime', 'Windows Media']
+    return plugin_name in ['Java', 'QuickTime', 'Windows Media', 'RealPlayer']
 
   def testKillAndReloadAllPlugins(self):
     """Verify plugin processes and check if they can reload after killing."""
     for fname, plugin_name in self._ObtainPluginsList():
       if plugin_name == 'Shockwave Flash':
         continue  # cannot reload file:// flash URL - crbug.com/47249
       url = self.GetFileURLForPath(
           os.path.join(self.DataDir(), 'plugin', fname))
       self.NavigateToURL(url)
       if self._PluginNeedsAuthorization(plugin_name):
@@ skipping 27 matching lines @@
       self.assertTrue(self._IsEnabled(plugin_name),
                       '%s not enabled initially.' % plugin_name)
       # Disable
       self._TogglePlugin(plugin_name)
       self.assertFalse(self._IsEnabled(plugin_name))
       # Attempt to load a page that triggers the plugin and verify that it
       # indeed could not be loaded.
       url = self.GetFileURLForPath(
           os.path.join(self.DataDir(), 'plugin', fname))
       self.NavigateToURL(url)
+      self.assertTrue(self.WaitUntil(
+          lambda: self._GetPluginPID(plugin_name) is None ))
       self.assertFalse(self._GetPluginPID(plugin_name=plugin_name))
       if plugin_name == 'Shockwave Flash':
         continue  # cannot reload file:// flash URL - crbug.com/47249
       if plugin_name == 'Java':
         continue  # crbug.com/71223
       # Enable
       self._TogglePlugin(plugin_name)
       self.GetBrowserWindow(0).GetTab(0).Reload()
       if self._PluginNeedsAuthorization(plugin_name):
         self.assertTrue(self.WaitForInfobarCount(1))
@@ skipping 63 matching lines @@
     # Add an exception to block plugins on localhost.
     self.SetPrefs(pyauto.kContentSettingsPatterns,
                  {'[*.]127.0.0.1,*': {'plugins': 2}})
     self.GetBrowserWindow(0).GetTab(0).Reload()
     self.assertFalse(self._GetPluginPID('Shockwave Flash'),
                      msg='Shockwave Flash Plug-in not blocked.')
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()